diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000000..6405b7860f2 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +*~ +,* diff --git a/doc/language-support.xml b/doc/language-support.xml index dc63dd68503..47729a1b4ba 100644 --- a/doc/language-support.xml +++ b/doc/language-support.xml @@ -18,10 +18,10 @@ such as Perl or Haskell. These are described in this chapter. Nixpkgs provides a function buildPerlPackage, a generic package builder function for any Perl package that has a standard Makefile.PL. It’s implemented in pkgs/development/perl-modules/generic. +xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/perl-modules/generic">pkgs/development/perl-modules/generic. Perl packages from CPAN are defined in pkgs/perl-packages.nix, +xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/top-level/perl-packages.nix">pkgs/perl-packages.nix, rather than pkgs/all-packages.nix. Most Perl packages are so straight-forward to build that they are defined here directly, rather than having a separate function for each package @@ -162,7 +162,7 @@ ClassC3Componentised = buildPerlPackage rec { which many Python packages do nowadays, can be built very simply using the buildPythonPackage function. This function is implemented - in pkgs/development/python-modules/generic/default.nix + in pkgs/development/python-modules/generic/default.nix and works similarly to buildPerlPackage. (See for details.) @@ -170,7 +170,7 @@ ClassC3Componentised = buildPerlPackage rec { Python packages that use buildPythonPackage are defined - in pkgs/top-level/python-packages.nix. + in pkgs/top-level/python-packages.nix. Most of them are simple. For example: diff --git a/doc/meta.xml b/doc/meta.xml index 8ed91d9a8c8..30b5ad247d1 100644 --- a/doc/meta.xml +++ b/doc/meta.xml @@ -103,7 +103,7 @@ interpretation: <alice@example.org>" "Bob <bob@example.com>"]. If you are the maintainer of multiple packages, you may want to add yourself to pkgs/lib/maintainers.nix + xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/lib/maintainers.nix">pkgs/lib/maintainers.nix and write something like [stdenv.lib.maintainers.alice stdenv.lib.maintainers.bob]. diff --git a/doc/package-notes.xml b/doc/package-notes.xml index 9d2cd0ef16b..6dae036b338 100644 --- a/doc/package-notes.xml +++ b/doc/package-notes.xml @@ -16,7 +16,7 @@ Linux kernel or X.org. Linux kernel The Nix expressions to build the Linux kernel are in pkgs/os-specific/linux/kernel. +xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/os-specific/linux/kernel">pkgs/os-specific/linux/kernel. The function that builds the kernel has an argument kernelPatches which should be a list of @@ -49,7 +49,7 @@ modulesTree = [kernel] - Copy (svn cp) the old Nix expression + Copy the old Nix expression (e.g. linux-2.6.21.nix) to the new one (e.g. linux-2.6.22.nix) and update it. @@ -69,7 +69,7 @@ modulesTree = [kernel] - Make an svn copy from the old + Make an copy from the old config (e.g. config-2.6.21-i686-smp) to the new one (e.g. config-2.6.22-i686-smp). diff --git a/doc/quick-start.xml b/doc/quick-start.xml index 2651e2a1eee..dddbbb4a19e 100644 --- a/doc/quick-start.xml +++ b/doc/quick-start.xml @@ -12,7 +12,7 @@ Checkout the Nixpkgs source tree: -$ svn checkout https://svn.nixos.org/repos/nix/nixpkgs/trunk nixpkgs +$ git clone git://github.com/NixOS/nixpkgs.git $ cd nixpkgs @@ -29,7 +29,7 @@ $ cd nixpkgs organisation. Create a directory for your package, e.g. -$ svn mkdir pkgs/development/libraries/libfoo +$ mkdir pkgs/development/libraries/libfoo @@ -44,7 +44,7 @@ $ svn mkdir pkgs/development/libraries/libfoo $ emacs pkgs/development/libraries/libfoo/default.nix -$ svn add pkgs/development/libraries/libfoo/default.nix +$ git add pkgs/development/libraries/libfoo/default.nix @@ -56,7 +56,7 @@ $ svn add pkgs/development/libraries/libfoo/default.nix GNU cpio: pkgs/tools/archivers/cpio/default.nix. + xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/tools/archivers/cpio/default.nix">pkgs/tools/archivers/cpio/default.nix. The simplest possible package. The generic builder in stdenv does everything for you. It has no dependencies beyond stdenv. @@ -64,21 +64,21 @@ $ svn add pkgs/development/libraries/libfoo/default.nix GNU Hello: pkgs/applications/misc/hello/ex-2/default.nix. + xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/misc/hello/ex-2/default.nix">pkgs/applications/misc/hello/ex-2/default.nix. Also trivial, but it specifies some meta attributes which is good practice. GNU Multiple Precision arithmetic library (GMP): pkgs/development/libraries/gmp/default.nix. + xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/libraries/gmp/default.nix">pkgs/development/libraries/gmp/default.nix. Also done by the generic builder, but has a dependency on m4. Pan, a GTK-based newsreader: pkgs/applications/networking/newsreaders/pan/default.nix. + xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/networking/newsreaders/pan/default.nix">pkgs/applications/networking/newsreaders/pan/default.nix. Has an optional dependency on gtkspell, which is only built if spellCheck is true. @@ -86,7 +86,7 @@ $ svn add pkgs/development/libraries/libfoo/default.nix Apache HTTPD: pkgs/servers/http/apache-httpd/default.nix. + xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/servers/http/apache-httpd/default.nix">pkgs/servers/http/apache-httpd/default.nix. A bunch of optional features, variable substitutions in the configure flags, a post-install hook, and miscellaneous hackery. @@ -94,9 +94,9 @@ $ svn add pkgs/development/libraries/libfoo/default.nix BitTorrent (wxPython-based): pkgs/tools/networking/p2p/bittorrent/default.nix. + xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/tools/networking/p2p/bittorrent/default.nix">pkgs/tools/networking/p2p/bittorrent/default.nix. Uses an external build + xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/tools/networking/p2p/bittorrent/builder.sh">build script, which can be useful if you have lots of code that you don’t want cluttering up the Nix expression. But external builders are mostly obsolete. @@ -105,22 +105,22 @@ $ svn add pkgs/development/libraries/libfoo/default.nix Thunderbird: pkgs/applications/networking/mailreaders/thunderbird/3.x.nix. + xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/networking/mailreaders/thunderbird/3.x.nix">pkgs/applications/networking/mailreaders/thunderbird/3.x.nix. Lots of dependencies. JDiskReport, a Java utility: pkgs/tools/misc/jdiskreport/default.nix + xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/tools/misc/jdiskreport/default.nix">pkgs/tools/misc/jdiskreport/default.nix (and the builder). + xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/tools/misc/jdiskreport/builder.sh">builder). Nixpkgs doesn’t have a decent stdenv for Java yet so this is pretty ad-hoc. XML::Simple, a Perl module: pkgs/top-level/perl-packages.nix + xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/top-level/perl-packages.nix">pkgs/top-level/perl-packages.nix (search for the XMLSimple attribute). Most Perl modules are so simple to build that they are defined directly in perl-packages.nix; @@ -129,10 +129,10 @@ $ svn add pkgs/development/libraries/libfoo/default.nix Adobe Reader: pkgs/applications/misc/adobe-reader/default.nix. + xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/misc/adobe-reader/default.nix">pkgs/applications/misc/adobe-reader/default.nix. Shows how binary-only packages can be supported. In particular the builder + xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/misc/adobe-reader/builder.sh">builder uses patchelf to set the RUNPATH and ELF interpreter of the executables so that the right libraries are found at runtime. @@ -163,7 +163,7 @@ $ svn add pkgs/development/libraries/libfoo/default.nix A list of schemes for mirror:// URLs can be found in pkgs/build-support/fetchurl/mirrors.nix. + xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/build-support/fetchurl/mirrors.nix">pkgs/build-support/fetchurl/mirrors.nix. @@ -181,7 +181,7 @@ $ svn add pkgs/development/libraries/libfoo/default.nix Add a call to the function defined in the previous step to pkgs/top-level/all-packages.nix + xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/top-level/all-packages.nix">pkgs/top-level/all-packages.nix with some descriptive name for the variable, e.g. libfoo. @@ -220,8 +220,7 @@ $ nix-env -f . -iA libfoo - Optionally commit the new package (svn - ci) or send a patch to + Optionally commit the new package, or send a patch to nix-dev@cs.uu.nl. @@ -230,7 +229,7 @@ $ nix-env -f . -iA libfoo package and make them available in the nixpkgs channel, add it to pkgs/top-level/release.nix. + xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/top-level/release.nix">pkgs/top-level/release.nix. diff --git a/pkgs/applications/audio/amarok/default.nix b/pkgs/applications/audio/amarok/default.nix index ad553c9db34..a60ecdcb866 100644 --- a/pkgs/applications/audio/amarok/default.nix +++ b/pkgs/applications/audio/amarok/default.nix @@ -1,28 +1,30 @@ { stdenv, fetchurl, lib, qtscriptgenerator, perl, gettext, curl , libxml2, mysql, taglib, taglib_extras, loudmouth , kdelibs , qca2, libmtp, liblastfm, libgpod, pkgconfig, automoc4, phonon -, strigi, soprano }: +, strigi, soprano, qjson, ffmpeg, libofa }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "amarok"; - version = "2.5.0"; + version = "2.6.0"; src = fetchurl { url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.bz2"; - sha256 = "0jc8fsrhshgfv441b2dgqk0wz3ms5bzjqchcj5ydxphg57dr3l8y"; + sha256 = "1h6jzl0jnn8g05pz4mw01kz20wjjxwwz6iki7lvgj70qi3jq04m9"; }; QT_PLUGIN_PATH="${qtscriptgenerator}/lib/qt4/plugins"; + patches = ./find-mysql.patch; buildInputs = [ qtscriptgenerator stdenv.gcc.libc gettext curl libxml2 mysql taglib taglib_extras loudmouth kdelibs automoc4 phonon strigi - soprano qca2 libmtp liblastfm libgpod pkgconfig ]; + soprano qca2 libmtp liblastfm libgpod pkgconfig qjson ffmpeg libofa ]; postInstall = '' mkdir -p $out/nix-support echo ${qtscriptgenerator} > $out/nix-support/propagated-user-env-packages ''; + meta = { description = "Popular music player for KDE"; license = "GPL"; diff --git a/pkgs/applications/audio/amarok/find-mysql.patch b/pkgs/applications/audio/amarok/find-mysql.patch new file mode 100644 index 00000000000..57a5ec46b84 --- /dev/null +++ b/pkgs/applications/audio/amarok/find-mysql.patch @@ -0,0 +1,46 @@ +commit 9979970f05f25329100168d85a5c4cdc8c084b7a +Author: Yury G. Kudryashov +Date: Thu Aug 30 12:32:53 2012 +0400 + + FindMySQLAmarok.cmake: use PATH_SUFFIXES + +diff --git a/cmake/modules/FindMySQLAmarok.cmake b/cmake/modules/FindMySQLAmarok.cmake +index 910b434..4c8b8e8 100644 +--- a/cmake/modules/FindMySQLAmarok.cmake ++++ b/cmake/modules/FindMySQLAmarok.cmake +@@ -13,18 +13,17 @@ + # For details see the accompanying COPYING-CMAKE-SCRIPTS file. + + if(NOT WIN32) +- find_program(MYSQLCONFIG_EXECUTABLE NAMES mysql_config mysql_config5 PATHS ${BIN_INSTALL_DIR} ~/usr/bin /usr/local/bin) ++ find_program(MYSQLCONFIG_EXECUTABLE NAMES mysql_config mysql_config5 HINTS ${BIN_INSTALL_DIR}) + endif(NOT WIN32) + + find_path(MYSQL_INCLUDE_DIR mysql.h +- /opt/local/include/mysql5/mysql ++ PATHS ++ /opt/local/include + /opt/mysql/mysql/include +- /opt/mysqle/include/mysql +- /opt/ports/include/mysql5/mysql +- /usr/include/mysql +- /usr/local/include/mysql +- /usr/mysql/include/mysql +- ~/usr/include/mysql ++ /opt/mysqle/include ++ /opt/ports/include ++ /usr/mysql/include ++ PATH_SUFFIXES mysql mysql5/mysql + ) + + if(MYSQLCONFIG_EXECUTABLE) +@@ -40,8 +39,7 @@ if(MYSQLCONFIG_EXECUTABLE) + + find_library(MYSQLD_PIC_SEPARATE + mysqld_pic +- PATHS +- /usr/lib/mysql ++ PATH_SUFFIXES mysql + ) + + if(MYSQLD_PIC_SEPARATE) diff --git a/pkgs/applications/audio/ardour/ardour3.nix b/pkgs/applications/audio/ardour/ardour3.nix index c34576016ad..cfa86af3c37 100644 --- a/pkgs/applications/audio/ardour/ardour3.nix +++ b/pkgs/applications/audio/ardour/ardour3.nix @@ -2,12 +2,12 @@ , fftwSinglePrec, flac, glib, glibmm, gtk, gtkmm, jackaudio , libgnomecanvas, libgnomecanvasmm, liblo, libmad, libogg, librdf , librdf_raptor, librdf_rasqal, libsamplerate, libsigcxx, libsndfile -, libusb, libuuid, libxml2, libxslt, makeWrapper, pango, perl, pkgconfig -, python }: +, libusb, libuuid, libxml2, libxslt, lilv, lv2, makeWrapper, pango +, perl, pkgconfig, python, serd, sord, sratom, suil }: let - # Ardour 3 Beta 4a - rev = "12406"; + # Ardour 3 Beta 5 + rev = "13072"; in stdenv.mkDerivation { @@ -16,14 +16,17 @@ stdenv.mkDerivation { src = fetchsvn { url = http://subversion.ardour.org/svn/ardour2/branches/3.0; inherit rev; - sha256 = "0a68xb3l36m5908y3airxw1b3bymhrjrf1l492mgcvviq6pn7pmk"; + sha256 = "17k990kdb5q17z6jcz5b60imvvfbjw9zfxzy9fk0vg8gd6yq7736"; }; - buildInputs = [ alsaLib aubio boost cairomm curl fftw fftwSinglePrec - flac glib glibmm gtk gtkmm jackaudio libgnomecanvas - libgnomecanvasmm liblo libmad libogg librdf librdf_raptor - librdf_rasqal libsamplerate libsigcxx libsndfile libusb libuuid - libxml2 libxslt pango perl pkgconfig python ]; + buildInputs = + [ alsaLib aubio boost cairomm curl fftw fftwSinglePrec + flac glib glibmm gtk gtkmm jackaudio libgnomecanvas + libgnomecanvasmm liblo libmad libogg librdf librdf_raptor + librdf_rasqal libsamplerate libsigcxx libsndfile libusb libuuid + libxml2 libxslt lilv lv2 pango perl pkgconfig python serd sord + sratom suil + ]; patchPhase = '' printf '#include "ardour/svn_revision.h"\nnamespace ARDOUR { const char* svn_revision = \"${rev}\"; }\n' > libs/ardour/svn_revision.cc diff --git a/pkgs/applications/audio/calf/default.nix b/pkgs/applications/audio/calf/default.nix new file mode 100644 index 00000000000..4b1f6dcd268 --- /dev/null +++ b/pkgs/applications/audio/calf/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, cairo, expat, glib, gtk, jackaudio, ladspaH +, libglade, lv2, pkgconfig }: + +stdenv.mkDerivation rec { + name = "calf-${version}"; + version = "0.0.18.6"; + + src = fetchurl { + url = "mirror://sourceforge/calf/${name}.tar.gz"; + sha256 = "03w6jjkrr6w8da6qzd0x4dlkg295c6jxby500x4cj07wpbpk6irh"; + }; + + buildInputs = + [ cairo jackaudio gtk glib expat libglade ladspaH lv2 pkgconfig ]; + + meta = with stdenv.lib; { + homepage = http://calf.sourceforge.net; + description = "A set of high quality open source audio plugins for musicians"; + license = licenses.lgpl2; + maintainers = [ maintainers.goibhniu ]; + }; +} diff --git a/pkgs/applications/audio/espeak/default.nix b/pkgs/applications/audio/espeak/default.nix index e86177bb53c..e1cf5fee1cc 100644 --- a/pkgs/applications/audio/espeak/default.nix +++ b/pkgs/applications/audio/espeak/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, unzip, portaudio }: stdenv.mkDerivation { - name = "espeak-1.44.03"; + name = "espeak-1.46.02"; src = fetchurl { - url = mirror://sourceforge/espeak/espeak-1.44.03-source.zip; - sha256 = "0lnv89xmsq3bax0qpabd0z2adaag7mdl973bkw3gdszidafmfyx4"; + url = mirror://sourceforge/espeak/espeak-1.46.02-source.zip; + sha256 = "1fjlv5fm0gzvr5wzy1dp4nspw04k0bqv3jymha2p2qfjbfifp2zg"; }; buildInputs = [ unzip portaudio ]; @@ -18,7 +18,7 @@ stdenv.mkDerivation { configurePhase = '' cd src - makeFlags="PREFIX=$out" + makeFlags="PREFIX=$out DATADIR=$out/share/espeak-data" ''; meta = { diff --git a/pkgs/applications/audio/espeak/edit.nix b/pkgs/applications/audio/espeak/edit.nix new file mode 100644 index 00000000000..eb34335721f --- /dev/null +++ b/pkgs/applications/audio/espeak/edit.nix @@ -0,0 +1,31 @@ +{stdenv, fetchurl, unzip, portaudio, wxGTK}: + +stdenv.mkDerivation { + name = "espeakedit-1.46.02"; + src = fetchurl { + url = mirror://sourceforge/espeak/espeakedit-1.46.02.zip; + sha256 = "1cc5r89sn8zz7b8wj4grx9xb7aqyi0ybj0li9hpy7hd67r56kqkl"; + }; + + buildInputs = [ unzip portaudio wxGTK ]; + + patchPhase = if portaudio.api_version == 19 then '' + cp src/portaudio19.h src/portaudio.h + '' else ""; + + buildPhase = '' + cd src + gcc -o espeakedit *.cpp `wx-config --cxxflags --libs` + ''; + + installPhase = '' + ensureDir $out/bin + cp espeakedit $out/bin + ''; + + meta = { + description = "Phoneme editor for espeak"; + homepage = http://espeak.sourceforge.net/; + license = "GPLv3+"; + }; +} diff --git a/pkgs/applications/audio/flac/default.nix b/pkgs/applications/audio/flac/default.nix index 4eef90b575c..fa201d20c3f 100644 --- a/pkgs/applications/audio/flac/default.nix +++ b/pkgs/applications/audio/flac/default.nix @@ -1,24 +1,25 @@ -{stdenv, fetchurl, libogg}: +{ stdenv, fetchurl, libogg }: stdenv.mkDerivation rec { name = "flac-1.2.1"; - + src = fetchurl { url = mirror://sourceforge/flac/flac-1.2.1.tar.gz; sha256 = "1pry5lgzfg57pga1zbazzdd55fkgk3v5qy4axvrbny5lrr5s8dcn"; }; - buildInputs = [libogg]; + buildInputs = [ libogg ]; + + patches = + [ # Fix for building on GCC 4.3. + (fetchurl { + url = "http://sources.gentoo.org/viewcvs.py/*checkout*/gentoo-x86/media-libs/flac/files/flac-1.2.1-gcc-4.3-includes.patch?rev=1.1"; + sha256 = "1m6ql5vyjb2jlp5qiqp6w0drq1m6x6y3i1dnl5ywywl3zd36k0mr"; + }) + ]; - patches = [ - # Fix for building on GCC 4.3. - (fetchurl { - url = "http://sources.gentoo.org/viewcvs.py/*checkout*/gentoo-x86/media-libs/flac/files/flac-1.2.1-gcc-4.3-includes.patch?rev=1.1"; - sha256 = "1m6ql5vyjb2jlp5qiqp6w0drq1m6x6y3i1dnl5ywywl3zd36k0mr"; - }) - ]; - meta = { homepage = http://flac.sourceforge.net; + description = "Library and tools for encoding and decoding the FLAC lossless audio file format"; }; } diff --git a/pkgs/applications/audio/jack-capture/default.nix b/pkgs/applications/audio/jack-capture/default.nix new file mode 100644 index 00000000000..3b8f0f652a8 --- /dev/null +++ b/pkgs/applications/audio/jack-capture/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, jackaudio, libsndfile, pkgconfig }: + +stdenv.mkDerivation rec { + name = "jack_capture-${version}"; + version = "0.9.69"; + + src = fetchurl { + url = "http://archive.notam02.no/arkiv/src/${name}.tar.gz"; + sha256 = "0sk7b92my1v1g7rhkpl1c608rb0rdb28m9zqfll95kflxajd16zv"; + }; + + buildInputs = [ jackaudio libsndfile pkgconfig ]; + + buildPhase = "PREFIX=$out make jack_capture"; + + installPhase = '' + mkdir -p $out/bin + cp jack_capture $out/bin/ + ''; + + meta = with stdenv.lib; { + description = "A program for recording soundfiles with jack"; + homepage = http://archive.notam02.no/arkiv/src; + license = licenses.gpl2; + maintainers = [ maintainers.goibhniu ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/audio/lastwatch/default.nix b/pkgs/applications/audio/lastwatch/default.nix new file mode 100644 index 00000000000..324a0b0bebc --- /dev/null +++ b/pkgs/applications/audio/lastwatch/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchgit, pythonPackages }: + +pythonPackages.buildPythonPackage rec { + name = "lastwatch-${version}"; + namePrefix = ""; + version = "0.4.1"; + + src = fetchgit { + url = "git://github.com/aszlig/LastWatch.git"; + rev = "refs/tags/v${version}"; + sha256 = "c43f0fd87e9f3daafc7e8676daf2e89c8e21fbabc278eb1455e28d2997587a92"; + }; + + pythonPath = [ + pythonPackages.pyinotify + pythonPackages.pylast + pythonPackages.mutagen + ]; + + propagatedBuildInputs = pythonPath; + + installCommand = "python setup.py install --prefix=$out"; + + meta = { + homepage = "https://github.com/aszlig/LastWatch"; + description = "An inotify-based last.fm audio scrobbler"; + license = stdenv.lib.licenses.gpl2; + }; +} diff --git a/pkgs/applications/audio/linuxsampler/default.nix b/pkgs/applications/audio/linuxsampler/default.nix index a100390c270..c74cd2b0d7d 100644 --- a/pkgs/applications/audio/linuxsampler/default.nix +++ b/pkgs/applications/audio/linuxsampler/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchsvn, alsaLib, asio, autoconf, automake, bison -, jackaudio, libgig, libsndfile, libtool , pkgconfig }: +, jackaudio, libgig, libsndfile, libtool, lv2, pkgconfig }: stdenv.mkDerivation rec { name = "linuxsampler-svn-${version}"; @@ -11,13 +11,16 @@ stdenv.mkDerivation rec { sha256 = "0zsrvs9dwwhjx733m45vfi11yjkqv33z8qxn2i9qriq5zs1f0kd7"; }; - patchPhase = "sed -e 's/which/type -P/g' -i scripts/generate_parser.sh"; + patches = ./linuxsampler_lv2_sfz_fix.diff; - preConfigure = "make -f Makefile.cvs"; + preConfigure = '' + sed -e 's/which/type -P/g' -i scripts/generate_parser.sh + make -f Makefile.cvs + ''; buildInputs = [ alsaLib asio autoconf automake bison jackaudio libgig libsndfile - libtool pkgconfig + libtool lv2 pkgconfig ]; meta = with stdenv.lib; { @@ -34,7 +37,8 @@ stdenv.mkDerivation rec { have questions on the subject, that are not yet covered by the FAQ, please contact us. ''; - license = licenses.gpl2; + license = licenses.proprietary; maintainers = [ maintainers.goibhniu ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/audio/linuxsampler/linuxsampler_lv2_sfz_fix.diff b/pkgs/applications/audio/linuxsampler/linuxsampler_lv2_sfz_fix.diff new file mode 100644 index 00000000000..114726db19d --- /dev/null +++ b/pkgs/applications/audio/linuxsampler/linuxsampler_lv2_sfz_fix.diff @@ -0,0 +1,50 @@ +Index: linuxsampler-r2359/src/hostplugins/lv2/PluginLv2.cpp +=================================================================== +--- linuxsampler-r2359/src/hostplugins/lv2/PluginLv2.cpp (revision 2359) ++++ linuxsampler-r2359/src/hostplugins/lv2/PluginLv2.cpp (working copy) +@@ -18,6 +18,8 @@ + * MA 02110-1301 USA * + ***************************************************************************/ + ++#define _BSD_SOURCE 1 /* for realpath() */ ++ + #include + #include + #include +@@ -118,6 +120,23 @@ + dmsg(2, ("linuxsampler: Deactivate\n")); + } + ++ static String RealPath(const String& path) ++ { ++ String out = path; ++ char* cpath = NULL; ++#ifdef _WIN32 ++ cpath = (char*)malloc(MAX_PATH); ++ GetFullPathName(path.c_str(), MAX_PATH, cpath, NULL); ++#else ++ cpath = realpath(path.c_str(), NULL); ++#endif ++ if (cpath) { ++ out = cpath; ++ free(cpath); ++ } ++ return out; ++ } ++ + String PluginLv2::PathToState(const String& path) { + if (MapPath) { + char* cstr = MapPath->abstract_path(MapPath->handle, path.c_str()); +@@ -131,9 +150,10 @@ + String PluginLv2::PathFromState(const String& path) { + if (MapPath) { + char* cstr = MapPath->absolute_path(MapPath->handle, path.c_str()); +- const String abstract_path(cstr); ++ // Resolve symbolic links so SFZ sample paths load correctly ++ const String absolute_path(RealPath(cstr)); + free(cstr); +- return abstract_path; ++ return absolute_path; + } + return path; + } diff --git a/pkgs/applications/audio/mikmod/default.nix b/pkgs/applications/audio/mikmod/default.nix new file mode 100644 index 00000000000..a86e09278c3 --- /dev/null +++ b/pkgs/applications/audio/mikmod/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, libmikmod, ncurses }: + +stdenv.mkDerivation rec { + name = "mikmod-3.2.2"; + src = fetchurl { + url = "http://mikmod.shlomifish.org/files/${name}.tar.gz"; + sha256 = "105vl1kyah588wpbpq6ck1wlr0jj55l2ps72q5i01gs9px8ncmp8"; + }; + + buildInputs = [ libmikmod ncurses ]; + + meta = { + description = "Tracker music player for the terminal"; + homepage = http://mikmod.shlomifish.org/; + license = "GPLv2+"; + maintainers = with stdenv.lib.maintainers; [ viric ]; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/applications/audio/ncmpcpp/default.nix b/pkgs/applications/audio/ncmpcpp/default.nix index b9d30409711..3af9bc7690f 100644 --- a/pkgs/applications/audio/ncmpcpp/default.nix +++ b/pkgs/applications/audio/ncmpcpp/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "ncmpcpp-${version}"; src = fetchurl { - url = "http://unkart.ovh.org/ncmpcpp/ncmpcpp-${version}.tar.bz2"; + url = "http://ncmpcpp.rybczak.net/stable/ncmpcpp-${version}.tar.bz2"; sha256 = "1kbkngs4fhf9z53awskqiwdl94i5slvxmjiajkrayi99373fallx"; }; diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix new file mode 100644 index 00000000000..dccb6571f4d --- /dev/null +++ b/pkgs/applications/audio/picard/default.nix @@ -0,0 +1,46 @@ +{ stdenv, fetchurl, pythonPackages, gettext, pyqt4 +, pkgconfig, libdiscid, libofa, ffmpeg }: + +pythonPackages.buildPythonPackage rec { + name = "picard-${version}"; + namePrefix = ""; + version = "1.1"; + + src = fetchurl { + url = "http://ftp.musicbrainz.org/pub/musicbrainz/picard/${name}.tar.gz"; + md5 = "57abb76632a423760f336ac11da5c149"; + }; + + buildInputs = [ + pkgconfig + ffmpeg + libofa + gettext + ]; + + propagatedBuildInputs = [ + pythonPackages.mutagen + pyqt4 + libdiscid + ]; + + configurePhase = '' + python setup.py config + ''; + + buildPhase = '' + python setup.py build + ''; + + installPhase = '' + python setup.py install --prefix="$out" + ''; + + doCheck = false; + + meta = { + homepage = "http://musicbrainz.org/doc/MusicBrainz_Picard"; + description = "The official MusicBrainz tagger"; + license = stdenv.lib.licenses.gpl2; + }; +} diff --git a/pkgs/applications/audio/praat/default.nix b/pkgs/applications/audio/praat/default.nix new file mode 100644 index 00000000000..f2f196acdd8 --- /dev/null +++ b/pkgs/applications/audio/praat/default.nix @@ -0,0 +1,26 @@ +{stdenv, fetchurl, alsaLib, gtk, pkgconfig }: + +stdenv.mkDerivation { + name = "praat-5323"; + src = fetchurl { + url = http://www.fon.hum.uva.nl/praat/praat5323_sources.tar.gz; + sha256 = "1m0m5165h74mw5xhmnnyzh5ans3cn78w5rs9572sa1512cams203"; + }; + + configurePhase = '' + cp makefiles/makefile.defs.linux makefile.defs + ''; + + installPhase = '' + ensureDir $out/bin + cp praat $out/bin + ''; + + buildInputs = [ alsaLib gtk pkgconfig ]; + + meta = { + description = "Doing phonetics by computer"; + homepage = http://www.fon.hum.uva.nl/praat/; + license = "GPLv2+"; # Has some 3rd-party code in it though + }; +} diff --git a/pkgs/applications/display-managers/slim/default.nix b/pkgs/applications/display-managers/slim/default.nix index be546d76836..0675b02a314 100644 --- a/pkgs/applications/display-managers/slim/default.nix +++ b/pkgs/applications/display-managers/slim/default.nix @@ -1,39 +1,33 @@ -{stdenv, fetchurl, x11, libjpeg, libpng12, libXmu, freetype, pam}: +{ stdenv, fetchurl, cmake, pkgconfig, x11, libjpeg, libpng12, libXmu +, fontconfig, freetype, pam, consolekit, dbus_libs }: stdenv.mkDerivation rec { - name = "slim-1.3.2"; + name = "slim-1.3.4"; src = fetchurl { url = "http://download.berlios.de/slim/${name}.tar.gz"; - sha256 = "1f42skdp5k1zrb364s3i0ps5wmx9szz9h192i2dkn9az00jh2mpi"; + sha256 = "00fmrg2v41jnqhx0yc1kv97xxh5gai18n0i4as9g1fcq1i32cp0m"; }; patches = [ # Allow the paths of the configuration file and theme directory to # be set at runtime. ./runtime-paths.patch - - # Fix a bug in slim's PAM support: the "resp" argument to the - # conversation function is a pointer to a pointer to an array of - # pam_response structures, not a pointer to an array of pointers to - # pam_response structures. Of course C can't tell the difference... - ./pam.patch - - # Don't set PAM_RHOST to "localhost", it confuses ConsoleKit - # (which assumes that a non-empty string means a remote session). - ./pam2.patch ]; - buildInputs = [x11 libjpeg libpng12 libXmu freetype pam]; + buildInputs = + [ cmake pkgconfig x11 libjpeg libpng12 libXmu fontconfig freetype + pam dbus_libs + ] ++ stdenv.lib.optional (consolekit != null) consolekit; - NIX_CFLAGS_COMPILE = "-I${freetype}/include/freetype2"; + preConfigure = "substituteInPlace CMakeLists.txt --replace /etc $out/etc"; - preBuild = '' - substituteInPlace Makefile --replace /usr /no-such-path - makeFlagsArray=(CC=gcc CXX=g++ PREFIX=$out MANDIR=$out/share/man CFGDIR=$out/etc USE_PAM=1) - ''; + cmakeFlags = [ "-DUSE_PAM=1" ] ++ stdenv.lib.optional (consolekit != null) "-DUSE_CONSOLEKIT=1"; + + NIX_CFLAGS_LINK = "-lXmu"; meta = { homepage = http://slim.berlios.de; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/display-managers/slim/pam.patch b/pkgs/applications/display-managers/slim/pam.patch deleted file mode 100644 index 2163d20a5e3..00000000000 --- a/pkgs/applications/display-managers/slim/pam.patch +++ /dev/null @@ -1,89 +0,0 @@ -diff -rc slim-1.3.1-orig/app.cpp slim-1.3.1/app.cpp -*** slim-1.3.1-orig/app.cpp 2008-09-26 02:54:15.000000000 +0200 ---- slim-1.3.1/app.cpp 2009-02-17 19:50:06.000000000 +0100 -*************** -*** 41,48 **** - Panel* panel = *static_cast(appdata_ptr); - int result = PAM_SUCCESS; - for (int i=0; iresp=0; -! resp[i]->resp_retcode=0; - switch(msg[i]->msg_style){ - case PAM_PROMPT_ECHO_ON: - // We assume PAM is asking for the username ---- 41,48 ---- - Panel* panel = *static_cast(appdata_ptr); - int result = PAM_SUCCESS; - for (int i=0; imsg_style){ - case PAM_PROMPT_ECHO_ON: - // We assume PAM is asking for the username -*************** -*** 51,63 **** - case Panel::Suspend: - case Panel::Halt: - case Panel::Reboot: -! resp[i]->resp=strdup("root"); - break; - - case Panel::Console: - case Panel::Exit: - case Panel::Login: -! resp[i]->resp=strdup(panel->GetName().c_str()); - break; - } - break; ---- 51,63 ---- - case Panel::Suspend: - case Panel::Halt: - case Panel::Reboot: -! (*resp)[i].resp=strdup("root"); - break; - - case Panel::Console: - case Panel::Exit: - case Panel::Login: -! (*resp)[i].resp=strdup(panel->GetName().c_str()); - break; - } - break; -*************** -*** 73,79 **** - - default: - panel->EventHandler(Panel::Get_Passwd); -! resp[i]->resp=strdup(panel->GetPasswd().c_str()); - break; - } - break; ---- 73,79 ---- - - default: - panel->EventHandler(Panel::Get_Passwd); -! (*resp)[i].resp=strdup(panel->GetPasswd().c_str()); - break; - } - break; -*************** -*** 89,97 **** - } - if (result!=PAM_SUCCESS){ - for (int i=0; iresp==0) continue; -! free(resp[i]->resp); -! resp[i]->resp=0; - }; - free(*resp); - *resp=0; ---- 89,97 ---- - } - if (result!=PAM_SUCCESS){ - for (int i=0; i libpng != null; # probably a bug assert stdenv.isDarwin -> libXaw != null; # fails to link otherwise stdenv.mkDerivation rec { - name = "emacs-24.1"; + name = "emacs-24.2"; builder = ./builder.sh; src = fetchurl { url = "mirror://gnu/emacs/${name}.tar.bz2"; - sha256 = "eeea272732146e2be9aee2f8d71d6cf07b8654c0282da62a26b921d433f02b7c"; + sha256 = "13wbjfjmz13qpjwssy44nw2230lllmkkgjsy0rqfm6am2cf87n3k"; }; buildInputs = diff --git a/pkgs/applications/editors/emacs-modes/auto-complete/default.nix b/pkgs/applications/editors/emacs-modes/auto-complete/default.nix new file mode 100644 index 00000000000..75f484d295b --- /dev/null +++ b/pkgs/applications/editors/emacs-modes/auto-complete/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, emacs }: + +stdenv.mkDerivation rec { + name = "auto-complete-1.3.1"; + + src = fetchurl { + url = "http://cx4a.org/pub/auto-complete/${name}.tar.bz2"; + sha256 = "124qxfp0pcphwlmrasbfrci48brxnrzc38h4wcf2sn20x1mvcrlj"; + }; + + buildInputs = [ emacs ]; + + preInstall = '' + install -d $out/share/emacs/site-lisp + ''; + + installFlags = "DIR=$(out)/share/emacs/site-lisp"; + + postInstall = '' + ln -s javascript-mode $out/share/emacs/site-lisp/ac-dict/js2-mode + ''; + + meta = { + description = "Auto-complete extension for Emacs"; + homepage = http://cx4a.org/software/auto-complete/; + license = "GPLv3+"; + + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/applications/editors/emacs-modes/coffee/default.nix b/pkgs/applications/editors/emacs-modes/coffee/default.nix new file mode 100644 index 00000000000..c40b3d4cd65 --- /dev/null +++ b/pkgs/applications/editors/emacs-modes/coffee/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchgit, emacs }: + +stdenv.mkDerivation rec { + name = "coffee-mode-0.4.1"; + + src = fetchgit { + url = "https://github.com/defunkt/coffee-mode.git"; + rev = "c45c5f7a529363bc7aa57db0f3df26389fd233d8"; + sha256 = "36a7792b5ffbcc5a580e8d5b2425494c60a8015cfde0e3f8a946a685da231ce2"; + }; + + buildInputs = [ emacs ]; + + buildPhase = '' + emacs --batch -f batch-byte-compile coffee-mode.el + ''; + + installPhase = '' + install -d $out/share/emacs/site-lisp + install coffee-mode.el coffee-mode.elc $out/share/emacs/site-lisp + ''; + + meta = { + description = "An Emacs major mode for CoffeeScript, unfancy JavaScript."; + homepage = https://github.com/defunkt/coffee-mode; + license = "GPLv2+"; + + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/applications/editors/emacs-modes/color-theme/default.nix b/pkgs/applications/editors/emacs-modes/color-theme/default.nix new file mode 100644 index 00000000000..9cc0e7fd42b --- /dev/null +++ b/pkgs/applications/editors/emacs-modes/color-theme/default.nix @@ -0,0 +1,26 @@ +{stdenv, fetchurl, emacs}: + +stdenv.mkDerivation rec { + name = "color-theme-6.6.0"; + + src = fetchurl { + url = "http://download.savannah.gnu.org/releases/color-theme/${name}.tar.gz"; + sha256 = "0yx1ghcjc66s1rl0v3d4r1k88ifw591hf814ly3d73acvh15zlsn"; + }; + + # patches from http://aur.archlinux.org/packages.php?ID=54883 + patches = [ ./fix-build.patch ./gnus-bug.diff ]; + + buildInputs = [ emacs ]; + + installFlags = [ "ELISPDIR=$(out)/share/emacs/site-lisp" ]; + installTargets = "install-bin"; + + meta = { + description = "An emacs-lisp mode for skinning your emacs."; + homepage = http://www.nongnu.org/color-theme; + license = "GPLv2+"; + + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/applications/editors/emacs-modes/color-theme/fix-build.patch b/pkgs/applications/editors/emacs-modes/color-theme/fix-build.patch new file mode 100644 index 00000000000..cfc237c8cdc --- /dev/null +++ b/pkgs/applications/editors/emacs-modes/color-theme/fix-build.patch @@ -0,0 +1,19 @@ +--- a/Makefile 2009-05-15 18:22:49.000000000 +0200 ++++ b/Makefile 2009-05-16 08:59:36.000000000 +0200 +@@ -15,6 +15,7 @@ + TARGET = $(patsubst %.el,%.elc,$(SPECIAL) $(SOURCE)) + MANUAL = color-theme + MISC = AUTHORS COPYING ChangeLog Makefile.defs Makefile $(AUTOLOADFILE).in ++LOADPATH = "$(shell pwd)" "$(shell pwd)/themes" + #AUTHORS CREDITS HISTORY NEWS README Makefile ChangeLog \ + #ChangeLog.2005 ChangeLog.2004 ChangeLog.2003 ChangeLog.2002 \ + #ChangeLog.2001 servers.pl color-theme-auto.in color-theme.texi +@@ -47,7 +48,7 @@ + + %.elc: %.el + @$(EMACS) $(OPTIONCOMPILE) \ +- --eval '(setq load-path (cons "." load-path))' \ ++ --eval '(setq load-path (append load-path (list $(LOADPATH))))' \ + -f batch-byte-compile $< + + %.info: %.texi diff --git a/pkgs/applications/editors/emacs-modes/color-theme/gnus-bug.diff b/pkgs/applications/editors/emacs-modes/color-theme/gnus-bug.diff new file mode 100644 index 00000000000..9d227df562e --- /dev/null +++ b/pkgs/applications/editors/emacs-modes/color-theme/gnus-bug.diff @@ -0,0 +1,28 @@ +diff -Naur color-theme-6.6.0.orig/color-theme.el color-theme-6.6.0.new/color-theme.el +--- color-theme-6.6.0.orig/color-theme.el 2011-11-18 01:17:29.000000000 +0100 ++++ color-theme-6.6.0.new/color-theme.el 2011-11-18 01:24:07.000000000 +0100 +@@ -73,9 +73,10 @@ + "Non-nil if running XEmacs.") + + ;; Add this since it appears to miss in emacs-2x +-(or (fboundp 'replace-in-string) +- (defun replace-in-string (target old new) +- (replace-regexp-in-string old new target))) ++(if (fboundp 'replace-in-string) ++ (defalias 'color-theme-replace-in-string 'replace-in-string) ++ (defsubst color-theme-replace-in-string (target old new &optional literal) ++ (replace-regexp-in-string old new target nil literal))) + + ;; face-attr-construct has a problem in Emacs 20.7 and older when + ;; dealing with inverse-video faces. Here is a short test to check +@@ -1626,8 +1627,8 @@ + (add-to-list 'color-themes + (list ',n + (upcase-initials +- (replace-in-string +- (replace-in-string ++ (color-theme-replace-in-string ++ (color-theme-replace-in-string + (symbol-name ',n) "^color-theme-" "") "-" " ")) + ,author)) + (defun ,n () diff --git a/pkgs/applications/editors/emacs-modes/flymake-cursor/default.nix b/pkgs/applications/editors/emacs-modes/flymake-cursor/default.nix new file mode 100644 index 00000000000..b629186033f --- /dev/null +++ b/pkgs/applications/editors/emacs-modes/flymake-cursor/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, emacs }: + +stdenv.mkDerivation rec { + name = "flymake-cursor-0.1.4"; + + src = fetchurl { + url = "http://www.emacswiki.org/emacs/download/flymake-cursor.el"; + sha256 = "1wxqqmn2fk2b778nksvgn1mi7ajarcpc5lla90xx9jwz47d9hx02"; + }; + + phases = [ "buildPhase" "installPhase"]; + + buildInputs = [ emacs ]; + + buildPhase = '' + cp $src flymake-cursor.el + emacs --batch -f batch-byte-compile flymake-cursor.el + ''; + + installPhase = '' + install -d $out/share/emacs/site-lisp + install flymake-cursor.el flymake-cursor.elc $out/share/emacs/site-lisp + ''; + + meta = { + description = "Displays flymake error msg in minibuffer after delay."; + homepage = http://www.emacswiki.org/emacs/flymake-cursor.el; + license = stdenv.lib.licenses.publicDomain; + + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/applications/editors/emacs-modes/gh/default.nix b/pkgs/applications/editors/emacs-modes/gh/default.nix new file mode 100644 index 00000000000..28773e97c40 --- /dev/null +++ b/pkgs/applications/editors/emacs-modes/gh/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchgit, emacs, pcache, logito }: + +stdenv.mkDerivation rec { + name = "gh-0.5.3"; + + src = fetchgit { + url = "https://github.com/sigma/gh.el.git"; + rev = "ef03b63d063ec22f03af449aa955c98dfad7f80e"; + sha256 = "efa231e0091e8c7785385149dc97b2d8dc24aba65f4b0974b8ed7f62b7596ad3"; + }; + + buildInputs = [ emacs ]; + propagatedUserEnvPkgs = [ pcache logito ]; + + patchPhase = '' + sed -i Makefile \ + -e "s|^ *EFLAGS *=|& -L ${pcache}/share/emacs/site-lisp -L ${logito}/share/emacs/site-lisp --eval '(setq user-emacs-directory \"./\")'|" \ + -e "s|/usr/local|$out|" \ + -e "s|/site-lisp/\$(PKGNAME)|/site-lisp|" + ''; + + buildPhase = "make lisp"; + + meta = { + description = "A (very early) GitHub client library for Emacs"; + homepage = https://github.com/sigma/gh.el; + license = "GPLv2+"; + + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/applications/editors/emacs-modes/gist/default.nix b/pkgs/applications/editors/emacs-modes/gist/default.nix new file mode 100644 index 00000000000..21a2137dd39 --- /dev/null +++ b/pkgs/applications/editors/emacs-modes/gist/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchgit, emacs, gh, pcache, logito }: + +stdenv.mkDerivation rec { + name = "gist-1.0"; + + src = fetchgit { + url = "https://github.com/sigma/gist.el.git"; + rev = "bbb457e4eaaf5f96cfaaa4f63021e3e542bfbfed"; + sha256 = "469f9df52076d0c6038183cff4b9415bca98de66c08814a60b69729b44bdf294"; + }; + + buildInputs = [ emacs ]; + + buildPhase = '' + emacs -L ${gh}/share/emacs/site-lisp \ + -L ${pcache}/share/emacs/site-lisp \ + -L ${logito}/share/emacs/site-lisp \ + --eval '(setq user-emacs-directory "./")' \ + --batch -f batch-byte-compile gist.el + ''; + + propagatedUserEnvPkgs = [ gh pcache logito ]; + + installPhase = '' + install -d $out/share/emacs/site-lisp + install gist.el gist.elc $out/share/emacs/site-lisp + ''; + + meta = { + description = "Emacs integration for gist.github.com"; + homepage = https://github.com/sigma/gist.el; + license = "GPLv2+"; + + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/applications/editors/emacs-modes/haskell/default.nix b/pkgs/applications/editors/emacs-modes/haskell/default.nix index f58b66a506e..c8de8726284 100644 --- a/pkgs/applications/editors/emacs-modes/haskell/default.nix +++ b/pkgs/applications/editors/emacs-modes/haskell/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchgit, emacs }: stdenv.mkDerivation { - name = "haskell-mode-2.8.0.29-g7682f99"; + name = "haskell-mode-2.8.0.29-gae3e4499d2"; src = fetchgit { url = "http://github.com/haskell/haskell-mode.git"; - rev = "7682f991acd63d9400597d5f4980f62d7b1c4c0b"; - sha256 = "f4508a11fa65ece237c9ee9f623bc4e9ad3d3d58ab2fcacc8ddb080c29aac717"; + rev = "ae3e4499d27a1468bdf88ffe0ce15cd7e4bb9f2a"; + sha256 = "29a1725da620c13ff2b3b56906e76dd9f19317eee92bd5750b3aa9a4264effae"; }; buildInputs = [emacs]; diff --git a/pkgs/applications/editors/emacs-modes/htmlize/default.nix b/pkgs/applications/editors/emacs-modes/htmlize/default.nix index 948beae82d4..d4de24d394c 100644 --- a/pkgs/applications/editors/emacs-modes/htmlize/default.nix +++ b/pkgs/applications/editors/emacs-modes/htmlize/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl }: stdenv.mkDerivation { - name = "htmlize-1.37"; + name = "htmlize-1.40"; builder = ./builder.sh; src = fetchurl { url = http://fly.srk.fer.hr/~hniksic/emacs/htmlize.el.cgi; - sha256 = "70cf41a2ea6a478a45143a8cd672381c01ed894448200e602531acbf2b1fd160"; + sha256 = "1v7pzif5b7dr6iyllqvzka8i6s23rsjdnmilnma054gv8d4shw6a"; }; meta = { diff --git a/pkgs/applications/editors/emacs-modes/jade/default.nix b/pkgs/applications/editors/emacs-modes/jade/default.nix new file mode 100644 index 00000000000..0c99ceaca22 --- /dev/null +++ b/pkgs/applications/editors/emacs-modes/jade/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchgit, emacs }: + +stdenv.mkDerivation { + name = "jade-mode-0-20120802"; + + src = fetchgit { + url = "https://github.com/brianc/jade-mode.git"; + rev = "275ab149edb0f6bcfae6ac17ba456f3351191604"; + sha256 = "3cd2bebcd66e59d60b8e5e538e65a8ffdfc9a53b86443090a284e8329d7cb09b"; + }; + + buildInputs = [ emacs ]; + + buildPhase = '' + emacs --batch -L . -f batch-byte-compile *.el + ''; + + installPhase = '' + mkdir -p $out/share/emacs/site-lisp + cp *.el *.elc $out/share/emacs/site-lisp/ + ''; + + meta = { + description = "Emacs major mode for jade and stylus."; + homepage = https://github.com/brianc/jade-mode; + license = "GPLv2+"; + + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/applications/editors/emacs-modes/js2/default.nix b/pkgs/applications/editors/emacs-modes/js2/default.nix index 87661d75ff5..cbd88330434 100644 --- a/pkgs/applications/editors/emacs-modes/js2/default.nix +++ b/pkgs/applications/editors/emacs-modes/js2/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchgit, emacs }: stdenv.mkDerivation { - name = "js2-mode-0-20120601"; + name = "js2-mode-0-20120712"; src = fetchgit { url = "git://github.com/mooz/js2-mode.git"; - rev = "81bcbf7df7077db27facf0470cf9e31c18b8333e"; - sha256 = "1bec62816ec9d5f5882832902020573d95d038fff25b17bf1975b84a3ab535c3"; + rev = "f8cb9c52614e0a8e477f1ac557585ed950246c9b"; + sha256 = "37055b7e8c1d9eee6b86f6b9b9d74ad196cc43701bc2263ffd539a3e44025047"; }; buildInputs = [ emacs ]; diff --git a/pkgs/applications/editors/emacs-modes/logito/default.nix b/pkgs/applications/editors/emacs-modes/logito/default.nix new file mode 100644 index 00000000000..09161ec8067 --- /dev/null +++ b/pkgs/applications/editors/emacs-modes/logito/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchgit, emacs }: + +stdenv.mkDerivation rec { + name = "logito-0.1"; + + src = fetchgit { + url = "https://github.com/sigma/logito.git"; + rev = "824acb89d2cc18cb47281a4fbddd81ad244a2052"; + sha256 = "b9a7433417eafc5bc158f63dddf559b2044368eb3061f0264169de319c68fe4a"; + }; + + buildInputs = [ emacs ]; + + buildPhase = '' + emacs --batch -f batch-byte-compile logito.el + ''; + + installPhase = '' + install -d $out/share/emacs/site-lisp + install logito.el logito.elc $out/share/emacs/site-lisp + ''; + + meta = { + description = "tiny logging framework for Emacs"; + homepage = https://github.com/sigma/logito; + license = "GPLv2+"; + + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/applications/editors/emacs-modes/lorem-ipsum/default.nix b/pkgs/applications/editors/emacs-modes/lorem-ipsum/default.nix new file mode 100644 index 00000000000..94427537003 --- /dev/null +++ b/pkgs/applications/editors/emacs-modes/lorem-ipsum/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, emacs }: + +stdenv.mkDerivation rec { + name = "lorem-ipsum-0.1"; + + src = fetchurl { + url = "http://www.emacswiki.org/emacs/download/lorem-ipsum.el"; + sha256 = "122d0z3xqfaikgk34l7bh989mfxddin2ljinysp2lqw8djfi7jsl"; + }; + + phases = [ "buildPhase" "installPhase"]; + + buildInputs = [ emacs ]; + + buildPhase = '' + cp $src lorem-ipsum.el + emacs --batch -f batch-byte-compile lorem-ipsum.el + ''; + + installPhase = '' + install -d $out/share/emacs/site-lisp + install lorem-ipsum.el lorem-ipsum.elc $out/share/emacs/site-lisp + ''; + + meta = { + description = "Insert dummy pseudo Latin text for emacs."; + homepage = http://www.emacswiki.org/emacs/LoremIpsum; + license = "GPLv2+"; + + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/applications/editors/emacs-modes/org/default.nix b/pkgs/applications/editors/emacs-modes/org/default.nix index fb4de650ee0..d3829bc9d11 100644 --- a/pkgs/applications/editors/emacs-modes/org/default.nix +++ b/pkgs/applications/editors/emacs-modes/org/default.nix @@ -1,30 +1,24 @@ -{ fetchurl, stdenv, emacs, texinfo, which }: +{ fetchurl, stdenv, emacs, texinfo, which, texLive }: stdenv.mkDerivation rec { - name = "org-7.8.03"; + name = "org-7.9.1"; src = fetchurl { url = "http://orgmode.org/${name}.tar.gz"; - sha256 = "49357cca7d892e70cd2dfcc0b5d96d9fd164ef5a1f251ace3865ecb27dc1e958"; + sha256 = "0kz1dnzfpmmslwal150z9rxrnddjpaw2glx26qihpxzs0zzpw201"; }; - buildInputs = [ emacs texinfo ]; - - patchPhase = - '' sed -i "lisp/org-clock.el" -e's|"which"|"${which}/bin/which"|g' - ''; + buildInputs = [ emacs ]; + buildNativeInputs = [ texinfo texLive ]; configurePhase = - '' sed -i Makefile \ - -e "s|^prefix=.*$|prefix=$out|g" + '' sed -i mk/default.mk \ + -e "s|^prefix\t=.*$|prefix=$out|g" ''; - #XXX: fails because of missing UTILITIES/manfull.pl, currently not - # included in the release tarball, but git. - - #postBuild = - # '' make doc - # ''; + postBuild = + '' make doc + ''; installPhase = '' make install install-info diff --git a/pkgs/applications/editors/emacs-modes/org2blog/default.nix b/pkgs/applications/editors/emacs-modes/org2blog/default.nix new file mode 100644 index 00000000000..c8c538c5cb7 --- /dev/null +++ b/pkgs/applications/editors/emacs-modes/org2blog/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchgit, emacs, xmlRpc }: + +stdenv.mkDerivation rec { + name = "org2blog-0.5"; + + src = fetchgit { + url = https://github.com/punchagan/org2blog.git; + rev = "338abe30e9bc89684f8384f8deaf826b63844da6"; + sha256 = "46ab31e90d0d54071c126b7d5599a3e82062baa79ddf26b988bcb88d306d6827"; + }; + + buildInputs = [ emacs ]; + propagatedUserEnvPkgs = [ xmlRpc ]; + + buildPhase = '' + emacs -L . -L ${xmlRpc}/share/emacs/site-lisp --batch -f batch-byte-compile *.el + ''; + + installPhase = '' + install -d $out/share/emacs/site-lisp + install *.el* $out/share/emacs/site-lisp + ''; + + meta = { + description = "A tool to publish directly from Emacs’ org-mode to WordPress blogs."; + homepage = https://github.com/punchagan/org2blog; + license = "GPLv3+"; + + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/applications/editors/emacs-modes/pcache/default.nix b/pkgs/applications/editors/emacs-modes/pcache/default.nix new file mode 100644 index 00000000000..c0aa0772678 --- /dev/null +++ b/pkgs/applications/editors/emacs-modes/pcache/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchgit, emacs }: + +stdenv.mkDerivation rec { + name = "pcache-0.2.3"; + + src = fetchgit { + url = "https://github.com/sigma/pcache.git"; + rev = "fa8f863546e2e8f2fc0a70f5cc766a7f584e01b6"; + sha256 = "f7cdad5a729b24f96ec69db4adfd19daf45c27aaf3a0267385b252cb2e59daa0"; + }; + + buildInputs = [ emacs ]; + + buildPhase = '' + emacs --batch -f batch-byte-compile pcache.el + ''; + + installPhase = '' + install -d $out/share/emacs/site-lisp + install pcache.el pcache.elc $out/share/emacs/site-lisp + ''; + + meta = { + description = "Persistent caching for Emacs"; + homepage = https://github.com/sigma/pcache.el; + license = "GPLv2+"; + + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/applications/editors/emacs-modes/rect-mark/default.nix b/pkgs/applications/editors/emacs-modes/rect-mark/default.nix new file mode 100644 index 00000000000..ac01e02b433 --- /dev/null +++ b/pkgs/applications/editors/emacs-modes/rect-mark/default.nix @@ -0,0 +1,32 @@ +{stdenv, fetchurl, emacs}: + +stdenv.mkDerivation rec { + name = "rect-mark-1.4"; + + src = fetchurl { + url = "http://emacswiki.org/emacs/download/rect-mark.el"; + sha256 = "0pyyg53z9irh5jdfvh2qp4pm8qrml9r7lh42wfmdw6c7f56qryh8"; + }; + + phases = [ "buildPhase" "installPhase"]; + + buildInputs = [ emacs ]; + + buildPhase = '' + cp $src rect-mark.el + emacs --batch -f batch-byte-compile rect-mark.el + ''; + + installPhase = '' + install -d $out/share/emacs/site-lisp + install rect-mark.el* $out/share/emacs/site-lisp + ''; + + meta = { + description = "Mark a rectangle of text with highlighting."; + homepage = http://emacswiki.org/emacs/RectangleMark; + license = "GPLv2+"; + + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/applications/editors/emacs-modes/sunrise-commander/default.nix b/pkgs/applications/editors/emacs-modes/sunrise-commander/default.nix new file mode 100644 index 00000000000..a253e25cad4 --- /dev/null +++ b/pkgs/applications/editors/emacs-modes/sunrise-commander/default.nix @@ -0,0 +1,30 @@ +{stdenv, fetchgit, emacs}: + +stdenv.mkDerivation rec { + name = "sunrise-commander-6r435"; + + src = fetchgit { + url = https://github.com/escherdragon/sunrise-commander.git; + rev = "7a44ca7abd9fe79f87934c78d00dc2a91419a4f1"; + sha256 = "2909beccc9daaa79e70876ac6547088c2459b624c364dda1886fe4d7adc7708b"; + }; + + buildInputs = [ emacs ]; + + buildPhase = '' + emacs -L . --batch -f batch-byte-compile *.el + ''; + + installPhase = '' + mkdir -p $out/share/emacs/site-lisp + install *.el* $out/share/emacs/site-lisp + ''; + + meta = { + description = "Two-pane file manager for Emacs based on Dired and inspired by MC."; + homepage = http://www.emacswiki.org/emacs/Sunrise_Commander; + license = "GPLv3+"; + + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/applications/editors/emacs-modes/xml-rpc/default.nix b/pkgs/applications/editors/emacs-modes/xml-rpc/default.nix new file mode 100644 index 00000000000..87a732b5b4c --- /dev/null +++ b/pkgs/applications/editors/emacs-modes/xml-rpc/default.nix @@ -0,0 +1,32 @@ +{stdenv, fetchurl, emacs}: + +stdenv.mkDerivation rec { + name = "xml-rpc-1.6.8"; + + src = fetchurl { + url = https://launchpadlibrarian.net/40270196/xml-rpc.el; + sha256 = "0i8hf90yhrjwqrv7q1f2g1cff6ld8apqkka42fh01wkdys1fbm7b"; + }; + + phases = [ "buildPhase" "installPhase"]; + + buildInputs = [ emacs ]; + + buildPhase = '' + cp $src xml-rpc.el + emacs --batch -f batch-byte-compile xml-rpc.el + ''; + + installPhase = '' + install -d $out/share/emacs/site-lisp + install xml-rpc.el* $out/share/emacs/site-lisp + ''; + + meta = { + description = "An elisp implementation of clientside XML-RPC."; + homepage = https://launchpad.net/xml-rpc-el; + license = "GPLv3+"; + + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/applications/editors/joe/default.nix b/pkgs/applications/editors/joe/default.nix index b6324e5879c..0e97a036905 100644 --- a/pkgs/applications/editors/joe/default.nix +++ b/pkgs/applications/editors/joe/default.nix @@ -1,10 +1,11 @@ {stdenv, fetchurl} : -stdenv.mkDerivation { - name = "joe-3.3"; +stdenv.mkDerivation rec { + name = "joe-3.7"; + src = fetchurl { - url = mirror://sourceforge/joe-editor/joe-3.3.tar.gz; - md5 = "02221716679c039c5da00c275d61dbf4"; + url = "mirror://sourceforge/joe-editor/${name}.tar.gz"; + sha256 = "0vqhffdjn3xwsfa383i6kdrpfwilq8b382ljjhy1v32smphmdr6a"; }; meta = { diff --git a/pkgs/applications/editors/kdevelop/default.nix b/pkgs/applications/editors/kdevelop/default.nix index 92b4da5280a..249ede5ebd0 100644 --- a/pkgs/applications/editors/kdevelop/default.nix +++ b/pkgs/applications/editors/kdevelop/default.nix @@ -3,18 +3,26 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; - version = "4.3.0"; + version = "4.3.1"; pname = "kdevelop"; src = fetchurl { url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.bz2"; - sha256 = "0vb2f5922r1da4va8sx2qn2i1lf2gqg7nfg594kncy98a9b1avnr"; + sha256 = "0015hv39rqhyq1w6jw65lx7ls4l5pc3a2asvd5zsd65831vrfxxs"; }; buildInputs = [ kdevplatform kdebase_workspace okteta ]; buildNativeInputs = [ cmake pkgconfig automoc4 shared_mime_info gettext perl ]; + patches = + [ ( fetchurl { + url = https://git.reviewboard.kde.org/r/105211/diff/raw/; + name = "okteta-0.9.patch"; # fixes build with KDE-4.9.x + sha256 = "1mvqhw7jr1vi66l3jgam3slyfafcvwy4g3iapfi69dpfnzhmcxl0"; + } ) + ]; + NIX_CFLAGS_COMPILE = "-I${okteta}/include/KDE"; meta = with stdenv.lib; { diff --git a/pkgs/applications/graphics/cinepaint/default.nix b/pkgs/applications/graphics/cinepaint/default.nix index 2f1af0f89dd..bea04f6dc2c 100644 --- a/pkgs/applications/graphics/cinepaint/default.nix +++ b/pkgs/applications/graphics/cinepaint/default.nix @@ -2,7 +2,7 @@ flex, libtiff, libjpeg, libpng, libexif, zlib, perl, libX11, perlXMLParser, python, pygtk, gettext, intltool, babl, gegl, glib, makedepend, xf86vidmodeproto, xineramaproto, libXmu, openexr, - mesa, libXext, libXpm, libXxf86vm, pixman, libpthreadstubs } : + mesa, libXext, libXpm, libXau, libXxf86vm, pixman, libpthreadstubs, fltk } : stdenv.mkDerivation rec { name = "cinepaint-1.0"; @@ -12,15 +12,19 @@ stdenv.mkDerivation rec { sha256 = "02mbpsykd7sfr9h6c6gxld6i3bdwnsgvm70b5yff01gwi69w2wi7"; }; - buildInputs = [ gtk freetype fontconfig lcms flex libtiff libjpeg libpng + buildInputs = [ libpng gtk freetype fontconfig lcms flex libtiff libjpeg libexif zlib perl libX11 perlXMLParser python pygtk gettext intltool babl gegl glib makedepend xf86vidmodeproto xineramaproto libXmu openexr mesa - libXext libXpm libXxf86vm pixman libpthreadstubs + libXext libXpm libXau libXxf86vm pixman libpthreadstubs fltk ]; + patches = [ ./install.patch ]; + buildNativeInputs = [ cmake pkgconfig ]; - NIX_CFLAGS_COMPILE = "-I."; + NIX_LDFLAGS = "-llcms -ljpeg"; + + # NIX_CFLAGS_COMPILE = "-I."; meta = { homepage = http://www.cinepaint.org/; diff --git a/pkgs/applications/graphics/cinepaint/install.patch b/pkgs/applications/graphics/cinepaint/install.patch new file mode 100644 index 00000000000..f15ff1c4414 --- /dev/null +++ b/pkgs/applications/graphics/cinepaint/install.patch @@ -0,0 +1,24 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index dfb182f..5adaaa5 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -138,7 +138,7 @@ STRING(REPLACE "/" "\\/" ESCAPEDPREFIX ${PREFIX}) + # Note that for MacOS this needs to be revised + # for the @OSX_ICC...@ variables + ADD_CUSTOM_COMMAND( +- OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/gimprc ++ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/gimprc + COMMAND sed -e s/\@platform\@//g + -e s/\@prefix\@/${ESCAPEDPREFIX}/g + -e s/\@exec_prefix\@/\${prefix}/g +@@ -155,8 +155,8 @@ ADD_CUSTOM_COMMAND( + + ADD_CUSTOM_TARGET(RCFile ALL echo + "" +- DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/user_install +- ${CMAKE_CURRENT_SOURCE_DIR}/gimprc ++ DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/user_install ++ ${CMAKE_CURRENT_BINARY_DIR}/gimprc + ) + + diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix index ad35b751231..b59b2bb6750 100644 --- a/pkgs/applications/graphics/gimp/default.nix +++ b/pkgs/applications/graphics/gimp/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, gtk, freetype -, fontconfig, libart_lgpl, libtiff, libjpeg, libpng, libexif, zlib, perl -, perlXMLParser, python, pygtk, gettext, xlibs, intltool, babl, gegl +, fontconfig, libart_lgpl, libtiff, libjpeg, libpng12, libexif, zlib, perl +, perlXMLParser, python, pygtk, gettext, xlibs, intltool, babl_0_0_22, gegl_0_0_22 }: stdenv.mkDerivation rec { @@ -13,8 +13,8 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig gtk freetype fontconfig - libart_lgpl libtiff libjpeg libpng libexif zlib perl - perlXMLParser python pygtk gettext intltool babl gegl + libart_lgpl libtiff libjpeg libpng12 libexif zlib perl + perlXMLParser python pygtk gettext intltool babl_0_0_22 gegl_0_0_22 ]; passthru = { inherit gtk; }; # probably its a good idea to use the same gtk in plugins ? diff --git a/pkgs/applications/graphics/meshlab/default.nix b/pkgs/applications/graphics/meshlab/default.nix index 9b39d8e8f1f..a811d759f7e 100644 --- a/pkgs/applications/graphics/meshlab/default.nix +++ b/pkgs/applications/graphics/meshlab/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, qt, bzip2, lib3ds, levmar, muparser, unzip}: stdenv.mkDerivation rec { - name = "meshlab-1.2.3a"; + name = "meshlab-1.3.2"; src = fetchurl { - url = mirror://sourceforge/meshlab/MeshLabSrc_AllInc_v123a.tgz; - sha256 = "09w42q0x1yjr7l9ng952lic7vkb1arsvqg1fld5s297zwzfmsl9v"; + url = "mirror://sourceforge/meshlab/meshlab/MeshLab%20v1.3.2/MeshLabSrc_AllInc_v132.tgz"; + sha256 = "d57f0a99a55421aac54a66e2475d48f00f7b1752f9587cd69cf9b5b9c1a519b1"; }; # I don't know why I need this; without this, the rpath set at the beginning of the @@ -13,13 +13,16 @@ stdenv.mkDerivation rec { dontPatchELF = true; buildPhase = '' + mkdir -p "$out/include" + cp -r vcglib "$out/include" + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$out/include/vcglib" export NIX_LDFLAGS="-rpath $out/opt/meshlab $NIX_LDFLAGS" cd meshlab/src pushd external qmake -recursive external.pro make popd - qmake -recursive meshlabv12.pro + qmake -recursive meshlab_full.pro make ''; @@ -31,6 +34,8 @@ stdenv.mkDerivation rec { ln -s $out/opt/meshlab/meshlab $out/bin/meshlab ''; + sourceRoot = "."; + buildInputs = [ qt unzip ]; meta = { diff --git a/pkgs/applications/graphics/rapcad/default.nix b/pkgs/applications/graphics/rapcad/default.nix new file mode 100644 index 00000000000..e83824bd685 --- /dev/null +++ b/pkgs/applications/graphics/rapcad/default.nix @@ -0,0 +1,26 @@ +{stdenv, fetchgit, qt4, cgal, boost, gmp, mpfr, flex, bison, dxflib}: + +stdenv.mkDerivation rec { + version = "0.8.0"; + name = "rapcad-${version}"; + + src = fetchgit { + url = "git://git.rapcad.org/rapcad"; + rev = "refs/tags/v${version}"; + sha256 = "37c7107dc4fcf8942a4ad35377c4e42e6aedfa35296e5fcf8d84882ae35087c7"; + }; + + buildInputs = [qt4 cgal boost gmp mpfr flex bison dxflib]; + + configurePhase = '' + qmake; + sed -e "s@/usr/@$out/@g" -i $(find . -name Makefile) + ''; + + meta = { + license = stdenv.lib.licenses.gpl3; + maintainers = with stdenv.lib.maintainers; [raskin]; + platforms = stdenv.lib.platforms.linux; + description = ''Constructive solid geometry package''; + }; +} diff --git a/pkgs/applications/graphics/rawtherapee/default.nix b/pkgs/applications/graphics/rawtherapee/default.nix index 4b61ac740cb..328181790ac 100644 --- a/pkgs/applications/graphics/rawtherapee/default.nix +++ b/pkgs/applications/graphics/rawtherapee/default.nix @@ -1,35 +1,23 @@ -{ stdenv, fetchsvn, pkgconfig, gtk, cmake, pixman, libpthreadstubs, gtkmm, libXau, -libXdmcp, lcms, libiptcdata +{ stdenv, fetchurl, pkgconfig, gtk, cmake, pixman, libpthreadstubs, gtkmm, libXau +, libXdmcp, lcms2, libiptcdata +, mercurial # Not really needed for anything, but it fails if it does not find 'hg' }: stdenv.mkDerivation rec { - name = "rawtherapee-svn-25"; + name = "rawtherapee-4.0.9"; - src = fetchsvn { - url = "http://rawtherapee.googlecode.com/svn/trunk"; - rev = 25; - sha256 = "09jg47rs09lly70x1zlrb3qcwi2rry1m7gjzs39iqzp53hi9j9mh"; + src = fetchurl { + url = http://rawtherapee.googlecode.com/files/rawtherapee-4.0.9.tar.xz; + sha256 = "1ll7n7gzxs00jpw3gp9xfr90lbwqafkgqpps3j5ig6mf79frpm2a"; }; buildInputs = [ pkgconfig gtk cmake pixman libpthreadstubs gtkmm libXau libXdmcp - lcms libiptcdata ]; - - # Rawtherapee died if the default setting for the icc directory pointed to a - # non existant place - patchPhase = '' - sed -i s,/usr/share/color/icc,/tmp/, rtgui/options.cc - ''; + lcms2 libiptcdata mercurial ]; # Disable the use of the RAWZOR propietary libraries cmakeFlags = [ "-DWITH_RAWZOR=OFF" ]; - installPhase = '' - mkdir -p $out/bin $out/lib - cp rtgui/rt $out/bin - # Weird kind of path reference - cp -r ../release/* $out/bin - cp rtengine/*.so $out/lib - ''; + enableParallelBuilding = true; meta = { description = "RAW converter and digital photo processing software"; diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index c291192ef01..e8307a79cf7 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -3,11 +3,11 @@ libpng, libsamplerate, libtiff, mesa, openal, openexr, openjpeg, python, zlib, boost }: stdenv.mkDerivation rec { - name = "blender-2.62"; + name = "blender-2.63a"; src = fetchurl { url = "http://download.blender.org/source/${name}.tar.gz"; - sha256 = "19xfr5vx66p4p3hnqpglpky6f4bh3ay484mdgh7zg6j9f80dp53q"; + sha256 = "c479b1abfe5fd8a1a5d04b8d21fdbc0fc960d7855b24785b888c09792bca4c1a"; }; buildInputs = [ cmake mesa gettext python libjpeg libpng zlib openal @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-iquote ${ilmbase}/include/OpenEXR -I${python}/include/${python.libPrefix}"; - meta = { + meta = { description = "3D Creation/Animation/Publishing System"; homepage = http://www.blender.org; # They comment two licenses: GPLv2 and Blender License, but they diff --git a/pkgs/applications/misc/dmenu/default.nix b/pkgs/applications/misc/dmenu/default.nix index 32af65f924a..eae0b0ff233 100644 --- a/pkgs/applications/misc/dmenu/default.nix +++ b/pkgs/applications/misc/dmenu/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, libX11, libXinerama}: stdenv.mkDerivation rec { - name = "dmenu-4.4.1"; + name = "dmenu-4.5"; src = fetchurl { url = "http://dl.suckless.org/tools/${name}.tar.gz"; - sha256 = "0l25vdnzlslk0r4m6hjkzxdygh3wpq04b9mr8zc9h3b1md2icr3d"; + sha256 = "0l58jpxrr80fmyw5pgw5alm5qry49aw6y049745wl991v2cdcb08"; }; buildInputs = [ libX11 libXinerama ]; @@ -20,3 +20,4 @@ stdenv.mkDerivation rec { platforms = with stdenv.lib.platforms; all; }; } + diff --git a/pkgs/applications/misc/eaglemode/default.nix b/pkgs/applications/misc/eaglemode/default.nix index f027588c5dc..519db53ea18 100644 --- a/pkgs/applications/misc/eaglemode/default.nix +++ b/pkgs/applications/misc/eaglemode/default.nix @@ -2,11 +2,11 @@ librsvg, glib, gtk, libXext, libXxf86vm, poppler }: stdenv.mkDerivation { - name = "eaglemode-0.83.0"; + name = "eaglemode-0.84.0"; src = fetchurl { - url = mirror://sourceforge/eaglemode/eaglemode-0.83.0.tar.bz2; - sha256 = "0rlvi9ljf3ml2l4ydkcgjjja8wk9c7h5qlpdr4x4ghh6sqq0q2x3"; + url = mirror://sourceforge/eaglemode/eaglemode-0.84.0.tar.bz2; + sha256 = "0n20b419j0l7h7jr4s3f3n09ka0ysg9nqs8mcwsrx24rcq7nv0cs"; }; buildInputs = [ perl libX11 xineLib libjpeg libpng libtiff pkgconfig @@ -14,9 +14,12 @@ stdenv.mkDerivation { # The program tries to dlopen both Xxf86vm and Xext, so we use the # trick on NIX_LDFLAGS and dontPatchELF to make it find them. + # I use 'yes y' to skip a build error linking with xineLib, + # because xine stopped exporting "_x_vo_new_port" + # http://sourceforge.net/projects/eaglemode/forums/forum/808824/topic/5115261 buildPhase = '' export NIX_LDFLAGS="$NIX_LDFLAGS -lXxf86vm -lXext" - yes n | perl make.pl build + yes y | perl make.pl build ''; dontPatchELF = true; diff --git a/pkgs/applications/misc/girara/default.nix b/pkgs/applications/misc/girara/default.nix new file mode 100644 index 00000000000..2fa36b33eb0 --- /dev/null +++ b/pkgs/applications/misc/girara/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, pkgconfig, gtk, gettext }: + +stdenv.mkDerivation rec { + name = "girara-0.1.2"; + + src = fetchurl { + url = "http://pwmt.org/projects/girara/download/${name}.tar.gz"; + sha256 = "89231d0da3c790e0765ad85d74f64cf50051b8bafe6065882e34e378ab14ec99"; + }; + + buildInputs = [ pkgconfig gtk gettext ]; + + makeFlags = "PREFIX=$(out)"; + + meta = { + homepage = http://pwmt.org/projects/girara/; + description = "User interface library"; + longDescription = '' + girara is a library that implements a GTK+ based VIM-like user interface + that focuses on simplicity and minimalism. + ''; + license = "free"; + platforms = stdenv.lib.platforms.linux; + }; +} + diff --git a/pkgs/applications/misc/gpsbabel/default.nix b/pkgs/applications/misc/gpsbabel/default.nix index a8ccb1c0fef..29d5b1ee7cc 100644 --- a/pkgs/applications/misc/gpsbabel/default.nix +++ b/pkgs/applications/misc/gpsbabel/default.nix @@ -1,15 +1,19 @@ -{ fetchurl, stdenv, zlib, expat }: +{ fetchurl, stdenv, zlib, expat, which }: -stdenv.mkDerivation rec { - name = "gpsbabel-1.3.6"; +let version = "1.4.3"; in +stdenv.mkDerivation { + name = "gpsbabel-${version}"; src = fetchurl { - url = "http://www.gpsbabel.org/plan9.php?dl=${name}.tar.gz"; - name = "${name}.tar.gz"; - sha256 = "1dm9lpcdsj0vz699zz932xc1vphvap627wl0qp61izlkzh25vg88"; + # gpgbabel.org makes it hard to get the source tarball automatically, so + # get it from elsewhere. + url = "mirror://debian/pool/main/g/gpsbabel/gpsbabel_${version}.orig.tar.gz"; + sha256 = "1s31xa36ivf836h89m1f3qiaz3c3znvqjdm0bnh8vr2jjlrz9jdi"; }; - buildInputs = [ zlib expat ]; + # FIXME: Would need libxml2 for one of the tests, but that in turns require + # network access for the XML schemas. + buildInputs = [ zlib expat which ]; /* FIXME: Building the documentation, with "make doc", requires this: @@ -17,7 +21,10 @@ stdenv.mkDerivation rec { But FOP isn't packaged yet. */ - configureFlags = "--with-zlib=system"; + preConfigure = "cd gpsbabel"; + configureFlags = [ "--with-zlib=system" ]; + + doCheck = true; meta = { description = "GPSBabel, a tool to convert, upload and download data from GPS and Map programs"; @@ -44,5 +51,8 @@ stdenv.mkDerivation rec { homepage = http://www.gpsbabel.org/; license = "GPLv2+"; + + maintainers = [ stdenv.lib.maintainers.ludo ]; + platforms = stdenv.lib.platforms.gnu; # arbitrary choice }; } diff --git a/pkgs/applications/misc/gxneur/default.nix b/pkgs/applications/misc/gxneur/default.nix new file mode 100644 index 00000000000..520b8304f63 --- /dev/null +++ b/pkgs/applications/misc/gxneur/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, pkgconfig, gtk2, xorg, glib, xneur_0_13, libglade, GConf, pcre }: + +stdenv.mkDerivation { + name = "gxneur-0.13.0"; + + src = fetchurl { + url = http://dists.xneur.ru/release-0.13.0/tgz/gxneur-0.13.0.tar.bz2; + sha256 = "f093428a479158247a7ff8424f0aec9af9f7b1d05b191cf30b7c534965a6839f"; + }; + + buildInputs = [ + xorg.libX11 pkgconfig glib gtk2 xorg.libXpm xorg.libXt xorg.libXext xneur_0_13 + libglade GConf pcre + ]; + + preConfigure = '' + sed -e 's@-Werror@@' -i configure + sed -e 's@"xneur"@"${xneur_0_13}/bin/xneur"@' -i src/misc.c + ''; + + meta = { + description = "GUI for XNEUR keyboard layout switcher"; + }; +} diff --git a/pkgs/applications/misc/hello/ex-2/default.nix b/pkgs/applications/misc/hello/ex-2/default.nix index 2c62159225d..80a3fb702c0 100644 --- a/pkgs/applications/misc/hello/ex-2/default.nix +++ b/pkgs/applications/misc/hello/ex-2/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "hello-2.7"; + name = "hello-2.8"; src = fetchurl { url = "mirror://gnu/hello/${name}.tar.gz"; - sha256 = "1h17p5lgg47lbr2cnp4qqkr0q0f0rpffyzmvs7bvc6vdrxdknngx"; + sha256 = "0wqd8sjmxfskrflaxywc7gqw7sfawrfvdxd9skxawzfgyy0pzdz6"; }; doCheck = true; diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix index 83665aab5f5..1f99a02f429 100644 --- a/pkgs/applications/misc/ikiwiki/default.nix +++ b/pkgs/applications/misc/ikiwiki/default.nix @@ -1,32 +1,51 @@ -{ stdenv, fetchurl, perl, gettext, makeWrapper, lib, PerlMagick, YAML +{ stdenv, fetchurl, perl, gettext, makeWrapper, PerlMagick, YAML , TextMarkdown, URI, HTMLParser, HTMLScrubber, HTMLTemplate, TimeDate , CGISession, CGIFormBuilder, DBFile, LocaleGettext, RpcXML, XMLSimple -, YAMLLibYAML +, YAMLLibYAML, which, HTMLTree, AuthenPassphrase, NetOpenIDConsumer +, LWPxParanoidAgent, CryptSSLeay , gitSupport ? false, git ? null +, docutilsSupport ? false, python ? null, docutils ? null , monotoneSupport ? false, monotone ? null +, bazaarSupport ? false, bazaar ? null +, cvsSupport ? false, cvs ? null, cvsps ? null, Filechdir ? null +, subversionSupport ? false, subversion ? null +, mercurialSupport ? false, mercurial ? null , extraUtils ? [] }: +assert docutilsSupport -> (python != null && docutils != null); assert gitSupport -> (git != null); assert monotoneSupport -> (monotone != null); +assert bazaarSupport -> (bazaar != null); +assert cvsSupport -> (cvs != null && cvsps != null && Filechdir != null); +assert subversionSupport -> (subversion != null); +assert mercurialSupport -> (mercurial != null); let name = "ikiwiki"; - version = "3.20120516"; + version = "3.20120725"; + + lib = stdenv.lib; in stdenv.mkDerivation { name = "${name}-${version}"; src = fetchurl { url = "http://ftp.de.debian.org/debian/pool/main/i/ikiwiki/${name}_${version}.tar.gz"; - sha256 = "b75097d4f4db79a16f8b74bc4e7f824a586e0e150ecf18103888bbe553a41eb0"; + sha256 = "b600096a77b17e4a9e8a9552c4d36e01ed9217a0f8ff8a4f15110cf80e7adfad"; }; buildInputs = [ perl TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate TimeDate gettext makeWrapper DBFile CGISession CGIFormBuilder LocaleGettext - RpcXML XMLSimple PerlMagick YAML YAMLLibYAML ] - ++ stdenv.lib.optionals gitSupport [git] - ++ stdenv.lib.optionals monotoneSupport [monotone]; + RpcXML XMLSimple PerlMagick YAML YAMLLibYAML which HTMLTree AuthenPassphrase + NetOpenIDConsumer LWPxParanoidAgent CryptSSLeay ] + ++ lib.optionals docutilsSupport [python docutils] + ++ lib.optionals gitSupport [git] + ++ lib.optionals monotoneSupport [monotone] + ++ lib.optionals bazaarSupport [bazaar] + ++ lib.optionals cvsSupport [cvs cvsps Filechdir] + ++ lib.optionals subversionSupport [subversion] + ++ lib.optionals mercurialSupport [mercurial]; patchPhase = '' sed -i s@/usr/bin/perl@${perl}/bin/perl@ pm_filter mdwn2man @@ -42,17 +61,31 @@ stdenv.mkDerivation { postInstall = '' for a in "$out/bin/"*; do wrapProgram $a --suffix PERL5LIB : $PERL5LIB --prefix PATH : ${perl}/bin:$out/bin \ - ${lib.optionalString gitSupport - ''--prefix PATH : ${git}/bin \''} - ${lib.optionalString monotoneSupport - ''--prefix PATH : ${monotone}/bin \''} + ${lib.optionalString gitSupport ''--prefix PATH : ${git}/bin \''} + ${lib.optionalString monotoneSupport ''--prefix PATH : ${monotone}/bin \''} + ${lib.optionalString bazaarSupport ''--prefix PATH : ${bazaar}/bin \''} + ${lib.optionalString cvsSupport ''--prefix PATH : ${cvs}/bin \''} + ${lib.optionalString cvsSupport ''--prefix PATH : ${cvsps}/bin \''} + ${lib.optionalString subversionSupport ''--prefix PATH : ${subversion}/bin \''} + ${lib.optionalString mercurialSupport ''--prefix PATH : ${mercurial}/bin \''} ${lib.concatMapStrings (x: "--prefix PATH : ${x}/bin ") extraUtils} done ''; + preCheck = '' + # Git needs some help figuring this out during test suite run. + export EMAIL="nobody@example.org" + ''; + + checkTarget = "test"; + doCheck = true; + meta = { description = "Wiki compiler, storing pages and history in a RCS"; - homepage = http://ikiwiki.info/; + homepage = "http://ikiwiki.info/"; license = "GPLv2+"; + + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.simons ]; }; } diff --git a/pkgs/applications/misc/lyx/default.nix b/pkgs/applications/misc/lyx/default.nix index 4358c3fe6e7..cb832ed99f5 100644 --- a/pkgs/applications/misc/lyx/default.nix +++ b/pkgs/applications/misc/lyx/default.nix @@ -1,18 +1,27 @@ -# I haven't put much effort into this expressions .. so some optional depencencies may be missing - Marc { fetchurl, stdenv, texLive, python, makeWrapper, pkgconfig -, libX11, qt +, libX11, qt4, enchant #, mythes, boost }: stdenv.mkDerivation rec { - version = "2.0.3"; + version = "2.0.4"; name = "lyx-${version}"; src = fetchurl { url = "ftp://ftp.lyx.org/pub/lyx/stable/2.0.x/${name}.tar.xz"; - sha256 = "1j2sl22w41h4vrgnxv2n0s7d11k6zchjbggjw3ai9yxcahvrj72f"; + sha256 = "137dzmz1z6aqz9mdj8gmmi0k60s9sfn6gy916j175cwzq6hpncb8"; }; - buildInputs = [texLive qt python makeWrapper pkgconfig ]; + configureFlags = [ + #"--without-included-boost" + /* Boost is a huge dependency from which 1.4 MB of libs would be used. + Using internal boost stuff only increases executable by around 0.2 MB. */ + #"--without-included-mythes" # such a small library isn't worth a split package + ]; + + buildInputs = [ + texLive qt4 python makeWrapper pkgconfig + enchant # mythes boost + ]; meta = { description = "WYSIWYM frontend for LaTeX, DocBook, etc."; diff --git a/pkgs/applications/misc/mathblog/default.nix b/pkgs/applications/misc/mathblog/default.nix deleted file mode 100644 index e5ed53a56a0..00000000000 --- a/pkgs/applications/misc/mathblog/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ cabal, ConfigFile, filepath, HStringTemplate, HUnit, pandoc -, pandocTypes, SHA, testFramework, testFrameworkHunit, time -}: - -cabal.mkDerivation (self: { - pname = "mathblog"; - version = "0.5"; - sha256 = "01iyzrwscqirhcr4622d0n16mr4p54qbvg5m2a0ns36j59xfd79g"; - isLibrary = false; - isExecutable = true; - buildDepends = [ - ConfigFile filepath HStringTemplate HUnit pandoc pandocTypes SHA - testFramework testFrameworkHunit time - ]; - meta = { - description = "A program for creating and managing a static weblog with LaTeX math and function graphs"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; - }; -}) diff --git a/pkgs/applications/misc/st/default.nix b/pkgs/applications/misc/st/default.nix new file mode 100644 index 00000000000..5ac2ad6b9ad --- /dev/null +++ b/pkgs/applications/misc/st/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, libX11, ncurses}: + +stdenv.mkDerivation rec { + name = "st-0.2.1"; + + src = fetchurl { + url = http://hg.suckless.org/st/archive/0.2.1.tar.gz; + sha256 = "15yqyys69ifjc4vrzvamrg7x0pwa60mnjpi0kap4y9ykhds83xab"; + }; + + buildInputs = [ libX11 ncurses ]; + + installPhase = '' + TERMINFO=$out/share/terminfo make install PREFIX=$out + ''; + + meta = { + homepage = http://st.suckless.org/; + license = "MIT"; + maintainers = with stdenv.lib.maintainers; [viric]; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/applications/misc/surf/default.nix b/pkgs/applications/misc/surf/default.nix index 3164f0c1a94..61d2e6a65bd 100644 --- a/pkgs/applications/misc/surf/default.nix +++ b/pkgs/applications/misc/surf/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "surf-${version}"; - version="0.4.1"; + version="0.5"; src = fetchurl { url = "http://dl.suckless.org/surf/surf-${version}.tar.gz"; - sha256 = "0im5psjw0r8av3zjyy2wqcl6y5ylwnrab5kfcwc23bsbx2irnw4k"; + sha256 = "19qfkwdk6p5hcwnnplscp1kmypz74mga7x6iqy6w3g18s221f2mx"; }; buildInputs = [ gtk webkit pkgconfig glib libsoup ]; diff --git a/pkgs/applications/misc/viking/default.nix b/pkgs/applications/misc/viking/default.nix index a98ed2aa5ff..70ac055db09 100644 --- a/pkgs/applications/misc/viking/default.nix +++ b/pkgs/applications/misc/viking/default.nix @@ -1,19 +1,27 @@ { fetchurl, stdenv, pkgconfig, intltool, gettext, gtk, expat, curl -, gpsd, bc, file }: +, gpsd, bc, file, gnome_doc_utils, libexif, libxml2, libxslt, scrollkeeper +, docbook_xml_dtd_412 }: -stdenv.mkDerivation rec { - name = "viking-0.9.8"; +let version = "1.3"; in +stdenv.mkDerivation { + name = "viking-${version}"; src = fetchurl { - url = "mirror://sourceforge/viking/${name}.tar.gz"; - sha256 = "1is8g6ld5pd13iiv9qm8526q1cblg01pqyakg52sd6k7fys7dz2d"; + url = "mirror://sourceforge/viking/viking/${version}/viking-${version}.tar.gz"; + sha256 = "1psgy1myx9xn7zgpvqrpricsv041sz41mm82hj5i28k72fq47p2l"; }; - patches = [ - ./test-bc.patch ./gpsdclient.patch ./implicit-declaration.patch - ]; + buildInputs = + [ pkgconfig intltool gettext gtk expat curl gpsd bc file gnome_doc_utils + libexif libxml2 libxslt scrollkeeper docbook_xml_dtd_412 + ]; - buildInputs = [ pkgconfig intltool gettext gtk expat curl gpsd bc file ]; + configureFlags = [ "--disable-scrollkeeper" ]; + + preBuild = + '' sed -i help/Makefile \ + -e 's|--noout|--noout --nonet --path "${scrollkeeper}/share/xml/scrollkeeper/dtds"|g' + ''; doCheck = true; diff --git a/pkgs/applications/misc/viking/gpsdclient.patch b/pkgs/applications/misc/viking/gpsdclient.patch deleted file mode 100644 index 41722632260..00000000000 --- a/pkgs/applications/misc/viking/gpsdclient.patch +++ /dev/null @@ -1,51 +0,0 @@ -Debian patch that allows compilation with libgps (from `gpsd'). -Failing to apply this patch, we get the following error: - - vikgpslayer.c:237: error: field 'realtime_gpsd_unit' has incomplete type - vikgpslayer.c: In function 'vik_gps_layer_new': - vikgpslayer.c:473: warning: implicit declaration of function 'gpsd_units' - vikgpslayer.c: In function 'rt_gpsd_try_connect': - vikgpslayer.c:1321: warning: passing argument 2 of 'gps_set_raw_hook' from incompatible pointer type - -diff -urNad trunk~/src/gpsdclient.h trunk/src/gpsdclient.h ---- trunk~/src/gpsdclient.h 1970-01-01 01:00:00.000000000 +0100 -+++ trunk/src/gpsdclient.h 2009-04-15 14:30:22.000000000 +0200 -@@ -0,0 +1,25 @@ -+/* $Id: gpsdclient.h 5330 2009-03-03 04:05:42Z ckuethe $ */ -+/* gpsdclient.h -- common functions for GPSD clients */ -+ -+#ifndef _GPSD_GPSDCLIENT_H_ -+#define _GPSD_GPSDCLIENT_H_ -+struct fixsource_t -+/* describe a data source */ -+{ -+ char *spec; /* pointer to actual storage */ -+ char *server; -+ char *port; -+ char *device; -+}; -+ -+enum unit {unspecified, imperial, nautical, metric}; -+enum unit gpsd_units(void); -+enum deg_str_type { deg_dd, deg_ddmm, deg_ddmmss }; -+ -+extern /*@observer@*/ char *deg_to_str( enum deg_str_type type, double f); -+ -+extern void gpsd_source_spec(/*@null@*/const char *fromstring, -+ /*@out@*/struct fixsource_t *source); -+ -+#endif /* _GPSDCLIENT_H_ */ -+/* gpsdclient.h ends here */ -diff -urNad trunk~/src/vikgpslayer.c trunk/src/vikgpslayer.c ---- trunk~/src/vikgpslayer.c 2009-02-08 14:47:01.000000000 +0100 -+++ trunk/src/vikgpslayer.c 2009-04-15 14:30:55.000000000 +0200 -@@ -39,6 +39,9 @@ - #include - #ifdef VIK_CONFIG_REALTIME_GPS_TRACKING - #include -+#ifndef gpsd_units -+#include "gpsdclient.h" -+#endif - #endif - - #if ! GLIB_CHECK_VERSION(2,14,0) diff --git a/pkgs/applications/misc/viking/implicit-declaration.patch b/pkgs/applications/misc/viking/implicit-declaration.patch deleted file mode 100644 index 60f8ad1177f..00000000000 --- a/pkgs/applications/misc/viking/implicit-declaration.patch +++ /dev/null @@ -1,13 +0,0 @@ -Debian patch that fixes an implicat declaration. - -diff -urNad trunk~/src/util.c trunk/src/util.c ---- trunk~/src/util.c 2009-02-08 14:47:01.000000000 +0100 -+++ trunk/src/util.c 2009-04-15 17:23:44.000000000 +0200 -@@ -26,6 +26,7 @@ - #endif - - #include -+#include - - #include "dialog.h" - diff --git a/pkgs/applications/misc/viking/test-bc.patch b/pkgs/applications/misc/viking/test-bc.patch deleted file mode 100644 index fc0c91eec52..00000000000 --- a/pkgs/applications/misc/viking/test-bc.patch +++ /dev/null @@ -1,22 +0,0 @@ -For some reason, `bc -l' yields no output. - ---- viking-0.9.8/test/check_degrees_conversions.sh 2008-03-15 23:01:48.000000000 +0100 -+++ viking-0.9.8/test/check_degrees_conversions.sh 2009-05-30 23:23:27.000000000 +0200 -@@ -7,7 +7,7 @@ function check_success() - for value in "$@" - do - result=`./degrees_converter "$value" | cut -d' ' -f3` -- diff=`echo "$result - $expected" | bc -l` -+ diff=`echo "$result - $expected" | bc` - if [ $diff != 0 ] - then - echo "$value -> $result != $expected" -@@ -23,7 +23,7 @@ function check_failure() - for value in "$@" - do - result=`./degrees_converter "$value" | cut -d' ' -f3` -- diff=`echo "$result - $expected" | bc -l` -+ diff=`echo "$result - $expected" | bc` - if [ $diff = 0 ] - then - echo "$value -> $result = $expected" diff --git a/pkgs/applications/misc/xpdf/default.nix b/pkgs/applications/misc/xpdf/default.nix index d653c972850..5218df77595 100644 --- a/pkgs/applications/misc/xpdf/default.nix +++ b/pkgs/applications/misc/xpdf/default.nix @@ -1,4 +1,4 @@ -{ enableGUI ? true, enablePDFtoPPM ? true, useT1Lib ? true +{ enableGUI ? true, enablePDFtoPPM ? true, useT1Lib ? false , stdenv, fetchurl, x11 ? null, motif ? null, freetype ? null, t1lib ? null , base14Fonts ? null }: @@ -7,6 +7,8 @@ assert enableGUI -> x11 != null && motif != null && freetype != null; assert enablePDFtoPPM -> freetype != null; assert useT1Lib -> t1lib != null; +assert !useT1Lib; # t1lib has multiple unpatched security vulnerabilities + stdenv.mkDerivation { name = "xpdf-3.03"; diff --git a/pkgs/applications/misc/zathura/builder.sh b/pkgs/applications/misc/zathura/builder.sh new file mode 100644 index 00000000000..9ca45b2cc99 --- /dev/null +++ b/pkgs/applications/misc/zathura/builder.sh @@ -0,0 +1,11 @@ +source $stdenv/setup + +mkdir -pv $out/bin/ + +cat > $out/bin/zathura <HasSwitch( +- switches::kEnableSeccompSandbox); +-#else + // On by default; allow turning off with a switch. + return !CommandLine::ForCurrentProcess()->HasSwitch( + switches::kDisableSeccompSandbox); +-#endif // NDEBUG + #endif // SECCOMP_SANDBOX + return false; + } diff --git a/pkgs/applications/networking/browsers/chromium/source.nix b/pkgs/applications/networking/browsers/chromium/source.nix deleted file mode 100644 index 2dc94ea2943..00000000000 --- a/pkgs/applications/networking/browsers/chromium/source.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ - version = "21.0.1179.1"; - url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-21.0.1179.1.tar.bz2"; - sha256 = "1ynm1dv8nwjg6a0absid1g3r62y0mpb74pmal8g9nmqb92rlkdnc"; -} diff --git a/pkgs/applications/networking/browsers/chromium/sources.nix b/pkgs/applications/networking/browsers/chromium/sources.nix new file mode 100644 index 00000000000..7d03c397bdc --- /dev/null +++ b/pkgs/applications/networking/browsers/chromium/sources.nix @@ -0,0 +1,18 @@ +# This file is autogenerated from update.sh in the same directory. +{ + dev = { + version = "23.0.1255.0"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-23.0.1255.0.tar.bz2"; + sha256 = "12ks55mn6nahdzd5kgiwi9m2cfivb0pwj963g8d4kmdbw5bg017g"; + }; + beta = { + version = "22.0.1229.39"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-22.0.1229.39.tar.bz2"; + sha256 = "0v0yz9lkr9xdzh6660y9n2z8m1075ls2r3svafcfa80pq18chzfd"; + }; + stable = { + version = "21.0.1180.89"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-21.0.1180.89.tar.bz2"; + sha256 = "1i9mjbjj3aywg03hd59m9j5gq5b5fl8nvw56g47q8s9k1bcsik0n"; + }; +} diff --git a/pkgs/applications/networking/browsers/chromium/update.sh b/pkgs/applications/networking/browsers/chromium/update.sh index 066cd1c147f..c978ee4adf3 100755 --- a/pkgs/applications/networking/browsers/chromium/update.sh +++ b/pkgs/applications/networking/browsers/chromium/update.sh @@ -1,34 +1,113 @@ #!/bin/sh +channels_url="http://omahaproxy.appspot.com/"; bucket_url="http://commondatastorage.googleapis.com/chromium-browser-official/"; +output_file="$(cd "$(dirname "$0")" && pwd)/sources.nix"; -get_newest_version() +nix_getattr() { - curl -s "$bucket_url" | sed -ne ' H;/<[Kk][Ee][Yy]>chromium-[^<]*chromium-\([^<.]\+\(\.[^<.]\+\)\+\)\.tar\.bz2<.*$/\1/p - }'; + input_file="$1"; + attr="$2"; + + var="$(nix-instantiate --eval-only -A "$attr" "$output_file")"; + echo "$var" | tr -d '\\"'; +} + +### poor mans key/value-store :-) ### + +ver_sha_table=""; # list of version:sha256 + +sha_lookup() +{ + version="$1"; + + for ver_sha in $ver_sha_table; + do + if [ "x${ver_sha%:*}" = "x$version" ]; + then + echo "${ver_sha##*:}"; + return 0; + fi; + done; + + return 1; +} + +sha_insert() +{ + version="$1"; + sha256="$2"; + + ver_sha_table="$ver_sha_table $version:$sha256"; +} + +if [ -e "$output_file" ]; +then + get_sha256() + { + channel="$1"; + version="$2"; + url="$3"; + + oldver="$(nix_getattr "$output_file" "$channel.version")"; + + echo -n "Checking if $oldver ($channel) is up to date..." >&2; + + if [ "x$version" != "x$oldver" ]; + then + echo " no, getting sha256 for new version $version:" >&2; + sha256="$(nix-prefetch-url "$url")"; + else + echo " yes, keeping old sha256." >&2; + sha256="$(nix_getattr "$output_file" "$channel.sha256")"; + fi; + + sha_insert "$version" "$sha256" + echo "$sha256"; + } +else + get_sha256() + { + nix-prefetch-url "$url"; + } +fi; + +get_channel_exprs() +{ + for chline in $(echo "$1" | cut -d, -f-2); + do + channel="${chline%%,*}"; + version="${chline##*,}"; + url="${bucket_url%/}/chromium-$version.tar.bz2"; + + echo -n "Checking if sha256 of version $version is cached..." >&2; + if sha256="$(sha_lookup "$version")"; + then + echo " yes: $sha256" >&2; + else + echo " no." >&2; + sha256="$(get_sha256 "$channel" "$version" "$url")"; + fi; + + sha_insert "$version" "$sha256"; + + echo " $channel = {"; + echo " version = \"$version\";"; + echo " url = \"$url\";"; + echo " sha256 = \"$sha256\";"; + echo " };"; + done; } cd "$(dirname "$0")"; -version="$(get_newest_version)"; +omaha="$(curl -s "$channels_url")"; +versions="$(echo "$omaha" | sed -n -e 's/^linux,\(\([^,]\+,\)\{2\}\).*$/\1/p')"; +channel_exprs="$(get_channel_exprs "$versions")"; -if [ -e source.nix ]; then - oldver="$(sed -n 's/^ *version *= *"\([^"]\+\)".*$/\1/p' source.nix)"; - if [ "x$oldver" = "x$version" ]; then - echo "Already the newest version: $version" >&2; - exit 1; - fi; -fi; - -url="${bucket_url%/}/chromium-$version.tar.bz2"; - -sha256="$(nix-prefetch-url "$url")"; - -cat > source.nix < "$output_file" <<-EOF +# This file is autogenerated from update.sh in the same directory. { - version = "$version"; - url = "$url"; - sha256 = "$sha256"; +$channel_exprs } EOF diff --git a/pkgs/applications/networking/browsers/firefox/12.0.nix b/pkgs/applications/networking/browsers/firefox/12.0.nix index 6a22b1d8e5f..97e23d1b8b2 100644 --- a/pkgs/applications/networking/browsers/firefox/12.0.nix +++ b/pkgs/applications/networking/browsers/firefox/12.0.nix @@ -33,7 +33,7 @@ rec { "--with-system-zlib" "--with-system-bz2" "--with-system-nspr" - # "--with-system-nss" + "--with-system-nss" # "--with-system-png" # <-- "--with-system-png won't work because the system's libpng doesn't have APNG support" # "--enable-system-cairo" # disabled for the moment because our Cairo is too old "--enable-system-sqlite" @@ -54,7 +54,7 @@ rec { [ pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2 python dbus dbus_glib pango freetype fontconfig xlibs.libXi xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file - alsaLib nspr /* nss */ libnotify xlibs.pixman yasm mesa + alsaLib nspr nss libnotify xlibs.pixman yasm mesa xlibs.libXScrnSaver xlibs.scrnsaverproto xlibs.libXext xlibs.xextproto sqlite unzip ]; @@ -129,7 +129,7 @@ rec { buildInputs = [ pkgconfig gtk perl zip libIDL libjpeg zlib cairo bzip2 python - dbus dbus_glib pango freetype fontconfig alsaLib nspr libnotify + dbus dbus_glib pango freetype fontconfig alsaLib nspr nss libnotify xlibs.pixman yasm mesa sqlite file unzip ]; diff --git a/pkgs/applications/networking/browsers/firefox/13.0.nix b/pkgs/applications/networking/browsers/firefox/13.0.nix index 1b021955742..fbbf3275ad1 100644 --- a/pkgs/applications/networking/browsers/firefox/13.0.nix +++ b/pkgs/applications/networking/browsers/firefox/13.0.nix @@ -33,7 +33,7 @@ rec { "--with-system-zlib" "--with-system-bz2" "--with-system-nspr" - # "--with-system-nss" + "--with-system-nss" # "--with-system-png" # <-- "--with-system-png won't work because the system's libpng doesn't have APNG support" # "--enable-system-cairo" # disabled for the moment because our Cairo is too old "--enable-system-sqlite" @@ -54,7 +54,7 @@ rec { [ pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2 python dbus dbus_glib pango freetype fontconfig xlibs.libXi xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file - alsaLib nspr /* nss */ libnotify xlibs.pixman yasm mesa + alsaLib nspr nss libnotify xlibs.pixman yasm mesa xlibs.libXScrnSaver xlibs.scrnsaverproto xlibs.libXext xlibs.xextproto sqlite unzip makeWrapper ]; @@ -136,7 +136,7 @@ rec { buildInputs = [ pkgconfig gtk perl zip libIDL libjpeg zlib cairo bzip2 python - dbus dbus_glib pango freetype fontconfig alsaLib nspr libnotify + dbus dbus_glib pango freetype fontconfig alsaLib nspr nss libnotify xlibs.pixman yasm mesa sqlite file unzip ]; diff --git a/pkgs/applications/networking/browsers/firefox/15.0.nix b/pkgs/applications/networking/browsers/firefox/15.0.nix new file mode 100644 index 00000000000..54903496391 --- /dev/null +++ b/pkgs/applications/networking/browsers/firefox/15.0.nix @@ -0,0 +1,179 @@ +{ stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL +, libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs +, freetype, fontconfig, file, alsaLib, nspr, nss, libnotify +, yasm, mesa, sqlite, unzip, makeWrapper, pysqlite + +, # If you want the resulting program to call itself "Firefox" instead + # of "Shiretoko" or whatever, enable this option. However, those + # binaries may not be distributed without permission from the + # Mozilla Foundation, see + # http://www.mozilla.org/foundation/trademarks/. + enableOfficialBranding ? false +}: + +assert stdenv.gcc ? libc && stdenv.gcc.libc != null; + +rec { + + firefoxVersion = "15.0"; + + xulVersion = "15.0"; # this attribute is used by other packages + + + src = fetchurl { + url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2"; + sha256 = "12f7dgcksb9d79hj0a8lxn3s81id6l2gd1pb7ls4d60kmgbg05jl"; + }; + + commonConfigureFlags = + [ "--enable-optimize" + "--disable-debug" + "--enable-strip" + "--with-system-jpeg" + "--with-system-zlib" + "--with-system-bz2" + "--with-system-nspr" + "--with-system-nss" + # "--with-system-png" # <-- "--with-system-png won't work because the system's libpng doesn't have APNG support" + # "--enable-system-cairo" # disabled for the moment because our Cairo is too old + "--enable-system-sqlite" + "--disable-crashreporter" + "--disable-tests" + "--disable-necko-wifi" # maybe we want to enable this at some point + "--disable-installer" + "--disable-updater" + ]; + + + xulrunner = stdenv.mkDerivation rec { + name = "xulrunner-${xulVersion}"; + + inherit src; + + buildInputs = + [ pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2 + python dbus dbus_glib pango freetype fontconfig xlibs.libXi + xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file + alsaLib nspr nss libnotify xlibs.pixman yasm mesa + xlibs.libXScrnSaver xlibs.scrnsaverproto pysqlite + xlibs.libXext xlibs.xextproto sqlite unzip makeWrapper + ]; + + configureFlags = + [ "--enable-application=xulrunner" + "--disable-javaxpcom" + ] ++ commonConfigureFlags; + + enableParallelBuilding = true; + + preConfigure = + '' + export NIX_LDFLAGS="$NIX_LDFLAGS -L$out/lib/xulrunner-${xulVersion}" + + mkdir ../objdir + cd ../objdir + configureScript=../mozilla-release/configure + ''; # */ + + #installFlags = "SKIP_GRE_REGISTRATION=1"; + + postInstall = '' + # Fix run-mozilla.sh search + libDir=$(cd $out/lib && ls -d xulrunner-[0-9]*) + echo libDir: $libDir + test -n "$libDir" + cd $out/bin + rm xulrunner + + for i in $out/lib/$libDir/*; do + file $i; + if file $i | grep executable &>/dev/null; then + echo -e '#! /bin/sh\n"'"$i"'" "$@"' > "$out/bin/$(basename "$i")"; + chmod a+x "$out/bin/$(basename "$i")"; + fi; + done + for i in $out/lib/$libDir/*.so; do + patchelf --set-rpath "$(patchelf --print-rpath "$i"):$out/lib/$libDir" $i || true + done + for i in $out/lib/$libDir/{plugin-container,xulrunner,xulrunner-stub}; do + wrapProgram $i --prefix LD_LIBRARY_PATH ':' "$out/lib/$libDir" + done + rm -f $out/bin/run-mozilla.sh + ''; # */ + + meta = { + description = "Mozilla Firefox XUL runner"; + homepage = http://www.mozilla.com/en-US/firefox/; + }; + + passthru = { inherit gtk; version = xulVersion; }; + }; + + + firefox = stdenv.mkDerivation rec { + name = "firefox-${firefoxVersion}"; + + inherit src; + + enableParallelBuilding = true; + + buildInputs = + [ pkgconfig gtk perl zip libIDL libjpeg zlib cairo bzip2 python + dbus dbus_glib pango freetype fontconfig alsaLib nspr nss libnotify + xlibs.pixman yasm mesa sqlite file unzip pysqlite + ]; + + propagatedBuildInputs = [xulrunner]; + + configureFlags = + [ "--enable-application=browser" + "--with-libxul-sdk=${xulrunner}/lib/xulrunner-devel-${xulrunner.version}" + "--enable-chrome-format=jar" + "--disable-elf-hack" + ] + ++ commonConfigureFlags + ++ stdenv.lib.optional enableOfficialBranding "--enable-official-branding"; + + makeFlags = [ + "SYSTEM_LIBXUL=1" + ]; + + # Hack to work around make's idea of -lbz2 dependency + preConfigure = + '' + find . -name Makefile.in -execdir sed -i '{}' -e '1ivpath %.so ${ + stdenv.lib.concatStringsSep ":" + (map (s : s + "/lib") (buildInputs ++ [stdenv.gcc.libc])) + }' ';' + ''; + + postInstall = + '' + ln -s ${xulrunner}/lib/xulrunner-${xulrunner.version} $(echo $out/lib/firefox-*)/xulrunner + for j in $out/bin/*; do + i="$(readlink "$j")"; + file $i; + if file $i | grep executable &>/dev/null; then + rm "$out/bin/$(basename "$i")" + echo -e '#! /bin/sh\nexec "'"$i"'" "$@"' > "$out/bin/$(basename "$i")" + chmod a+x "$out/bin/$(basename "$i")" + fi; + done; + cd "$out/lib/"firefox-* + rm firefox + echo -e '#!${stdenv.shell}\n${xulrunner}/bin/xulrunner "'"$PWD"'/application.ini" "$@"' > firefox + chmod a+x firefox + ''; # */ + + meta = { + description = "Mozilla Firefox - the browser, reloaded"; + homepage = http://www.mozilla.com/en-US/firefox/; + maintainers = [ stdenv.lib.maintainers.eelco ]; + }; + + passthru = { + inherit gtk xulrunner nspr; + isFirefox3Like = true; + }; + }; +} diff --git a/pkgs/applications/networking/browsers/firefox/3.6.nix b/pkgs/applications/networking/browsers/firefox/3.6.nix index 40b7959139d..c430bb7089a 100644 --- a/pkgs/applications/networking/browsers/firefox/3.6.nix +++ b/pkgs/applications/networking/browsers/firefox/3.6.nix @@ -31,7 +31,7 @@ rec { "--with-system-zlib" "--with-system-bz2" "--with-system-nspr" - #"--with-system-nss" + "--with-system-nss" # "--with-system-png" # <-- "--with-system-png won't work because the system's libpng doesn't have APNG support" "--enable-system-cairo" #"--enable-system-sqlite" # <-- this seems to be discouraged @@ -59,7 +59,7 @@ rec { [ pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2 python dbus dbus_glib pango freetype fontconfig xlibs.libXi xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file - alsaLib nspr /* nss */ libnotify xlibs.pixman + alsaLib nspr nss libnotify xlibs.pixman ]; preConfigure = if stdenv.isMips then '' @@ -118,7 +118,7 @@ rec { buildInputs = [ pkgconfig gtk perl zip libIDL libjpeg zlib cairo bzip2 python - dbus dbus_glib pango freetype fontconfig alsaLib nspr libnotify + dbus dbus_glib pango freetype fontconfig alsaLib nspr nss libnotify xlibs.pixman ]; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix index 8a2ef6fe0a1..a3f255b5d3e 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix @@ -1,12 +1,14 @@ { stdenv, fetchurl, rpm, cpio, mesa, xorg, cairo , libpng12, gtk, glib, gdk_pixbuf, fontconfig, freetype, curl -, dbus_glib, alsaLib, pulseaudio, udev +, dbus_glib, alsaLib, pulseaudio, udev, pango }: with stdenv.lib; let + baseURL = "http://dl.google.com/linux/talkplugin/deb/pool/main/g/google-talkplugin"; + rpathPlugin = makeLibraryPath [ mesa xorg.libXt @@ -35,32 +37,32 @@ let dbus_glib udev curl + pango + cairo ]; in -stdenv.mkDerivation { - name = "google-talk-plugin-2.9.10.0"; +stdenv.mkDerivation rec { + name = "google-talk-plugin-${version}"; + version = "3.5.1.0"; src = if stdenv.system == "x86_64-linux" then fetchurl { - url = "http://dl.google.com/linux/direct/google-talkplugin_current_x86_64.rpm"; - sha256 = "1dma067h7qj8rbcnm0n7wy3wd1clkysq9xj4kaxijbb5zrw06k3q"; + url = "${baseURL}/google-talkplugin_${version}-1_amd64.deb"; + sha256 = "0ml4yirzdcladw11fq5d8lwqfqgb1fh9vpbzbzmhplvyj6mvkqrj"; } else if stdenv.system == "i686-linux" then fetchurl { - url = "http://dl.google.com/linux/direct/google-talkplugin_current_i386.rpm"; - sha256 = "02ymhhbfby0sn9132cvdr6jp9c7sk6hfg0jwg1fc3kzjg7q3y7fs"; + url = "${baseURL}/google-talkplugin_${version}-1_i386.deb"; + sha256 = "1kfd26zygb76iqnr8n3f7k7n9h5bz0rf716n80crqzyasv51mn57"; } else throw "Google Talk does not support your platform."; - buildInputs = [ rpm cpio ]; - - unpackPhase = - '' - rpm2cpio $src | cpio -i --make-directories -v - ''; + unpackPhase = '' + ar p "$src" data.tar.gz | tar xz + ''; installPhase = '' diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix index c53a5f34525..8c3cd9f11cd 100644 --- a/pkgs/applications/networking/browsers/opera/default.nix +++ b/pkgs/applications/networking/browsers/opera/default.nix @@ -9,22 +9,22 @@ assert stdenv.isLinux && stdenv.gcc.gcc != null && stdenv.gcc.libc != null; let - mirror = ftp://ftp.ussg.iu.edu/pub/opera; + mirror = http://get.geo.opera.com/pub/opera; in stdenv.mkDerivation rec { - name = "opera-11.64-1403"; + name = "opera-12.00-1467"; src = if stdenv.system == "i686-linux" then fetchurl { - url = "${mirror}/linux/1164/${name}.i386.linux.tar.xz"; - sha256 = "8b7998586b1b3f8f5722beef7ebb621c0f15915c260b096249e9db5973e30d82"; + url = "${mirror}/linux/1200/${name}.i386.linux.tar.xz"; + sha256 = "d5683f5a4cf0cfd9ce715359b77909c7923c85bcec98513907c1844285356fdc"; } else if stdenv.system == "x86_64-linux" then fetchurl { - url = "${mirror}/linux/1164/${name}.x86_64.linux.tar.xz"; - sha256 = "3b2012cbab826a04417deb56b85d8d31f9c17130071304736bcfa572f78b4c69"; + url = "${mirror}/linux/1200/${name}.x86_64.linux.tar.xz"; + sha256 = "7c3dbe122b1fd20123f1b48a420dea080cc24ede4183d47d66b383c2b7ca5051"; } else throw "Opera is not supported on ${stdenv.system} (only i686-linux and x86_64 linux are supported)"; diff --git a/pkgs/applications/networking/browsers/rekonq/default.nix b/pkgs/applications/networking/browsers/rekonq/default.nix index 791b73c9c78..4a46de14f9b 100644 --- a/pkgs/applications/networking/browsers/rekonq/default.nix +++ b/pkgs/applications/networking/browsers/rekonq/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchurl, kdelibs, gettext, pkgconfig }: +{ stdenv, fetchurl, kdelibs, gettext, pkgconfig, shared_desktop_ontologies, qca2, qoauth }: stdenv.mkDerivation rec { - name = "rekonq-0.9.0-1"; + name = "rekonq-1.1"; src = fetchurl { - url = "mirror://sf/rekonq/${name}.tar.bz2"; - sha256 = "0vri6wdxxi7qkcjpgvscwa7m3ysy62jns924d07arvy8bmg5whc5"; + url = "mirror://sourceforge/rekonq/${name}.tar.bz2"; + sha256 = "1bs733mwyfb7bxnial8n49b82ip04sark2mxwlq7ixxsbgq7972l"; }; - buildInputs = [ kdelibs ]; + buildInputs = [ kdelibs qca2 qoauth ]; - buildNativeInputs = [ gettext pkgconfig ]; + buildNativeInputs = [ gettext pkgconfig shared_desktop_ontologies ]; meta = with stdenv.lib; { platforms = platforms.linux; diff --git a/pkgs/applications/networking/browsers/w3m/default.nix b/pkgs/applications/networking/browsers/w3m/default.nix index d5294c961e6..38ef20ec969 100644 --- a/pkgs/applications/networking/browsers/w3m/default.nix +++ b/pkgs/applications/networking/browsers/w3m/default.nix @@ -1,12 +1,15 @@ { stdenv, fetchurl , sslSupport ? true , graphicsSupport ? false +, mouseSupport ? false , ncurses, openssl ? null, boehmgc, gettext, zlib -, imlib2 ? null, x11 ? null +, imlib2 ? null, x11 ? null, fbcon ? null +, gpm ? null }: assert sslSupport -> openssl != null; -assert graphicsSupport -> x11 != null; +assert graphicsSupport -> imlib2 != null && (x11 != null || fbcon != null); +assert mouseSupport -> gpm != null; stdenv.mkDerivation rec { name = "w3m-0.5.3"; @@ -22,11 +25,14 @@ stdenv.mkDerivation rec { buildInputs = [ncurses boehmgc gettext zlib] ++ stdenv.lib.optional sslSupport openssl - ++ stdenv.lib.optionals graphicsSupport [imlib2 x11]; + ++ stdenv.lib.optional mouseSupport gpm + ++ stdenv.lib.optionals graphicsSupport [imlib2 x11 fbcon]; - configureFlags = "--with-ssl=${openssl} --with-gc=${boehmgc}"; + configureFlags = "--with-ssl=${openssl} --with-gc=${boehmgc}" + + stdenv.lib.optionalString graphicsSupport " --enable-image=x11,fb"; preConfigure = '' + substituteInPlace ./configure --replace "/lib /usr/lib /usr/local/lib /usr/ucblib /usr/ccslib /usr/ccs/lib /lib64 /usr/lib64" /no-such-path substituteInPlace ./configure --replace /usr /no-such-path ''; diff --git a/pkgs/applications/networking/cluster/hadoop/default.nix b/pkgs/applications/networking/cluster/hadoop/default.nix new file mode 100644 index 00000000000..7d475a67558 --- /dev/null +++ b/pkgs/applications/networking/cluster/hadoop/default.nix @@ -0,0 +1,51 @@ +{ stdenv, fetchurl, makeWrapper, which, jre, bash }: + +stdenv.mkDerivation rec { + + name = "hadoop-2.0.1-alpha"; + + src = fetchurl { + url = "mirror://apache/hadoop/common/${name}/${name}.tar.gz"; + sha256 = "4e5f4fa1574ee58fd6d59a220b66578fc2cf62c229120eeed07f2880c86f0e59"; + }; + + buildInputs = [ makeWrapper ]; + + buildPhase = '' + for n in "bin/"* "sbin/"*; do + sed -i $n -e "s|#!/usr/bin/env bash|#! ${bash}/bin/bash|" + done + patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" bin/container-executor + ''; + + installPhase = '' + mkdir -p $out + mv *.txt share/doc/hadoop/ + mv * $out + + for n in $out/{bin,sbin}"/"*; do + wrapProgram $n --prefix PATH : "${which}/bin:${jre}/bin:${bash}/bin" --set JAVA_HOME "${jre}" --set HADOOP_PREFIX "$out" + done + ''; + + meta = { + homepage = "http://hadoop.apache.org/"; + description = "framework for distributed processing of large data sets across clusters of computers"; + license = stdenv.lib.licenses.asl20; + + longDescription = '' + The Apache Hadoop software library is a framework that allows for + the distributed processing of large data sets across clusters of + computers using a simple programming model. It is designed to + scale up from single servers to thousands of machines, each + offering local computation and storage. Rather than rely on + hardware to deliver high-avaiability, the library itself is + designed to detect and handle failures at the application layer, + so delivering a highly-availabile service on top of a cluster of + computers, each of which may be prone to failures. + ''; + + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.simons ]; + }; +} diff --git a/pkgs/applications/networking/esniper/default.nix b/pkgs/applications/networking/esniper/default.nix index dda0755a738..327e4c4a9c5 100644 --- a/pkgs/applications/networking/esniper/default.nix +++ b/pkgs/applications/networking/esniper/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl, curl }: +{ stdenv, fetchurl, openssl, curl, coreutils, gawk, bash, which }: stdenv.mkDerivation { name = "esniper-2.27.0"; @@ -10,8 +10,12 @@ stdenv.mkDerivation { buildInputs = [openssl curl]; + # Add support for CURL_CA_BUNDLE variable. + patches = [ ./find-ca-bundle.patch ]; + postInstall = '' - sed -e "2i export PATH=\"$out/bin:\$PATH\"" <"frontends/snipe" >"$out/bin/snipe" + sed <"frontends/snipe" >"$out/bin/snipe" \ + -e "2i export PATH=\"$out/bin:${coreutils}/bin:${gawk}/bin:${bash}/bin:${which}/bin:\$PATH\"" chmod 555 "$out/bin/snipe" ''; @@ -24,5 +28,3 @@ stdenv.mkDerivation { maintainers = [ stdenv.lib.maintainers.simons ]; }; } - - diff --git a/pkgs/applications/networking/esniper/find-ca-bundle.patch b/pkgs/applications/networking/esniper/find-ca-bundle.patch new file mode 100644 index 00000000000..e4df272a0c9 --- /dev/null +++ b/pkgs/applications/networking/esniper/find-ca-bundle.patch @@ -0,0 +1,26 @@ +diff -ubr '--exclude=*.o' esniper-2-27-0-orig/http.c esniper-2-27-0-patched/http.c +--- esniper-2-27-0-orig/http.c 2012-02-06 22:04:06.000000000 +0100 ++++ esniper-2-27-0-patched/http.c 2012-07-27 10:54:20.893054646 +0200 +@@ -200,6 +200,9 @@ + int + initCurlStuff(void) + { ++ /* Path to OpenSSL bundle file. */ ++ const char *ssl_capath=NULL; ++ + /* list for custom headers */ + struct curl_slist *slist=NULL; + +@@ -241,6 +244,12 @@ + if ((curlrc = curl_easy_setopt(easyhandle, CURLOPT_COOKIEFILE, ""))) + return initCurlStuffFailed(); + ++ /* If the environment variable CURL_CA_BUNDLE is set, pass through its ++ * contents to curl. */ ++ if ((ssl_capath = getenv("CURL_CA_BUNDLE"))) ++ if ((curlrc = curl_easy_setopt(easyhandle, CURLOPT_CAINFO, ssl_capath))) ++ return initCurlStuffFailed(); ++ + slist = curl_slist_append(slist, "Accept: text/*"); + slist = curl_slist_append(slist, "Accept-Language: en"); + slist = curl_slist_append(slist, "Accept-Charset: iso-8859-1,*,utf-8"); diff --git a/pkgs/applications/networking/instant-messengers/tkabber-plugins/default.nix b/pkgs/applications/networking/instant-messengers/tkabber-plugins/default.nix index c361f3270e6..b46133e433e 100644 --- a/pkgs/applications/networking/instant-messengers/tkabber-plugins/default.nix +++ b/pkgs/applications/networking/instant-messengers/tkabber-plugins/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, tkabber}: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { name = "tkabber-plugins-${version}"; @@ -10,9 +10,12 @@ stdenv.mkDerivation rec { }; configurePhase = '' - mkdir -p $out/bin sed -e "s@/usr/local@$out@" -i Makefile ''; - buildInputs = [tkabber]; + meta = { + homepage = "http://tkabber.jabber.ru/tkabber-plugins"; + description = "Plugins for the Tkabber instant messenger"; + license = stdenv.lib.licenses.gpl2; + }; } diff --git a/pkgs/applications/networking/instant-messengers/tkabber/default.nix b/pkgs/applications/networking/instant-messengers/tkabber/default.nix index 30c91d3d905..03a98cb2059 100644 --- a/pkgs/applications/networking/instant-messengers/tkabber/default.nix +++ b/pkgs/applications/networking/instant-messengers/tkabber/default.nix @@ -1,6 +1,15 @@ -{ stdenv, fetchurl, tcl, tk, tcllib, tcltls, bwidget, cacert, makeWrapper, x11 }: +{ stdenv, fetchurl, tcl, tk, tcllib, tcltls, tclgpg +, bwidget, makeWrapper, x11 }: -stdenv.mkDerivation rec { +let + tclLibraries = [ bwidget tcllib tcltls tclgpg ]; + + getTclLibPath = p: "${p}/lib/${p.libPrefix}"; + + tclLibPaths = stdenv.lib.concatStringsSep " " + (map getTclLibPath tclLibraries); + +in stdenv.mkDerivation rec { name = "tkabber-0.11.1"; src = fetchurl { @@ -13,7 +22,7 @@ stdenv.mkDerivation rec { patchPhase = '' substituteInPlace login.tcl --replace \ "custom::defvar loginconf(sslcacertstore) \"\"" \ - "custom::defvar loginconf(sslcacertstore) \"${cacert}/etc/ca-bundle.crt\"" + "custom::defvar loginconf(sslcacertstore) \$env(OPENSSL_X509_CERT_FILE)" sed -i '/^if.*load_default_xrdb/,/^}$/ { s@option readfile \(\[fullpath [^]]*\]\)@option readfile "'"$out/share/doc/tkabber/examples/xrdb/${defaultTheme}.xrdb"'"@ @@ -26,13 +35,16 @@ stdenv.mkDerivation rec { ''; postInstall = '' - wrapProgram $out/bin/tkabber --set TCLLIBPATH "${bwidget}/tcltk\ ${tcllib}/lib/tcllib${tcllib.version}\ ${tcltls}/lib/tls${tcltls.version}" + wrapProgram $out/bin/tkabber \ + --set TCLLIBPATH '"${tclLibPaths}"' \ + --set TKABBER_SITE_PLUGINS '$HOME/.nix-profile/share/tkabber-plugins' ''; - buildInputs = [tcl tk tcllib tcltls bwidget x11 makeWrapper]; + buildInputs = [ tcl tk x11 makeWrapper ] ++ tclLibraries; meta = { homepage = "http://tkabber.jabber.ru/"; description = "A GUI client for the XMPP (Jabber) instant messaging protocol"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/applications/networking/instant-messengers/vacuum/default.nix b/pkgs/applications/networking/instant-messengers/vacuum/default.nix index bddedce7183..63f18ee7dc4 100644 --- a/pkgs/applications/networking/instant-messengers/vacuum/default.nix +++ b/pkgs/applications/networking/instant-messengers/vacuum/default.nix @@ -12,11 +12,11 @@ let buildInputs = map (n: builtins.getAttr n x) (builtins.attrNames (builtins.removeAttrs x helperArgNames)); sourceInfo = rec { - version="1.1.2"; + version="1.2.0"; baseName="vacuum-im"; name="${baseName}-${version}"; url="http://vacuum-im.googlecode.com/files/vacuum-${version}.tar.xz"; - hash="451dde9b3587503b035fa1ddd2c99f2052a0b17a603491c59e8c47a8bcd4746d"; + hash="55a2c27aaaf79c7a4de127c22d3845ede35970283d35ee57fd5ceca581b085fc"; }; in rec { diff --git a/pkgs/applications/networking/irc/ii/default.nix b/pkgs/applications/networking/irc/ii/default.nix new file mode 100644 index 00000000000..a283258d589 --- /dev/null +++ b/pkgs/applications/networking/irc/ii/default.nix @@ -0,0 +1,20 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation rec { + name = "ii-1.6"; + + src = fetchurl { + url = "http://dl.suckless.org/tools/${name}.tar.gz"; + sha256 = "0afccbcm7i9lfch5mwzs3l1ax79dg3g6rrw0z8rb7d2kn8wsckvr"; + }; + + installPhase = '' + make install PREFIX=$out + ''; + + meta = { + homepage = http://tools.suckless.org/ii/; + license = "MIT"; + description = "Irc it, simple FIFO based irc client"; + }; +} diff --git a/pkgs/applications/networking/irc/konversation/default.nix b/pkgs/applications/networking/irc/konversation/default.nix index 938a26fd785..c4d2f4b3782 100644 --- a/pkgs/applications/networking/irc/konversation/default.nix +++ b/pkgs/applications/networking/irc/konversation/default.nix @@ -3,15 +3,15 @@ let pn = "konversation"; - v = "1.3.1"; + v = "1.4"; in stdenv.mkDerivation rec { name = "${pn}-${v}"; src = fetchurl { - url = "mirror://kde/stable/${pn}/${v}/src/${name}.tar.bz2"; - sha256 = "0wigcvi6lscy14dhm5nh1mkhfx7xxdq9g163pwpd0xndvybrfhfl"; + url = "mirror://kde/stable/${pn}/${v}/src/${name}.tar.xz"; + sha256 = "030vsbb18dlzsnjl3fzyd1m9wvvksiyc1lm45abi4q6x4xd60knv"; }; buildInputs = [ cmake qt4 perl gettext libXScrnSaver kdelibs kdepimlibs diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index 0fd521b9cce..a891c145b76 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -2,12 +2,12 @@ , zlib, curl , pkgconfig, libgcrypt, ruby, lua5, tcl, guile }: stdenv.mkDerivation rec { - version = "0.3.7"; + version = "0.3.8"; name = "weechat-${version}"; src = fetchurl { url = "http://weechat.org/files/src/${name}.tar.gz"; - sha256 = "1bphyhx5rnirga5l42z4lijw68qx724gffic1z60jdwfxc5dxknl"; + sha256 = "4293eb9d29f11b8ee8c301049d57e535acbea677bc1dc41ab12fe1bb8af0f10e"; }; buildInputs = diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index 9dd352857fb..266035aa1bd 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "notmuch-0.12"; + name = "notmuch-0.13.2"; src = fetchurl { url = "http://notmuchmail.org/releases/${name}.tar.gz"; - sha256 = "1dbbbbba3567df9c67ecc642d1e63269a527952c557f6b0c8bafcd4e37893992"; + sha256 = "75ec5f5d04bb7e3a8cc6224859b691f704a2a35f2f6027ffb674e829268f1d68"; }; buildInputs = [ bash emacs gdb glib gmime gnupg1 pkgconfig talloc xapian ]; diff --git a/pkgs/applications/networking/netperf/default.nix b/pkgs/applications/networking/netperf/default.nix index 7ef6a86c5eb..705f1455c45 100644 --- a/pkgs/applications/networking/netperf/default.nix +++ b/pkgs/applications/networking/netperf/default.nix @@ -1,11 +1,19 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "netperf-2.5.0"; + name = "netperf-2.6.0"; src = fetchurl { url = "ftp://ftp.netperf.org/netperf/${name}.tar.bz2"; - sha256 = "1l06bb99b4wfnmq247b8rvp4kn3w6bh1m46ri4d74z22li7br545"; + sha256 = "cd8dac710d4273d29f70e8dbd09353a6362ac58a11926e0822233c0cb230323a"; + }; + + meta = { + description = "benchmark to measure the performance of many different types of networking"; + homepage = "http://www.netperf.org/netperf/"; + license = "Hewlett-Packard BSD-like license"; + + platforms = stdenv.lib.platforms.linux; + maintainers = []; }; } - diff --git a/pkgs/applications/networking/newsreaders/pan/default.nix b/pkgs/applications/networking/newsreaders/pan/default.nix index ae6e7dd4681..c9965a784e0 100644 --- a/pkgs/applications/networking/newsreaders/pan/default.nix +++ b/pkgs/applications/networking/newsreaders/pan/default.nix @@ -5,14 +5,14 @@ assert spellChecking -> gtkspell != null; -let version = "0.138"; in +let version = "0.139"; in stdenv.mkDerivation { name = "pan-${version}"; src = fetchurl { url = "http://pan.rebelbase.com/download/releases/${version}/source/pan-${version}.tar.bz2"; - sha1 = "8ad70d0b2bfb771eb7af1f973af6520f9998591a"; + sha1 = "01ea0361a6d81489888e6abb075fd552999c3c60"; }; buildInputs = [ pkgconfig gtk perl gmime gettext intltool dbus_glib libnotify ] diff --git a/pkgs/applications/networking/p2p/gnunet/default.nix b/pkgs/applications/networking/p2p/gnunet/default.nix index be67c289814..f2fbf704649 100644 --- a/pkgs/applications/networking/p2p/gnunet/default.nix +++ b/pkgs/applications/networking/p2p/gnunet/default.nix @@ -1,24 +1,21 @@ { stdenv, fetchurl, libextractor, libmicrohttpd, libgcrypt , zlib, gmp, curl, libtool, adns, sqlite, pkgconfig , libxml2, ncurses, gettext, libunistring -, gtkSupport ? false, gtk ? null, libglade ? null , makeWrapper }: -assert gtkSupport -> (gtk != null) && (libglade != null); - stdenv.mkDerivation rec { - name = "gnunet-0.9.2"; + name = "gnunet-0.9.3"; src = fetchurl { url = "mirror://gnu/gnunet/${name}.tar.gz"; - sha256 = "1sa7xc85l7lkd0s7vyxnqhnm7cngnycrvp7zc6yj4b3qjg5z3x94"; + sha256 = "0ppirvwjb7w7270g0w83z6wyk984cnxv2ydxj7qr0j1cz2j6nn2h"; }; buildInputs = [ libextractor libmicrohttpd libgcrypt gmp curl libtool zlib adns sqlite libxml2 ncurses pkgconfig gettext libunistring makeWrapper - ] ++ (if gtkSupport then [ gtk libglade ] else []); + ]; preConfigure = '' # Brute force: since nix-worker chroots don't provide diff --git a/pkgs/applications/networking/p2p/ktorrent/default.nix b/pkgs/applications/networking/p2p/ktorrent/default.nix index 5f15cbc495f..b408f20b711 100644 --- a/pkgs/applications/networking/p2p/ktorrent/default.nix +++ b/pkgs/applications/networking/p2p/ktorrent/default.nix @@ -5,14 +5,14 @@ stdenv.mkDerivation rec { name = pname + "-" + version; pname = "ktorrent"; - version = "4.1.3"; + version = "4.2.1"; src = fetchurl { url = "${meta.homepage}/downloads/${version}/${name}.tar.bz2"; - sha256 = "0ih68bml6ic3mxk5l4ypgmxwyg9mglp57gw5igrnm5yszm7jz19g"; + sha256 = "1b6w7i1vvq8mlw9yrlxvb51hvaj6rpl8lv9b9zagyl3wcanz73zd"; }; - patches = [ ./find-workspace.diff ./drop-taskmanager-dependency.patch ]; + patches = [ ./find-workspace.diff ]; KDEDIRS = libktorrent; diff --git a/pkgs/applications/networking/p2p/ktorrent/drop-taskmanager-dependency.patch b/pkgs/applications/networking/p2p/ktorrent/drop-taskmanager-dependency.patch deleted file mode 100644 index 2998b392679..00000000000 --- a/pkgs/applications/networking/p2p/ktorrent/drop-taskmanager-dependency.patch +++ /dev/null @@ -1,175 +0,0 @@ -commit 6d4a6ae51692966862ccb20d17cb217717519d40 -Author: Joris Guisson -Date: Wed Nov 23 20:17:08 2011 +0100 - - Use dbus to show ktorrent window from plasma applet. This removes the dependency on libtaskmanager. - - BUG: 287309 -Changelog removed by Yury G. Kudryashov - -diff --git a/plasma/applet/CMakeLists.txt b/plasma/applet/CMakeLists.txt -index 3a72241..4307cf2 100644 ---- a/plasma/applet/CMakeLists.txt -+++ b/plasma/applet/CMakeLists.txt -@@ -5,25 +5,15 @@ if(NOT QT_VERSION_OK) - - else(NOT QT_VERSION_OK) - -- set(TASKMANAGER_FOUND FALSE) -- FIND_PATH(TASKMANAGER_INCLUDE_DIR NAMES taskmanager.h PATHS ${KDE4_INCLUDE_DIR}/taskmanager ${INCLUDE_INSTALL_DIR}/taskmanager.h) -- FIND_LIBRARY(TASKMANAGER_LIBRARY NAMES taskmanager PATHS ${KDE4_LIB_DIR} ${LIB_INSTALL_DIR}) -- -- if(TASKMANAGER_INCLUDE_DIR AND TASKMANAGER_LIBRARY) -- set(TASKMANAGER_FOUND TRUE) -- message(STATUS "Found libtaskmanager: ${TASKMANAGER_LIBRARY} ") -- include_directories(${TASKMANAGER_INCLUDE_DIR}) -- set(ktapplet_SRCS applet.cpp chunkbar.cpp fadingitem.cpp fadingnavigationwidget.cpp) -- -- kde4_add_ui_files(ktapplet_SRCS appletconfig.ui) -- -- kde4_add_plugin(plasma_applet_ktorrent ${ktapplet_SRCS}) -- target_link_libraries(plasma_applet_ktorrent ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS} ${TASKMANAGER_LIBRARY} ${LIBKTORRENT_LIBRARIES} ktcore) -- -- install(TARGETS plasma_applet_ktorrent DESTINATION ${PLUGIN_INSTALL_DIR}) -- install(FILES plasma-applet-ktorrent.desktop DESTINATION ${SERVICES_INSTALL_DIR}) -- endif(TASKMANAGER_INCLUDE_DIR AND TASKMANAGER_LIBRARY) -- -- macro_log_feature(TASKMANAGER_FOUND "libtaskmanager" "libtaskmanager library and header files" "http://www.kde.org/" FALSE "" "libtaskmanager is needed for KTorrent Plasmoid") -+ -+ set(ktapplet_SRCS applet.cpp chunkbar.cpp fadingitem.cpp fadingnavigationwidget.cpp) -+ -+ kde4_add_ui_files(ktapplet_SRCS appletconfig.ui) -+ -+ kde4_add_plugin(plasma_applet_ktorrent ${ktapplet_SRCS}) -+ target_link_libraries(plasma_applet_ktorrent ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS} ${LIBKTORRENT_LIBRARIES} ktcore) -+ -+ install(TARGETS plasma_applet_ktorrent DESTINATION ${PLUGIN_INSTALL_DIR}) -+ install(FILES plasma-applet-ktorrent.desktop DESTINATION ${SERVICES_INSTALL_DIR}) - - endif(NOT QT_VERSION_OK) -diff --git a/plasma/applet/applet.cpp b/plasma/applet/applet.cpp -index 59e7191..bf09479 100644 ---- a/plasma/applet/applet.cpp -+++ b/plasma/applet/applet.cpp -@@ -21,6 +21,9 @@ - #include "applet.h" - #include - #include -+#include -+#include -+#include - #include - #include - #include -@@ -31,12 +34,11 @@ - #include - #endif - #include --#include --#include - #include - #include "chunkbar.h" - #include "fadingnavigationwidget.h" - -+ - using namespace bt; - - namespace ktplasma -@@ -174,7 +176,8 @@ namespace ktplasma - } - } - -- void Applet::updateNavigation() { -+ void Applet::updateNavigation() -+ { - navigation->setEnabled(connected_to_app && !sources.empty() - && (sources.count() > 1 || !sources.contains(current_source))); - } -@@ -193,12 +196,14 @@ namespace ktplasma - } - } - -- void Applet::updateSources() { -+ void Applet::updateSources() -+ { - sources = engine->sources(); - sources.removeOne("core"); - } - -- void Applet::setSource(QString source) { -+ void Applet::setSource(QString source) -+ { - if (!current_source.isEmpty()) - engine->disconnectSource(current_source,this); - clearData(); -@@ -340,20 +345,39 @@ namespace ktplasma - - void Applet::iconClicked() - { -- TaskManager::TaskDict tasks = TaskManager::TaskManager::self()->tasks(); -- for (TaskManager::TaskDict::iterator i = tasks.begin();i != tasks.end();i ++) -+ QDBusConnection session_bus = QDBusConnection::sessionBus(); -+ QDBusConnectionInterface* dbus_service = session_bus.interface(); -+ if (!session_bus.isConnected() || !dbus_service || !dbus_service->isServiceRegistered("org.ktorrent.ktorrent")) - { -- if (i.value()->className() == "ktorrent") -- { -- KWindowSystem::activateWindow(i.key()); -- return; -- } -+ // can't find the window, try launching it -+ KUrl::List empty; -+ KRun::run("ktorrent", empty, 0); -+ } -+ else -+ { -+ QDBusMessage msg = QDBusMessage::createMethodCall("org.ktorrent.ktorrent", "/ktorrent/MainWindow_1", "org.kde.KMainWindow", "winId"); -+ QDBusPendingCall call = session_bus.asyncCall(msg, 5000); -+ QDBusPendingCallWatcher* watcher = new QDBusPendingCallWatcher(call ,this); -+ connect(watcher, SIGNAL(finished(QDBusPendingCallWatcher*)), this, SLOT(dbusCallFinished(QDBusPendingCallWatcher*))); - } -- -- // can't find the window, try launching it -- KUrl::List empty; -- KRun::run("ktorrent", empty, 0); - } -+ -+ void Applet::dbusCallFinished(QDBusPendingCallWatcher* self) -+ { -+ if (self->isError()) -+ { -+ // call failed, try launching it -+ KUrl::List empty; -+ KRun::run("ktorrent", empty, 0); -+ } -+ else -+ { -+ QDBusPendingReply reply = *self; -+ KWindowSystem::activateWindow(reply.value()); -+ } -+ self->deleteLater(); -+ } -+ - - void Applet::clearData() - { -diff --git a/plasma/applet/applet.h b/plasma/applet/applet.h -index 29b3265..d396118 100644 ---- a/plasma/applet/applet.h -+++ b/plasma/applet/applet.h -@@ -27,6 +27,7 @@ - #include "fadingnavigationwidget.h" - - class QGraphicsLinearLayout; -+class QDBusPendingCallWatcher; - - namespace Plasma - { -@@ -68,6 +69,7 @@ namespace ktplasma - void iconClicked(); - void selectPrev(); - void selectNext(); -+ void dbusCallFinished(QDBusPendingCallWatcher* self); - - private: - void updateTorrentCombo(); diff --git a/pkgs/applications/networking/sniffers/kismet/default.nix b/pkgs/applications/networking/sniffers/kismet/default.nix index a7831785db8..9e41e8b7aaf 100644 --- a/pkgs/applications/networking/sniffers/kismet/default.nix +++ b/pkgs/applications/networking/sniffers/kismet/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, libpcap, ncurses, expat, pcre}: stdenv.mkDerivation { - name = "kismet-2010-01-r1"; + name = "kismet-2011-03-r2"; src = fetchurl { - url = http://www.kismetwireless.net/code/kismet-2010-01-R1.tar.gz; - sha256 = "106qird64x1v29nz6k5zs9dxxdq6q7fb7d6np0pnwm3dd2p1w7cx"; + url = http://www.kismetwireless.net/code/kismet-2011-03-R2.tar.gz; + sha256 = "0r1admlaiq7k0v13d9ci9i9mf5m25i1r5r18bkawsla9fbxrk83i"; }; buildInputs = [libpcap ncurses expat pcre]; diff --git a/pkgs/applications/networking/sync/unison/default.nix b/pkgs/applications/networking/sync/unison/default.nix index b6906c86afe..ea30903fb38 100644 --- a/pkgs/applications/networking/sync/unison/default.nix +++ b/pkgs/applications/networking/sync/unison/default.nix @@ -1,9 +1,6 @@ {stdenv, fetchurl, ocaml, lablgtk, fontschumachermisc, xset, makeWrapper, ncurses , enableX11 ? true}: -let - nativeCode = if stdenv.isArm then false else true; -in stdenv.mkDerivation (rec { name = "unison-2.40.63"; @@ -19,7 +16,7 @@ stdenv.mkDerivation (rec { '' else ""; makeFlags = "INSTALLDIR=$(out)/bin/" + (if enableX11 then " UISTYLE=gtk2" else "") - + (if ! nativeCode then " NATIVE=false" else ""); + + (if ! ocaml.nativeCompilers then " NATIVE=false" else ""); preInstall = "mkdir -p $out/bin"; @@ -30,7 +27,7 @@ stdenv.mkDerivation (rec { done '' else ""; - dontStrip = if ! nativeCode then true else false; + dontStrip = if ! ocaml.nativeCompilers then true else false; meta = { homepage = http://www.cis.upenn.edu/~bcpierce/unison/; diff --git a/pkgs/applications/networking/vnstat/default.nix b/pkgs/applications/networking/vnstat/default.nix index 69a0a7efde8..57afefd7dcd 100644 --- a/pkgs/applications/networking/vnstat/default.nix +++ b/pkgs/applications/networking/vnstat/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, ncurses}: stdenv.mkDerivation rec { - name = "vnstat-1.9"; - + name = "vnstat-1.11"; + src = fetchurl { - url = http://humdi.net/vnstat/vnstat-1.9.tar.gz; - sha256 = "1migym0wig1s3b7d22ipxkd1p78sqc89dwx82qbf5hsb5q2fk4q1"; + url = "http://humdi.net/vnstat/${name}.tar.gz"; + sha256 = "09p0mlf49zzmh6jzwyvzd9k3jv7bl8i6w8xl65ns3dmv2zc7c65p"; }; installPhase = '' diff --git a/pkgs/applications/networking/yafc/default.nix b/pkgs/applications/networking/yafc/default.nix index a6c3c43417e..bdbb53d1675 100644 --- a/pkgs/applications/networking/yafc/default.nix +++ b/pkgs/applications/networking/yafc/default.nix @@ -1,21 +1,18 @@ -{stdenv, fetchurl, readline, openssh}: +{stdenv, fetchurl, readline, libssh, intltool}: -stdenv.mkDerivation { - name = "yafc-1.1.1"; +stdenv.mkDerivation rec { + name = "yafc-1.2.3"; src = fetchurl { - url = mirror://sourceforge/yafc/yafc-1.1.1.tar.bz2; - sha256 = "ab72b2ed89fb75dbe8ebd119458cf513392225f367cccfad881e9780aefcd7e6"; + url = "https://github.com/downloads/sebastinas/yafc/${name}.tar.xz"; + sha256 = "11h5r9ragfpil338kq981wxnifacflqfwgydhmy00b3fbdlnxzsi"; }; - buildInputs = [readline openssh]; - - patchPhase = " - sed -e 's@/usr/bin/ssh@${openssh}/bin/ssh@' -i src/main.c - "; + buildInputs = [ readline libssh intltool ]; meta = { description = "ftp/sftp client with readline, autocompletion and bookmarks"; - homepage = http://yafc.sourceforge.net; + homepage = http://www.yafc-ftp.com; + maintainers = [ stdenv.lib.maintainers.page ]; license = "GPLv2+"; }; } diff --git a/pkgs/applications/office/calligra/default.nix b/pkgs/applications/office/calligra/default.nix index b64338adaf1..152246ee58f 100644 --- a/pkgs/applications/office/calligra/default.nix +++ b/pkgs/applications/office/calligra/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, cmake, kdelibs, attica, perl, zlib, libpng, boost, mesa , kdepimlibs, createresources ? null, eigen, qca2, exiv2, soprano, marble, lcms2 , fontconfig, freetype, sqlite, icu, libwpd, libwpg, pkgconfig, popplerQt4 -, libkdcraw, libxslt, fftw, glew, gsl, shared_desktop_ontologies }: +, libkdcraw, libxslt, fftw, glew, gsl, shared_desktop_ontologies, okular }: stdenv.mkDerivation rec { - name = "calligra-2.4.2"; + name = "calligra-2.5.0"; src = fetchurl { url = "mirror://kde/stable/${name}/${name}.tar.bz2"; - sha256 = "14wi8mr87aas12f75qi6p8x0pij365sbz4c737qhh4302fh8fsqg"; + sha256 = "0q6ydi7hzrzwqzb38gikdh1l2zf8qp4i3nkgyb01148bjwrhvf21"; }; buildNativeInputs = [ cmake perl pkgconfig ]; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ kdelibs attica zlib libpng boost mesa kdepimlibs createresources eigen qca2 exiv2 soprano marble lcms2 fontconfig freetype sqlite icu libwpd libwpg popplerQt4 libkdcraw libxslt fftw glew gsl - shared_desktop_ontologies ]; + shared_desktop_ontologies okular ]; meta = { description = "A Qt/KDE office suite, formely known as koffice"; diff --git a/pkgs/applications/office/openoffice/generate-libreoffice-srcs.sh b/pkgs/applications/office/openoffice/generate-libreoffice-srcs.sh index 1d751ec7049..fb8cc816114 100644 --- a/pkgs/applications/office/openoffice/generate-libreoffice-srcs.sh +++ b/pkgs/applications/office/openoffice/generate-libreoffice-srcs.sh @@ -2,17 +2,19 @@ # Take the list of files from the main package, ooo.lst.in -echo '{fetchurl} : [' +cat <= 8.4. -- roconnor + postInstall = if buildIde then '' + cp ide/*.cmi ide/ide.*a $out/lib/coq/ide/ + '' else ""; + + meta = { + description = "Coq proof assistant"; + longDescription = '' + Coq is a formal proof management system. It provides a formal language + to write mathematical definitions, executable algorithms and theorems + together with an environment for semi-interactive development of + machine-checked proofs. + ''; + homepage = "http://coq.inria.fr"; + license = "LGPL"; + maintainers = [ stdenv.lib.maintainers.roconnor ]; + }; +} diff --git a/pkgs/applications/science/logic/coq/configure.8.3.patch b/pkgs/applications/science/logic/coq/configure.8.3.patch new file mode 100644 index 00000000000..431cccac4b0 --- /dev/null +++ b/pkgs/applications/science/logic/coq/configure.8.3.patch @@ -0,0 +1,1112 @@ +diff -Nuar coq-8.3pl3-orig/configure coq-8.3pl3/configure +--- coq-8.3pl3-orig/configure 2011-12-19 22:57:30.000000000 +0100 ++++ coq-8.3pl3/configure 2012-03-17 16:38:16.000000000 +0100 +@@ -395,7 +395,6 @@ + ocamlyaccexec=$CAMLBIN/ocamlyacc + ocamlmktopexec=$CAMLBIN/ocamlmktop + ocamlmklibexec=$CAMLBIN/ocamlmklib +- camlp4oexec=$CAMLBIN/camlp4o + esac + + if test ! -f "$CAMLC" ; then +@@ -628,7 +627,7 @@ + no) LABLGTKLIB=+lablgtk2 # Pour le message + LABLGTKINCLUDES="-I $LABLGTKLIB";; # Pour le makefile + yes) LABLGTKLIB="$lablgtkdir" # Pour le message +- LABLGTKINCLUDES="-I \"$LABLGTKLIB\"";; # Pour le makefile ++ LABLGTKINCLUDES="-I $LABLGTKLIB";; # Pour le makefile + esac;; + no) LABLGTKINCLUDES="";; + esac +diff -Nuar coq-8.3pl3-orig/configure~ coq-8.3pl3/configure~ +--- coq-8.3pl3-orig/configure~ 1970-01-01 01:00:00.000000000 +0100 ++++ coq-8.3pl3/configure~ 2011-12-19 22:57:30.000000000 +0100 +@@ -0,0 +1,1088 @@ ++#!/bin/sh ++ ++################################## ++# ++# Configuration script for Coq ++# ++################################## ++ ++VERSION=8.3pl3 ++VOMAGIC=08300 ++STATEMAGIC=58300 ++DATE=`LANG=C date +"%B %Y"` ++ ++# Create the bin/ directory if non-existent ++test -d bin || mkdir bin ++ ++# a local which command for sh ++which () { ++IFS=":" # set words separator in PATH to be ':' (it allows spaces in dirnames) ++for i in $PATH; do ++ if test -z "$i"; then i=.; fi ++ if [ -f "$i/$1" ] ; then ++ IFS=" " ++ echo "$i/$1" ++ break ++ fi ++done ++} ++ ++usage () { ++ printf "Available options for configure are:\n" ++ echo "-help" ++ printf "\tDisplays this help page\n" ++ echo "-prefix " ++ printf "\tSet installation directory to \n" ++ echo "-local" ++ printf "\tSet installation directory to the current source tree\n" ++ echo "-coqrunbyteflags" ++ printf "\tSet link flags for VM-dependent bytecode (coqtop)\n" ++ echo "-coqtoolsbyteflags" ++ printf "\tSet link flags for VM-independant bytecode (coqdep, coqdoc, ...)\n" ++ echo "-custom" ++ printf "\tGenerate all bytecode executables with -custom (not recommended)\n" ++ echo "-src" ++ printf "\tSpecifies the source directory\n" ++ echo "-bindir" ++ echo "-libdir" ++ echo "-mandir" ++ echo "-docdir" ++ printf "\tSpecifies where to install bin/lib/man/doc files resp.\n" ++ echo "-emacslib" ++ echo "-emacs" ++ printf "\tSpecifies where emacs files are to be installed\n" ++ echo "-coqdocdir" ++ printf "\tSpecifies where Coqdoc style files are to be installed\n" ++ echo "-camldir" ++ printf "\tSpecifies the path to the OCaml library\n" ++ echo "-lablgtkdir" ++ printf "\tSpecifies the path to the Lablgtk library\n" ++ echo "-camlp5dir" ++ printf "\tSpecifies where to look for the Camlp5 library and tells to use it\n" ++ echo "-arch" ++ printf "\tSpecifies the architecture\n" ++ echo "-opt" ++ printf "\tSpecifies whether or not to use OCaml *.opt optimized compilers\n" ++ echo "-natdynlink (yes|no)" ++ printf "\tSpecifies whether or not to use dynamic loading of native code\n" ++ echo "-coqide (opt|byte|no)" ++ printf "\tSpecifies whether or not to compile Coqide\n" ++ echo "-browser " ++ printf "\tUse to open URL %%s\n" ++ echo "-with-doc (yes|no)" ++ printf "\tSpecifies whether or not to compile the documentation\n" ++ echo "-with-geoproof (yes|no)" ++ printf "\tSpecifies whether or not to use Geoproof binding\n" ++ echo "-with-cc " ++ echo "-with-ar " ++ echo "-with-ranlib " ++ printf "\tTells configure where to find gcc/ar/ranlib executables\n" ++ echo "-byte-only" ++ printf "\tCompiles only bytecode version of Coq\n" ++ echo "-debug" ++ printf "\tAdd debugging information in the Coq executables\n" ++ echo "-profile" ++ printf "\tAdd profiling information in the Coq executables\n" ++ echo "-annotate" ++ printf "\tCompiles Coq with -dtypes option\n" ++} ++ ++ ++# Default OCaml binaries ++bytecamlc=ocamlc ++nativecamlc=ocamlopt ++ocamlmklibexec=ocamlmklib ++ocamlexec=ocaml ++ocamldepexec=ocamldep ++ocamldocexec=ocamldoc ++ocamllexexec=ocamllex ++ocamlyaccexec=ocamlyacc ++ocamlmktopexec=ocamlmktop ++camlp4oexec=camlp4o ++ ++ ++coq_debug_flag= ++coq_debug_flag_opt= ++coq_profile_flag= ++coq_annotate_flag= ++best_compiler=opt ++cflags="-fno-defer-pop -Wall -Wno-unused" ++natdynlink=yes ++ ++gcc_exec=gcc ++ar_exec=ar ++ranlib_exec=ranlib ++ ++local=false ++coqrunbyteflags_spec=no ++coqtoolsbyteflags_spec=no ++custom_spec=no ++src_spec=no ++prefix_spec=no ++bindir_spec=no ++libdir_spec=no ++mandir_spec=no ++docdir_spec=no ++emacslib_spec=no ++emacs_spec=no ++camldir_spec=no ++lablgtkdir_spec=no ++coqdocdir_spec=no ++arch_spec=no ++coqide_spec=no ++browser_spec=no ++wwwcoq_spec=no ++with_geoproof=false ++with_doc=all ++with_doc_spec=no ++force_caml_version=no ++force_caml_version_spec=no ++ ++COQSRC=`pwd` ++ ++# Parse command-line arguments ++ ++while : ; do ++ case "$1" in ++ "") break;; ++ -help|--help) usage ++ exit;; ++ -prefix|--prefix) prefix_spec=yes ++ prefix="$2" ++ shift;; ++ -local|--local) local=true;; ++ -coqrunbyteflags|--coqrunbyteflags) coqrunbyteflags_spec=yes ++ coqrunbyteflags="$2" ++ shift;; ++ -coqtoolsbyteflags|--coqtoolsbyteflags) coqtoolsbyteflags_spec=yes ++ coqtoolsbyteflags="$2" ++ shift;; ++ -custom|--custom) custom_spec=yes ++ shift;; ++ -src|--src) src_spec=yes ++ COQSRC="$2" ++ shift;; ++ -bindir|--bindir) bindir_spec=yes ++ bindir="$2" ++ shift;; ++ -libdir|--libdir) libdir_spec=yes ++ libdir="$2" ++ shift;; ++ -mandir|--mandir) mandir_spec=yes ++ mandir="$2" ++ shift;; ++ -docdir|--docdir) docdir_spec=yes ++ docdir="$2" ++ shift;; ++ -emacslib|--emacslib) emacslib_spec=yes ++ emacslib="$2" ++ shift;; ++ -emacs |--emacs) emacs_spec=yes ++ emacs="$2" ++ shift;; ++ -coqdocdir|--coqdocdir) coqdocdir_spec=yes ++ coqdocdir="$2" ++ shift;; ++ -camldir|--camldir) camldir_spec=yes ++ camldir="$2" ++ shift;; ++ -lablgtkdir|--lablgtkdir) lablgtkdir_spec=yes ++ lablgtkdir="$2" ++ shift;; ++ -camlp5dir|--camlp5dir) ++ camlp5dir="$2" ++ shift;; ++ -arch|--arch) arch_spec=yes ++ arch=$2 ++ shift;; ++ -opt|--opt) bytecamlc=ocamlc.opt ++ camlp4oexec=camlp4o # can't add .opt since dyn load'll be required ++ nativecamlc=ocamlopt.opt;; ++ -natdynlink|--natdynlink) case "$2" in ++ yes) natdynlink=yes;; ++ *) natdynlink=no ++ esac ++ shift;; ++ -coqide|--coqide) coqide_spec=yes ++ case "$2" in ++ byte|opt) COQIDE=$2;; ++ *) COQIDE=no ++ esac ++ shift;; ++ -browser|--browser) browser_spec=yes ++ BROWSER=$2 ++ shift;; ++ -coqwebsite|--coqwebsite) wwwcoq_spec=yes ++ WWWCOQ=$2 ++ shift;; ++ -with-doc|--with-doc) with_doc_spec=yes ++ case "$2" in ++ yes|all) with_doc=all;; ++ *) with_doc=no ++ esac ++ shift;; ++ -with-geoproof|--with-geoproof) ++ case "$2" in ++ yes) with_geoproof=true;; ++ no) with_geoproof=false;; ++ esac ++ shift;; ++ -with-cc|-with-gcc|--with-cc|--with-gcc) ++ gcc_spec=yes ++ gcc_exec=$2 ++ shift;; ++ -with-ar|--with-ar) ++ ar_spec=yes ++ ar_exec=$2 ++ shift;; ++ -with-ranlib|--with-ranlib) ++ ranlib_spec=yes ++ ranlib_exec=$2 ++ shift;; ++ -byte-only|-byteonly|--byteonly|--byte-only) best_compiler=byte;; ++ -debug|--debug) coq_debug_flag=-g;; ++ -profile|--profile) coq_profile_flag=-p;; ++ -annotate|--annotate) coq_annotate_flag=-dtypes;; ++ -force-caml-version|--force-caml-version|-force-ocaml-version|--force-ocaml-version) ++ force_caml_version_spec=yes ++ force_caml_version=yes;; ++ *) echo "Unknown option \"$1\"." 1>&2; usage; exit 2;; ++ esac ++ shift ++done ++ ++if [ $prefix_spec = yes -a $local = true ] ; then ++ echo "Options -prefix and -local are incompatible." ++ echo "Configure script failed!" ++ exit 1 ++fi ++ ++# compile date ++DATEPGM=`which date` ++case $DATEPGM in ++ "") echo "I can't find the program \"date\" in your path." ++ echo "Please give me the current date" ++ read COMPILEDATE;; ++ *) COMPILEDATE=`date +"%h %d %Y %H:%M:%S"`;; ++esac ++ ++# Architecture ++ ++case $arch_spec in ++ no) ++ # First we test if we are running a Cygwin system ++ if [ `uname -s | cut -c -6` = "CYGWIN" ] ; then ++ ARCH="win32" ++ else ++ # If not, we determine the architecture ++ if test -x /bin/arch ; then ++ ARCH=`/bin/arch` ++ elif test -x /usr/bin/arch ; then ++ ARCH=`/usr/bin/arch` ++ elif test -x /usr/ucb/arch ; then ++ ARCH=`/usr/ucb/arch` ++ elif test -x /bin/uname ; then ++ ARCH=`/bin/uname -s` ++ elif test -x /usr/bin/uname ; then ++ ARCH=`/usr/bin/uname -s` ++ else ++ echo "I can not automatically find the name of your architecture." ++ printf "%s"\ ++ "Give me a name, please [win32 for Win95, Win98 or WinNT]: " ++ read ARCH ++ fi ++ fi;; ++ yes) ARCH=$arch ++esac ++ ++# executable extension ++ ++case $ARCH in ++ win32) ++ EXE=".exe" ++ DLLEXT=".dll";; ++ *) EXE="" ++ DLLEXT=".so" ++esac ++ ++# Is the source tree checked out from a recognised ++# version control system ? ++if test -e .svn/entries ; then ++ checkedout=svn ++elif [ -d '{arch}' ]; then ++ checkedout=gnuarch ++elif [ -z "${GIT_DIR}" ] && [ -d .git ] || [ -d "${GIT_DIR}" ]; then ++ checkedout=git ++else ++ checkedout=0 ++fi ++ ++# make command ++ ++MAKE=`which make` ++if [ "$MAKE" != "" ]; then ++ MAKEVERSION=`$MAKE -v | head -1 | cut -d" " -f3` ++ MAKEVERSIONMAJOR=`echo $MAKEVERSION | cut -d. -f1` ++ MAKEVERSIONMINOR=`echo $MAKEVERSION | cut -d. -f2` ++ if [ "$MAKEVERSIONMAJOR" -eq 3 -a "$MAKEVERSIONMINOR" -ge 81 ]; then ++ echo "You have GNU Make $MAKEVERSION. Good!" ++ else ++ OK="no" ++ if [ -x ./make ]; then ++ MAKEVERSION=`./make -v | head -1` ++ if [ "$MAKEVERSION" = "GNU Make 3.81" ]; then OK="yes"; fi ++ fi ++ if [ $OK = "no" ]; then ++ echo "GNU Make >= 3.81 is needed." ++ echo "Make 3.81 can be downloaded from ftp://ftp.gnu.org/gnu/make/make-3.81.tar.gz" ++ echo "then locally installed on a Unix-style system by issuing:" ++ echo " tar xzvf make-3.81.tar.gz" ++ echo " cd make-3.81" ++ echo " ./configure" ++ echo " make" ++ echo " mv make .." ++ echo " cd .." ++ echo "Restart then the configure script and later use ./make instead of make." ++ exit 1 ++ else ++ echo "You have locally installed GNU Make 3.81. Good!" ++ fi ++ fi ++else ++ echo "Cannot find GNU Make >= 3.81." ++fi ++ ++# Browser command ++ ++if [ "$browser_spec" = "no" ]; then ++ case $ARCH in ++ win32) BROWSER='C:\PROGRA~1\INTERN~1\IEXPLORE %s' ;; ++ *) BROWSER='firefox -remote "OpenURL(%s,new-tab)" || firefox %s &' ;; ++ esac ++fi ++ ++if [ "$wwwcoq_spec" = "no" ]; then ++ WWWCOQ="http://coq.inria.fr/" ++fi ++ ++######################################### ++# Objective Caml programs ++ ++case $camldir_spec in ++ no) CAMLC=`which $bytecamlc` ++ case "$CAMLC" in ++ "") echo "$bytecamlc is not present in your path!" ++ echo "Give me manually the path to the $bytecamlc executable [/usr/local/bin by default]: " ++ read CAMLC ++ ++ case "$CAMLC" in ++ "") CAMLC=/usr/local/bin/$bytecamlc;; ++ */ocamlc|*/ocamlc.opt) true;; ++ */) CAMLC="${CAMLC}"$bytecamlc;; ++ *) CAMLC="${CAMLC}"/$bytecamlc;; ++ esac ++ esac ++ CAMLBIN=`dirname "$CAMLC"`;; ++ yes) CAMLC=$camldir/$bytecamlc ++ ++ CAMLBIN=`dirname "$CAMLC"` ++ bytecamlc="$CAMLC" ++ nativecamlc=$CAMLBIN/$nativecamlc ++ ocamlexec=$CAMLBIN/ocaml ++ ocamldepexec=$CAMLBIN/ocamldep ++ ocamldocexec=$CAMLBIN/ocamldoc ++ ocamllexexec=$CAMLBIN/ocamllex ++ ocamlyaccexec=$CAMLBIN/ocamlyacc ++ ocamlmktopexec=$CAMLBIN/ocamlmktop ++ ocamlmklibexec=$CAMLBIN/ocamlmklib ++ camlp4oexec=$CAMLBIN/camlp4o ++esac ++ ++if test ! -f "$CAMLC" ; then ++ echo "I can not find the executable '$CAMLC'. Have you installed it?" ++ echo "Configuration script failed!" ++ exit 1 ++fi ++ ++# Under Windows, OCaml only understands Windows filenames (C:\...) ++case $ARCH in ++ win32) CAMLBIN=`cygpath -m ${CAMLBIN}`;; ++esac ++ ++CAMLVERSION=`"$bytecamlc" -version` ++ ++case $CAMLVERSION in ++ 1.*|2.*|3.00|3.01|3.02|3.03|3.03alpha|3.04|3.05beta|3.05|3.06|3.07*|3.08*|3.09*) ++ echo "Your version of Objective-Caml is $CAMLVERSION." ++ if [ "$force_caml_version" = "yes" ]; then ++ echo "*Warning* You are compiling Coq with an outdated version of Objective-Caml." ++ else ++ echo " You need Objective-Caml 3.10.2 or later." ++ echo " Configuration script failed!" ++ exit 1 ++ fi;; ++ ?*) ++ CAMLP4COMPAT="-loc loc" ++ echo "You have Objective-Caml $CAMLVERSION. Good!";; ++ *) ++ echo "I found the Objective-Caml compiler but cannot find its version number!" ++ echo "Is it installed properly?" ++ echo "Configuration script failed!" ++ exit 1;; ++esac ++ ++CAMLTAG=OCAML`echo $CAMLVERSION | sed -e "s/\([1-9]\)\.\([0-9]*\).*/\1\2/g"` ++ ++# For coqmktop & bytecode compiler ++ ++case $ARCH in ++ win32) # Awfull trick to get around a ^M problem at the end of CAMLLIB ++ CAMLLIB=`"$CAMLC" -where | sed -e 's/^\(.*\)$/\1/'` ;; ++ *) ++ CAMLLIB=`"$CAMLC" -where` ++esac ++ ++if [ "$coq_debug_flag" = "-g" ]; then ++ case $CAMLTAG in ++ OCAML31*) ++ # Compilation debug flag ++ coq_debug_flag_opt="-g" ++ ;; ++ esac ++fi ++ ++# Native dynlink ++if [ "$natdynlink" = "yes" -a -f `"$CAMLC" -where`/dynlink.cmxa ]; then ++ HASNATDYNLINK=true ++else ++ HASNATDYNLINK=false ++fi ++ ++case $HASNATDYNLINK,`uname -s`,`uname -r`,$CAMLVERSION in ++ true,Darwin,9.*,3.11.*) # ocaml 3.11.0 dynlink on MacOS 10.5 is buggy ++ NATDYNLINKFLAG=os5fixme;; ++ #Possibly a problem on 10.6.0/10.6.1/10.6.2 ++ #May just be a 32 vs 64 problem for all 10.6.* ++ true,Darwin,10.0.*,3.11.*) # Possibly a problem on 10.6.0 ++ NATDYNLINKFLAG=os5fixme;; ++ true,Darwin,10.1.*,3.11.*) # Possibly a problem on 10.6.1 ++ NATDYNLINKFLAG=os5fixme;; ++ true,Darwin,10.2.*,3.11.*) # Possibly a problem on 10.6.2 ++ NATDYNLINKFLAG=os5fixme;; ++ true,Darwin,10.*,3.11.*) ++ if [ `getconf LONG_BIT` = "32" ]; then ++ # Still a problem for x86_32 ++ NATDYNLINKFLAG=os5fixme ++ else ++ # Not a problem for x86_64 ++ NATDYNLINKFLAG=$HASNATDYNLINK ++ fi;; ++ *) ++ NATDYNLINKFLAG=$HASNATDYNLINK;; ++esac ++ ++# Camlp4 / Camlp5 configuration ++ ++if [ "$camlp5dir" != "" ]; then ++ CAMLP4=camlp5 ++ CAMLP4LIB=$camlp5dir ++ if [ ! -f $camlp5dir/camlp5.cma ]; then ++ echo "Cannot find camlp5 libraries in $camlp5dir (camlp5.cma not found)." ++ echo "Configuration script failed!" ++ exit 1 ++ fi ++ camlp4oexec=`echo $camlp4oexec | sed -e 's/4/5/'` ++else ++ case $CAMLTAG in ++ OCAML31*) ++ if [ -x "${CAMLLIB}/camlp5" ]; then ++ CAMLP4LIB=+camlp5 ++ elif [ -x "${CAMLLIB}/site-lib/camlp5" ]; then ++ CAMLP4LIB=+site-lib/camlp5 ++ else ++ echo "Objective Caml $CAMLVERSION found but no Camlp5 installed." ++ echo "Configuration script failed!" ++ exit 1 ++ fi ++ CAMLP4=camlp5 ++ camlp4oexec=`echo $camlp4oexec | sed -e 's/4/5/'` ++ ;; ++ *) ++ CAMLP4=camlp4 ++ CAMLP4LIB=+camlp4 ++ ;; ++ esac ++fi ++ ++if [ "$CAMLP4" = "camlp5" ] && `$camlp4oexec -v 2>&1 | grep -q 5.00`; then ++ echo "Camlp5 version 5.00 not supported: versions 4.0x or >= 5.01 are OK" ++ echo "(depending also on your ocaml version)." ++ echo "Configuration script failed!" ++ exit 1 ++fi ++ ++ ++case $CAMLP4LIB in ++ +*) FULLCAMLP4LIB=$CAMLLIB/`echo $CAMLP4LIB | cut -b 2-`;; ++ *) FULLCAMLP4LIB=$CAMLP4LIB;; ++esac ++ ++# Assume that camlp(4|5) binaries are at the same place as ocaml ones ++# (this should become configurable some day) ++CAMLP4BIN=${CAMLBIN} ++ ++# do we have a native compiler: test of ocamlopt and its version ++ ++if [ "$best_compiler" = "opt" ] ; then ++ if test -e "$nativecamlc" || test -e "`which $nativecamlc`"; then ++ CAMLOPTVERSION=`"$nativecamlc" -v | sed -n -e 's|.*version* *\(.*\)$|\1|p' ` ++ if [ "`uname -s`" = "Darwin" -a "$ARCH" = "i386" ]; then ++ case $CAMLOPTVERSION in ++ 3.09.3|3.1?*) ;; ++ *) echo "Native compilation on MacOS X Pentium requires Objective-Caml >= 3.09.3," ++ best_compiler=byte ++ echo "only the bytecode version of Coq will be available." ++ esac ++ elif [ ! -f $FULLCAMLP4LIB/gramlib.cmxa ]; then ++ best_compiler=byte ++ echo "Cannot find native-code $CAMLP4," ++ echo "only the bytecode version of Coq will be available." ++ else ++ if [ "$CAMLOPTVERSION" != "$CAMLVERSION" ] ; then ++ echo "Native and bytecode compilers do not have the same version!" ++ fi ++ echo "You have native-code compilation. Good!" ++ fi ++ else ++ best_compiler=byte ++ echo "You have only bytecode compilation." ++ fi ++fi ++ ++# OS dependent libraries ++ ++case $ARCH in ++ sun4*) OS=`uname -r` ++ case $OS in ++ 5*) OS="Sun Solaris $OS" ++ OSDEPLIBS="-cclib -lunix -cclib -lnsl -cclib -lsocket";; ++ *) OS="Sun OS $OS" ++ OSDEPLIBS="-cclib -lunix" ++ esac;; ++ alpha) OSDEPLIBS="-cclib -lunix";; ++ win32) OS="Win32" ++ OSDEPLIBS="-cclib -lunix" ++ cflags="-mno-cygwin $cflags";; ++ *) OSDEPLIBS="-cclib -lunix" ++esac ++ ++# lablgtk2 and CoqIDE ++ ++# -byte-only should imply -coqide byte, unless the user decides otherwise ++ ++if [ "$best_compiler" = "byte" -a "$coqide_spec" = "no" ]; then ++ coqide_spec=yes ++ COQIDE=byte ++fi ++ ++# Which coqide is asked ? which one is possible ? ++ ++if [ "$coqide_spec" = "yes" -a "$COQIDE" = "no" ]; then ++ echo "CoqIde disabled as requested." ++else ++ case $lablgtkdir_spec in ++ no) ++ if [ -f "${CAMLLIB}/lablgtk2/glib.mli" ]; then ++ lablgtkdir=${CAMLLIB}/lablgtk2 ++ elif [ -f "${CAMLLIB}/site-lib/lablgtk2/glib.mli" ]; then ++ lablgtkdir=${CAMLLIB}/site-lib/lablgtk2 ++ fi;; ++ yes) ++ if [ ! -f "$lablgtkdir/glib.mli" ]; then ++ echo "Incorrect LablGtk2 library (glib.mli not found)." ++ echo "Configuration script failed!" ++ exit 1 ++ fi;; ++ esac ++ if [ "$lablgtkdir" = "" ]; then ++ echo "LablGtk2 not found: CoqIde will not be available." ++ COQIDE=no ++ elif [ -z "`grep -w convert_with_fallback "$lablgtkdir/glib.mli"`" ]; then ++ echo "LablGtk2 found but too old: CoqIde will not be available." ++ COQIDE=no; ++ elif [ "$coqide_spec" = "yes" -a "$COQIDE" = "byte" ]; then ++ echo "LablGtk2 found, bytecode CoqIde will be used as requested." ++ COQIDE=byte ++ elif [ ! -f "${CAMLLIB}/threads/threads.cmxa" ]; then ++ echo "LablGtk2 found, no native threads: bytecode CoqIde will be available." ++ COQIDE=byte ++ else ++ echo "LablGtk2 found, native threads: native CoqIde will be available." ++ COQIDE=opt ++ fi ++fi ++ ++case $COQIDE in ++ byte|opt) ++ case $lablgtkdir_spec in ++ no) LABLGTKLIB=+lablgtk2 # Pour le message ++ LABLGTKINCLUDES="-I $LABLGTKLIB";; # Pour le makefile ++ yes) LABLGTKLIB="$lablgtkdir" # Pour le message ++ LABLGTKINCLUDES="-I \"$LABLGTKLIB\"";; # Pour le makefile ++ esac;; ++ no) LABLGTKINCLUDES="";; ++esac ++ ++# strip command ++ ++case $ARCH in ++ win32) ++ # true -> strip : it exists under cygwin ! ++ STRIPCOMMAND="strip";; ++ *) ++ if [ "$coq_profile_flag" = "-p" ] || [ "$coq_debug_flag" = "-g" ] || ++ [ "`uname -s`" = "Darwin" -a "$HASNATDYNLINK" = "true" ] ++ then ++ STRIPCOMMAND="true" ++ else ++ STRIPCOMMAND="strip" ++ fi ++esac ++ ++# mktexlsr ++#MKTEXLSR=`which mktexlsr` ++#case $MKTEXLSR in ++# "") MKTEXLSR=true;; ++#esac ++ ++# " ++### Test if documentation can be compiled (latex, hevea) ++ ++if test "$with_doc" = "all" ++then ++ for cmd in "latex" "hevea" ; do ++ if test ! -x "`which $cmd`" ++ then ++ echo "$cmd was not found; documentation will not be available" ++ with_doc=no ++ break ++ fi ++ done ++fi ++ ++########################################### ++# bindir, libdir, mandir, docdir, etc. ++ ++case $src_spec in ++ no) COQTOP=${COQSRC} ++esac ++ ++# OCaml only understand Windows filenames (C:\...) ++case $ARCH in ++ win32) COQTOP=`cygpath -m ${COQTOP}` ++esac ++ ++case $ARCH in ++ win32) ++ bindir_def='C:\coq\bin' ++ libdir_def='C:\coq\lib' ++ mandir_def='C:\coq\man' ++ docdir_def='C:\coq\doc' ++ emacslib_def='C:\coq\emacs' ++ coqdocdir_def='C:\coq\latex';; ++ *) ++ bindir_def=/usr/local/bin ++ libdir_def=/usr/local/lib/coq ++ mandir_def=/usr/local/man ++ docdir_def=/usr/local/share/doc/coq ++ emacslib_def=/usr/local/share/emacs/site-lisp ++ coqdocdir_def=/usr/local/share/texmf/tex/latex/misc;; ++esac ++ ++emacs_def=emacs ++ ++case $bindir_spec/$prefix_spec/$local in ++ yes/*/*) BINDIR=$bindir ;; ++ */yes/*) BINDIR=$prefix/bin ;; ++ */*/true) BINDIR=$COQTOP/bin ;; ++ *) printf "Where should I install the Coq binaries [$bindir_def]? " ++ read BINDIR ++ case $BINDIR in ++ "") BINDIR=$bindir_def;; ++ *) true;; ++ esac;; ++esac ++ ++case $libdir_spec/$prefix_spec/$local in ++ yes/*/*) LIBDIR=$libdir;; ++ */yes/*) ++ case $ARCH in ++ win32) LIBDIR=$prefix ;; ++ *) LIBDIR=$prefix/lib/coq ;; ++ esac ;; ++ */*/true) LIBDIR=$COQTOP ;; ++ *) printf "Where should I install the Coq library [$libdir_def]? " ++ read LIBDIR ++ case $LIBDIR in ++ "") LIBDIR=$libdir_def;; ++ *) true;; ++ esac;; ++esac ++ ++case $mandir_spec/$prefix_spec/$local in ++ yes/*/*) MANDIR=$mandir;; ++ */yes/*) MANDIR=$prefix/man ;; ++ */*/true) MANDIR=$COQTOP/man ;; ++ *) printf "Where should I install the Coq man pages [$mandir_def]? " ++ read MANDIR ++ case $MANDIR in ++ "") MANDIR=$mandir_def;; ++ *) true;; ++ esac;; ++esac ++ ++case $docdir_spec/$prefix_spec/$local in ++ yes/*/*) DOCDIR=$docdir; HTMLREFMANDIR=$DOCDIR/html/refman;; ++ */yes/*) DOCDIR=$prefix/share/doc/coq; HTMLREFMANDIR=$DOCDIR/html/refman;; ++ */*/true) DOCDIR=$COQTOP/doc; HTMLREFMANDIR=$DOCDIR/refman/html;; ++ *) printf "Where should I install the Coq documentation [$docdir_def]? " ++ read DOCDIR ++ case $DOCDIR in ++ "") DOCDIR=$docdir_def; HTMLREFMANDIR=$DOCDIR/html/refman;; ++ *) true;; ++ esac;; ++esac ++ ++case $emacslib_spec/$prefix_spec/$local in ++ yes/*/*) EMACSLIB=$emacslib;; ++ */yes/*) ++ case $ARCH in ++ win32) EMACSLIB=$prefix/emacs ;; ++ *) EMACSLIB=$prefix/share/emacs/site-lisp ;; ++ esac ;; ++ */*/true) EMACSLIB=$COQTOP/tools/emacs ;; ++ *) printf "Where should I install the Coq Emacs mode [$emacslib_def]? " ++ read EMACSLIB ++ case $EMACSLIB in ++ "") EMACSLIB=$emacslib_def;; ++ *) true;; ++ esac;; ++esac ++ ++case $coqdocdir_spec/$prefix_spec/$local in ++ yes/*/*) COQDOCDIR=$coqdocdir;; ++ */yes/*) ++ case $ARCH in ++ win32) COQDOCDIR=$prefix/latex ;; ++ *) COQDOCDIR=$prefix/share/emacs/site-lisp ;; ++ esac ;; ++ */*/true) COQDOCDIR=$COQTOP/tools/coqdoc ;; ++ *) printf "Where should I install Coqdoc TeX/LaTeX files [$coqdocdir_def]? " ++ read COQDOCDIR ++ case $COQDOCDIR in ++ "") COQDOCDIR=$coqdocdir_def;; ++ *) true;; ++ esac;; ++esac ++ ++# Determine if we enable -custom by default (Windows and MacOS) ++CUSTOM_OS=no ++if [ "$ARCH" = "win32" ] || [ "`uname -s`" = "Darwin" ]; then ++ CUSTOM_OS=yes ++fi ++ ++BUILDLDPATH="# you might want to set CAML_LD_LIBRARY_PATH by hand!" ++case $coqrunbyteflags_spec/$local/$custom_spec/$CUSTOM_OS in ++ yes/*/*/*) COQRUNBYTEFLAGS="$coqrunbyteflags";; ++ */*/yes/*|*/*/*/yes) COQRUNBYTEFLAGS="-custom";; ++ */true/*/*) COQRUNBYTEFLAGS="-dllib -lcoqrun -dllpath '$COQTOP'/kernel/byterun";; ++ *) ++ COQRUNBYTEFLAGS="-dllib -lcoqrun -dllpath '$LIBDIR'" ++ BUILDLDPATH="export CAML_LD_LIBRARY_PATH='$COQTOP'/kernel/byterun";; ++esac ++case $coqtoolsbyteflags_spec/$custom_spec/$CUSTOM_OS in ++ yes/*/*) COQTOOLSBYTEFLAGS="$coqtoolsbyteflags";; ++ */yes/*|*/*/yes) COQTOOLSBYTEFLAGS="-custom";; ++ *) COQTOOLSBYTEFLAGS="";; ++esac ++ ++# case $emacs_spec in ++# no) printf "Which Emacs command should I use to compile coq.el [$emacs_def]? " ++# read EMACS ++ ++# case $EMACS in ++# "") EMACS=$emacs_def;; ++# *) true;; ++# esac;; ++# yes) EMACS=$emacs;; ++# esac ++ ++ ++ ++########################################### ++# Summary of the configuration ++ ++echo "" ++echo " Coq top directory : $COQTOP" ++echo " Architecture : $ARCH" ++if test ! -z "$OS" ; then ++ echo " Operating system : $OS" ++fi ++echo " Coq VM bytecode link flags : $COQRUNBYTEFLAGS" ++echo " Coq tools bytecode link flags : $COQTOOLSBYTEFLAGS" ++echo " OS dependent libraries : $OSDEPLIBS" ++echo " Objective-Caml/Camlp4 version : $CAMLVERSION" ++echo " Objective-Caml/Camlp4 binaries in : $CAMLBIN" ++echo " Objective-Caml library in : $CAMLLIB" ++echo " Camlp4 library in : $CAMLP4LIB" ++if test "$best_compiler" = opt ; then ++echo " Native dynamic link support : $HASNATDYNLINK" ++fi ++if test "$COQIDE" != "no"; then ++echo " Lablgtk2 library in : $LABLGTKLIB" ++fi ++if test "$with_doc" = "all"; then ++echo " Documentation : All" ++else ++echo " Documentation : None" ++fi ++echo " CoqIde : $COQIDE" ++echo " Web browser : $BROWSER" ++echo " Coq web site : $WWWCOQ" ++echo "" ++ ++echo " Paths for true installation:" ++echo " binaries will be copied in $BINDIR" ++echo " library will be copied in $LIBDIR" ++echo " man pages will be copied in $MANDIR" ++echo " documentation will be copied in $DOCDIR" ++echo " emacs mode will be copied in $EMACSLIB" ++echo "" ++ ++################################################## ++# Building the $COQTOP/dev/ocamldebug-coq file ++################################################## ++ ++OCAMLDEBUGCOQ=$COQSRC/dev/ocamldebug-coq ++ ++if test "$coq_debug_flag" = "-g" ; then ++ rm -f $OCAMLDEBUGCOQ ++ sed -e "s|COQTOPDIRECTORY|$COQTOP|" \ ++ -e "s|COQLIBDIRECTORY|$LIBDIR|" \ ++ -e "s|CAMLBINDIRECTORY|$CAMLBIN|" \ ++ -e "s|CAMLP4LIBDIRECTORY|$FULLCAMLP4LIB|"\ ++ $OCAMLDEBUGCOQ.template > $OCAMLDEBUGCOQ ++ chmod a-w,a+x $OCAMLDEBUGCOQ ++fi ++ ++#################################################### ++# Fixing lablgtk types (before/after 2.6.0) ++#################################################### ++ ++if [ ! "$COQIDE" = "no" ]; then ++ if grep "class view " "$lablgtkdir/gText.mli" | grep -q "\[>" ; then ++ if grep -q "?accepts_tab:bool" "$lablgtkdir/gText.mli" ; then ++ cp -f ide/undo_lablgtk_ge212.mli ide/undo.mli ++ else ++ cp -f ide/undo_lablgtk_ge26.mli ide/undo.mli ++ fi ++ else ++ cp -f ide/undo_lablgtk_lt26.mli ide/undo.mli ++ fi ++fi ++ ++############################################## ++# Creation of configuration files ++############################################## ++ ++mlconfig_file="$COQSRC/config/coq_config.ml" ++config_file="$COQSRC/config/Makefile" ++config_template="$COQSRC/config/Makefile.template" ++ ++ ++### Warning !! ++### After this line, be careful when using variables, ++### since some of them (e.g. $COQSRC) will be escaped ++ ++ ++# An escaped version of a variable ++escape_var () { ++"$ocamlexec" 2>&1 1>/dev/null < $mlconfig_file ++(* DO NOT EDIT THIS FILE: automatically generated by ../configure *) ++ ++let local = $local ++let coqrunbyteflags = "$COQRUNBYTEFLAGS" ++let coqlib = "$LIBDIR" ++let coqsrc = "$COQSRC" ++let ocaml = "$ocamlexec" ++let ocamlc = "$bytecamlc" ++let ocamlopt = "$nativecamlc" ++let ocamlmklib = "$ocamlmklibexec" ++let ocamldep = "$ocamldepexec" ++let ocamldoc = "$ocamldocexec" ++let ocamlyacc = "$ocamlyaccexec" ++let ocamllex = "$ocamllexexec" ++let camlbin = "$CAMLBIN" ++let camllib = "$CAMLLIB" ++let camlp4 = "$CAMLP4" ++let camlp4o = "$camlp4oexec" ++let camlp4bin = "$CAMLP4BIN" ++let camlp4lib = "$CAMLP4LIB" ++let camlp4compat = "$CAMLP4COMPAT" ++let coqideincl = "$LABLGTKINCLUDES" ++let cflags = "$cflags" ++let best = "$best_compiler" ++let arch = "$ARCH" ++let has_coqide = "$COQIDE" ++let has_natdynlink = $HASNATDYNLINK ++let natdynlinkflag = "$NATDYNLINKFLAG" ++let osdeplibs = "$OSDEPLIBS" ++let version = "$VERSION" ++let caml_version = "$CAMLVERSION" ++let date = "$DATE" ++let compile_date = "$COMPILEDATE" ++let vo_magic_number = $VOMAGIC ++let state_magic_number = $STATEMAGIC ++let exec_extension = "$EXE" ++let with_geoproof = ref $with_geoproof ++let browser = "$BROWSER" ++let wwwcoq = "$WWWCOQ" ++let wwwrefman = wwwcoq ^ "distrib/" ^ version ^ "/refman/" ++let wwwstdlib = wwwcoq ^ "distrib/" ^ version ^ "/stdlib/" ++let localwwwrefman = "file://$HTMLREFMANDIR/" ++ ++END_OF_COQ_CONFIG ++ ++# to be sure printf is found on windows when spaces occur in PATH variable ++PRINTF=`which printf` ++ ++# Subdirectories of theories/ added in coq_config.ml ++subdirs () { ++ (cd $1; find * \( -name .svn -prune \) -o \( -type d -exec $PRINTF "\"%s\";\n" {} \; \) >> "$mlconfig_file") ++} ++ ++echo "let theories_dirs = [" >> "$mlconfig_file" ++subdirs theories ++echo "]" >> "$mlconfig_file" ++ ++echo "let plugins_dirs = [" >> "$mlconfig_file" ++subdirs plugins ++echo "]" >> "$mlconfig_file" ++ ++chmod a-w "$mlconfig_file" ++ ++ ++############################################### ++# Building the $COQTOP/config/Makefile file ++############################################### ++ ++rm -f "$config_file" ++ ++sed -e "s|LOCALINSTALLATION|$local|" \ ++ -e "s|XCOQRUNBYTEFLAGS|$COQRUNBYTEFLAGS|" \ ++ -e "s|XCOQTOOLSBYTEFLAGS|$COQTOOLSBYTEFLAGS|" \ ++ -e "s|COQSRCDIRECTORY|$COQSRC|" \ ++ -e "s|COQVERSION|$VERSION|" \ ++ -e "s|BINDIRDIRECTORY|$BINDIR|" \ ++ -e "s|COQLIBDIRECTORY|$LIBDIR|" \ ++ -e "s|BUILDLDPATH=|$BUILDLDPATH|" \ ++ -e "s|MANDIRDIRECTORY|$MANDIR|" \ ++ -e "s|DOCDIRDIRECTORY|$DOCDIR|" \ ++ -e "s|EMACSLIBDIRECTORY|$EMACSLIB|" \ ++ -e "s|EMACSCOMMAND|$EMACS|" \ ++ -e "s|COQDOCDIRECTORY|$COQDOCDIR|" \ ++ -e "s|MKTEXLSRCOMMAND|$MKTEXLSR|" \ ++ -e "s|ARCHITECTURE|$ARCH|" \ ++ -e "s|OSDEPENDENTLIBS|$OSDEPLIBS|" \ ++ -e "s|OSDEPENDENTP4OPTFLAGS|$OSDEPP4OPTFLAGS|" \ ++ -e "s|CAMLLIBDIRECTORY|$CAMLLIB|" \ ++ -e "s|CAMLTAG|$CAMLTAG|" \ ++ -e "s|CAMLP4BINDIRECTORY|$CAMLP4BIN|" \ ++ -e "s|CAMLP4LIBDIRECTORY|$CAMLP4LIB|" \ ++ -e "s|CAMLP4TOOL|$camlp4oexec|" \ ++ -e "s|CAMLP4COMPATFLAGS|$CAMLP4COMPAT|" \ ++ -e "s|LABLGTKINCLUDES|$LABLGTKINCLUDES|" \ ++ -e "s|COQDEBUGFLAGOPT|$coq_debug_flag_opt|" \ ++ -e "s|COQDEBUGFLAG|$coq_debug_flag|" \ ++ -e "s|COQPROFILEFLAG|$coq_profile_flag|" \ ++ -e "s|CAMLANNOTATEFLAG|$coq_annotate_flag|" \ ++ -e "s|CCOMPILEFLAGS|$cflags|" \ ++ -e "s|BESTCOMPILER|$best_compiler|" \ ++ -e "s|DLLEXTENSION|$DLLEXT|" \ ++ -e "s|EXECUTEEXTENSION|$EXE|" \ ++ -e "s|BYTECAMLC|$bytecamlc|" \ ++ -e "s|OCAMLMKLIBEXEC|$ocamlmklibexec|" \ ++ -e "s|NATIVECAMLC|$nativecamlc|" \ ++ -e "s|OCAMLEXEC|$ocamlexec|" \ ++ -e "s|OCAMLDEPEXEC|$ocamldepexec|" \ ++ -e "s|OCAMLDOCEXEC|$ocamldocexec|" \ ++ -e "s|OCAMLLEXEXEC|$ocamllexexec|" \ ++ -e "s|OCAMLYACCEXEC|$ocamlyaccexec|" \ ++ -e "s|CAMLMKTOPEXEC|$ocamlmktopexec|" \ ++ -e "s|CCEXEC|$gcc_exec|" \ ++ -e "s|AREXEC|$ar_exec|" \ ++ -e "s|RANLIBEXEC|$ranlib_exec|" \ ++ -e "s|STRIPCOMMAND|$STRIPCOMMAND|" \ ++ -e "s|COQIDEOPT|$COQIDE|" \ ++ -e "s|CHECKEDOUTSOURCETREE|$checkedout|" \ ++ -e "s|WITHDOCOPT|$with_doc|" \ ++ -e "s|HASNATIVEDYNLINK|$NATDYNLINKFLAG|" \ ++ "$config_template" > "$config_file" ++ ++chmod a-w "$config_file" ++ ++################################################## ++# The end ++#################################################### ++ ++echo "If anything in the above is wrong, please restart './configure'." ++echo ++echo "*Warning* To compile the system for a new architecture" ++echo " don't forget to do a 'make archclean' before './configure'." ++ ++# $Id: configure 14833 2011-12-19 21:57:30Z notin $ diff --git a/pkgs/applications/science/logic/coq/configure.patch b/pkgs/applications/science/logic/coq/configure.patch index 431cccac4b0..aa38ce06e92 100644 --- a/pkgs/applications/science/logic/coq/configure.patch +++ b/pkgs/applications/science/logic/coq/configure.patch @@ -9,1104 +9,3 @@ diff -Nuar coq-8.3pl3-orig/configure coq-8.3pl3/configure esac if test ! -f "$CAMLC" ; then -@@ -628,7 +627,7 @@ - no) LABLGTKLIB=+lablgtk2 # Pour le message - LABLGTKINCLUDES="-I $LABLGTKLIB";; # Pour le makefile - yes) LABLGTKLIB="$lablgtkdir" # Pour le message -- LABLGTKINCLUDES="-I \"$LABLGTKLIB\"";; # Pour le makefile -+ LABLGTKINCLUDES="-I $LABLGTKLIB";; # Pour le makefile - esac;; - no) LABLGTKINCLUDES="";; - esac -diff -Nuar coq-8.3pl3-orig/configure~ coq-8.3pl3/configure~ ---- coq-8.3pl3-orig/configure~ 1970-01-01 01:00:00.000000000 +0100 -+++ coq-8.3pl3/configure~ 2011-12-19 22:57:30.000000000 +0100 -@@ -0,0 +1,1088 @@ -+#!/bin/sh -+ -+################################## -+# -+# Configuration script for Coq -+# -+################################## -+ -+VERSION=8.3pl3 -+VOMAGIC=08300 -+STATEMAGIC=58300 -+DATE=`LANG=C date +"%B %Y"` -+ -+# Create the bin/ directory if non-existent -+test -d bin || mkdir bin -+ -+# a local which command for sh -+which () { -+IFS=":" # set words separator in PATH to be ':' (it allows spaces in dirnames) -+for i in $PATH; do -+ if test -z "$i"; then i=.; fi -+ if [ -f "$i/$1" ] ; then -+ IFS=" " -+ echo "$i/$1" -+ break -+ fi -+done -+} -+ -+usage () { -+ printf "Available options for configure are:\n" -+ echo "-help" -+ printf "\tDisplays this help page\n" -+ echo "-prefix " -+ printf "\tSet installation directory to \n" -+ echo "-local" -+ printf "\tSet installation directory to the current source tree\n" -+ echo "-coqrunbyteflags" -+ printf "\tSet link flags for VM-dependent bytecode (coqtop)\n" -+ echo "-coqtoolsbyteflags" -+ printf "\tSet link flags for VM-independant bytecode (coqdep, coqdoc, ...)\n" -+ echo "-custom" -+ printf "\tGenerate all bytecode executables with -custom (not recommended)\n" -+ echo "-src" -+ printf "\tSpecifies the source directory\n" -+ echo "-bindir" -+ echo "-libdir" -+ echo "-mandir" -+ echo "-docdir" -+ printf "\tSpecifies where to install bin/lib/man/doc files resp.\n" -+ echo "-emacslib" -+ echo "-emacs" -+ printf "\tSpecifies where emacs files are to be installed\n" -+ echo "-coqdocdir" -+ printf "\tSpecifies where Coqdoc style files are to be installed\n" -+ echo "-camldir" -+ printf "\tSpecifies the path to the OCaml library\n" -+ echo "-lablgtkdir" -+ printf "\tSpecifies the path to the Lablgtk library\n" -+ echo "-camlp5dir" -+ printf "\tSpecifies where to look for the Camlp5 library and tells to use it\n" -+ echo "-arch" -+ printf "\tSpecifies the architecture\n" -+ echo "-opt" -+ printf "\tSpecifies whether or not to use OCaml *.opt optimized compilers\n" -+ echo "-natdynlink (yes|no)" -+ printf "\tSpecifies whether or not to use dynamic loading of native code\n" -+ echo "-coqide (opt|byte|no)" -+ printf "\tSpecifies whether or not to compile Coqide\n" -+ echo "-browser " -+ printf "\tUse to open URL %%s\n" -+ echo "-with-doc (yes|no)" -+ printf "\tSpecifies whether or not to compile the documentation\n" -+ echo "-with-geoproof (yes|no)" -+ printf "\tSpecifies whether or not to use Geoproof binding\n" -+ echo "-with-cc " -+ echo "-with-ar " -+ echo "-with-ranlib " -+ printf "\tTells configure where to find gcc/ar/ranlib executables\n" -+ echo "-byte-only" -+ printf "\tCompiles only bytecode version of Coq\n" -+ echo "-debug" -+ printf "\tAdd debugging information in the Coq executables\n" -+ echo "-profile" -+ printf "\tAdd profiling information in the Coq executables\n" -+ echo "-annotate" -+ printf "\tCompiles Coq with -dtypes option\n" -+} -+ -+ -+# Default OCaml binaries -+bytecamlc=ocamlc -+nativecamlc=ocamlopt -+ocamlmklibexec=ocamlmklib -+ocamlexec=ocaml -+ocamldepexec=ocamldep -+ocamldocexec=ocamldoc -+ocamllexexec=ocamllex -+ocamlyaccexec=ocamlyacc -+ocamlmktopexec=ocamlmktop -+camlp4oexec=camlp4o -+ -+ -+coq_debug_flag= -+coq_debug_flag_opt= -+coq_profile_flag= -+coq_annotate_flag= -+best_compiler=opt -+cflags="-fno-defer-pop -Wall -Wno-unused" -+natdynlink=yes -+ -+gcc_exec=gcc -+ar_exec=ar -+ranlib_exec=ranlib -+ -+local=false -+coqrunbyteflags_spec=no -+coqtoolsbyteflags_spec=no -+custom_spec=no -+src_spec=no -+prefix_spec=no -+bindir_spec=no -+libdir_spec=no -+mandir_spec=no -+docdir_spec=no -+emacslib_spec=no -+emacs_spec=no -+camldir_spec=no -+lablgtkdir_spec=no -+coqdocdir_spec=no -+arch_spec=no -+coqide_spec=no -+browser_spec=no -+wwwcoq_spec=no -+with_geoproof=false -+with_doc=all -+with_doc_spec=no -+force_caml_version=no -+force_caml_version_spec=no -+ -+COQSRC=`pwd` -+ -+# Parse command-line arguments -+ -+while : ; do -+ case "$1" in -+ "") break;; -+ -help|--help) usage -+ exit;; -+ -prefix|--prefix) prefix_spec=yes -+ prefix="$2" -+ shift;; -+ -local|--local) local=true;; -+ -coqrunbyteflags|--coqrunbyteflags) coqrunbyteflags_spec=yes -+ coqrunbyteflags="$2" -+ shift;; -+ -coqtoolsbyteflags|--coqtoolsbyteflags) coqtoolsbyteflags_spec=yes -+ coqtoolsbyteflags="$2" -+ shift;; -+ -custom|--custom) custom_spec=yes -+ shift;; -+ -src|--src) src_spec=yes -+ COQSRC="$2" -+ shift;; -+ -bindir|--bindir) bindir_spec=yes -+ bindir="$2" -+ shift;; -+ -libdir|--libdir) libdir_spec=yes -+ libdir="$2" -+ shift;; -+ -mandir|--mandir) mandir_spec=yes -+ mandir="$2" -+ shift;; -+ -docdir|--docdir) docdir_spec=yes -+ docdir="$2" -+ shift;; -+ -emacslib|--emacslib) emacslib_spec=yes -+ emacslib="$2" -+ shift;; -+ -emacs |--emacs) emacs_spec=yes -+ emacs="$2" -+ shift;; -+ -coqdocdir|--coqdocdir) coqdocdir_spec=yes -+ coqdocdir="$2" -+ shift;; -+ -camldir|--camldir) camldir_spec=yes -+ camldir="$2" -+ shift;; -+ -lablgtkdir|--lablgtkdir) lablgtkdir_spec=yes -+ lablgtkdir="$2" -+ shift;; -+ -camlp5dir|--camlp5dir) -+ camlp5dir="$2" -+ shift;; -+ -arch|--arch) arch_spec=yes -+ arch=$2 -+ shift;; -+ -opt|--opt) bytecamlc=ocamlc.opt -+ camlp4oexec=camlp4o # can't add .opt since dyn load'll be required -+ nativecamlc=ocamlopt.opt;; -+ -natdynlink|--natdynlink) case "$2" in -+ yes) natdynlink=yes;; -+ *) natdynlink=no -+ esac -+ shift;; -+ -coqide|--coqide) coqide_spec=yes -+ case "$2" in -+ byte|opt) COQIDE=$2;; -+ *) COQIDE=no -+ esac -+ shift;; -+ -browser|--browser) browser_spec=yes -+ BROWSER=$2 -+ shift;; -+ -coqwebsite|--coqwebsite) wwwcoq_spec=yes -+ WWWCOQ=$2 -+ shift;; -+ -with-doc|--with-doc) with_doc_spec=yes -+ case "$2" in -+ yes|all) with_doc=all;; -+ *) with_doc=no -+ esac -+ shift;; -+ -with-geoproof|--with-geoproof) -+ case "$2" in -+ yes) with_geoproof=true;; -+ no) with_geoproof=false;; -+ esac -+ shift;; -+ -with-cc|-with-gcc|--with-cc|--with-gcc) -+ gcc_spec=yes -+ gcc_exec=$2 -+ shift;; -+ -with-ar|--with-ar) -+ ar_spec=yes -+ ar_exec=$2 -+ shift;; -+ -with-ranlib|--with-ranlib) -+ ranlib_spec=yes -+ ranlib_exec=$2 -+ shift;; -+ -byte-only|-byteonly|--byteonly|--byte-only) best_compiler=byte;; -+ -debug|--debug) coq_debug_flag=-g;; -+ -profile|--profile) coq_profile_flag=-p;; -+ -annotate|--annotate) coq_annotate_flag=-dtypes;; -+ -force-caml-version|--force-caml-version|-force-ocaml-version|--force-ocaml-version) -+ force_caml_version_spec=yes -+ force_caml_version=yes;; -+ *) echo "Unknown option \"$1\"." 1>&2; usage; exit 2;; -+ esac -+ shift -+done -+ -+if [ $prefix_spec = yes -a $local = true ] ; then -+ echo "Options -prefix and -local are incompatible." -+ echo "Configure script failed!" -+ exit 1 -+fi -+ -+# compile date -+DATEPGM=`which date` -+case $DATEPGM in -+ "") echo "I can't find the program \"date\" in your path." -+ echo "Please give me the current date" -+ read COMPILEDATE;; -+ *) COMPILEDATE=`date +"%h %d %Y %H:%M:%S"`;; -+esac -+ -+# Architecture -+ -+case $arch_spec in -+ no) -+ # First we test if we are running a Cygwin system -+ if [ `uname -s | cut -c -6` = "CYGWIN" ] ; then -+ ARCH="win32" -+ else -+ # If not, we determine the architecture -+ if test -x /bin/arch ; then -+ ARCH=`/bin/arch` -+ elif test -x /usr/bin/arch ; then -+ ARCH=`/usr/bin/arch` -+ elif test -x /usr/ucb/arch ; then -+ ARCH=`/usr/ucb/arch` -+ elif test -x /bin/uname ; then -+ ARCH=`/bin/uname -s` -+ elif test -x /usr/bin/uname ; then -+ ARCH=`/usr/bin/uname -s` -+ else -+ echo "I can not automatically find the name of your architecture." -+ printf "%s"\ -+ "Give me a name, please [win32 for Win95, Win98 or WinNT]: " -+ read ARCH -+ fi -+ fi;; -+ yes) ARCH=$arch -+esac -+ -+# executable extension -+ -+case $ARCH in -+ win32) -+ EXE=".exe" -+ DLLEXT=".dll";; -+ *) EXE="" -+ DLLEXT=".so" -+esac -+ -+# Is the source tree checked out from a recognised -+# version control system ? -+if test -e .svn/entries ; then -+ checkedout=svn -+elif [ -d '{arch}' ]; then -+ checkedout=gnuarch -+elif [ -z "${GIT_DIR}" ] && [ -d .git ] || [ -d "${GIT_DIR}" ]; then -+ checkedout=git -+else -+ checkedout=0 -+fi -+ -+# make command -+ -+MAKE=`which make` -+if [ "$MAKE" != "" ]; then -+ MAKEVERSION=`$MAKE -v | head -1 | cut -d" " -f3` -+ MAKEVERSIONMAJOR=`echo $MAKEVERSION | cut -d. -f1` -+ MAKEVERSIONMINOR=`echo $MAKEVERSION | cut -d. -f2` -+ if [ "$MAKEVERSIONMAJOR" -eq 3 -a "$MAKEVERSIONMINOR" -ge 81 ]; then -+ echo "You have GNU Make $MAKEVERSION. Good!" -+ else -+ OK="no" -+ if [ -x ./make ]; then -+ MAKEVERSION=`./make -v | head -1` -+ if [ "$MAKEVERSION" = "GNU Make 3.81" ]; then OK="yes"; fi -+ fi -+ if [ $OK = "no" ]; then -+ echo "GNU Make >= 3.81 is needed." -+ echo "Make 3.81 can be downloaded from ftp://ftp.gnu.org/gnu/make/make-3.81.tar.gz" -+ echo "then locally installed on a Unix-style system by issuing:" -+ echo " tar xzvf make-3.81.tar.gz" -+ echo " cd make-3.81" -+ echo " ./configure" -+ echo " make" -+ echo " mv make .." -+ echo " cd .." -+ echo "Restart then the configure script and later use ./make instead of make." -+ exit 1 -+ else -+ echo "You have locally installed GNU Make 3.81. Good!" -+ fi -+ fi -+else -+ echo "Cannot find GNU Make >= 3.81." -+fi -+ -+# Browser command -+ -+if [ "$browser_spec" = "no" ]; then -+ case $ARCH in -+ win32) BROWSER='C:\PROGRA~1\INTERN~1\IEXPLORE %s' ;; -+ *) BROWSER='firefox -remote "OpenURL(%s,new-tab)" || firefox %s &' ;; -+ esac -+fi -+ -+if [ "$wwwcoq_spec" = "no" ]; then -+ WWWCOQ="http://coq.inria.fr/" -+fi -+ -+######################################### -+# Objective Caml programs -+ -+case $camldir_spec in -+ no) CAMLC=`which $bytecamlc` -+ case "$CAMLC" in -+ "") echo "$bytecamlc is not present in your path!" -+ echo "Give me manually the path to the $bytecamlc executable [/usr/local/bin by default]: " -+ read CAMLC -+ -+ case "$CAMLC" in -+ "") CAMLC=/usr/local/bin/$bytecamlc;; -+ */ocamlc|*/ocamlc.opt) true;; -+ */) CAMLC="${CAMLC}"$bytecamlc;; -+ *) CAMLC="${CAMLC}"/$bytecamlc;; -+ esac -+ esac -+ CAMLBIN=`dirname "$CAMLC"`;; -+ yes) CAMLC=$camldir/$bytecamlc -+ -+ CAMLBIN=`dirname "$CAMLC"` -+ bytecamlc="$CAMLC" -+ nativecamlc=$CAMLBIN/$nativecamlc -+ ocamlexec=$CAMLBIN/ocaml -+ ocamldepexec=$CAMLBIN/ocamldep -+ ocamldocexec=$CAMLBIN/ocamldoc -+ ocamllexexec=$CAMLBIN/ocamllex -+ ocamlyaccexec=$CAMLBIN/ocamlyacc -+ ocamlmktopexec=$CAMLBIN/ocamlmktop -+ ocamlmklibexec=$CAMLBIN/ocamlmklib -+ camlp4oexec=$CAMLBIN/camlp4o -+esac -+ -+if test ! -f "$CAMLC" ; then -+ echo "I can not find the executable '$CAMLC'. Have you installed it?" -+ echo "Configuration script failed!" -+ exit 1 -+fi -+ -+# Under Windows, OCaml only understands Windows filenames (C:\...) -+case $ARCH in -+ win32) CAMLBIN=`cygpath -m ${CAMLBIN}`;; -+esac -+ -+CAMLVERSION=`"$bytecamlc" -version` -+ -+case $CAMLVERSION in -+ 1.*|2.*|3.00|3.01|3.02|3.03|3.03alpha|3.04|3.05beta|3.05|3.06|3.07*|3.08*|3.09*) -+ echo "Your version of Objective-Caml is $CAMLVERSION." -+ if [ "$force_caml_version" = "yes" ]; then -+ echo "*Warning* You are compiling Coq with an outdated version of Objective-Caml." -+ else -+ echo " You need Objective-Caml 3.10.2 or later." -+ echo " Configuration script failed!" -+ exit 1 -+ fi;; -+ ?*) -+ CAMLP4COMPAT="-loc loc" -+ echo "You have Objective-Caml $CAMLVERSION. Good!";; -+ *) -+ echo "I found the Objective-Caml compiler but cannot find its version number!" -+ echo "Is it installed properly?" -+ echo "Configuration script failed!" -+ exit 1;; -+esac -+ -+CAMLTAG=OCAML`echo $CAMLVERSION | sed -e "s/\([1-9]\)\.\([0-9]*\).*/\1\2/g"` -+ -+# For coqmktop & bytecode compiler -+ -+case $ARCH in -+ win32) # Awfull trick to get around a ^M problem at the end of CAMLLIB -+ CAMLLIB=`"$CAMLC" -where | sed -e 's/^\(.*\)$/\1/'` ;; -+ *) -+ CAMLLIB=`"$CAMLC" -where` -+esac -+ -+if [ "$coq_debug_flag" = "-g" ]; then -+ case $CAMLTAG in -+ OCAML31*) -+ # Compilation debug flag -+ coq_debug_flag_opt="-g" -+ ;; -+ esac -+fi -+ -+# Native dynlink -+if [ "$natdynlink" = "yes" -a -f `"$CAMLC" -where`/dynlink.cmxa ]; then -+ HASNATDYNLINK=true -+else -+ HASNATDYNLINK=false -+fi -+ -+case $HASNATDYNLINK,`uname -s`,`uname -r`,$CAMLVERSION in -+ true,Darwin,9.*,3.11.*) # ocaml 3.11.0 dynlink on MacOS 10.5 is buggy -+ NATDYNLINKFLAG=os5fixme;; -+ #Possibly a problem on 10.6.0/10.6.1/10.6.2 -+ #May just be a 32 vs 64 problem for all 10.6.* -+ true,Darwin,10.0.*,3.11.*) # Possibly a problem on 10.6.0 -+ NATDYNLINKFLAG=os5fixme;; -+ true,Darwin,10.1.*,3.11.*) # Possibly a problem on 10.6.1 -+ NATDYNLINKFLAG=os5fixme;; -+ true,Darwin,10.2.*,3.11.*) # Possibly a problem on 10.6.2 -+ NATDYNLINKFLAG=os5fixme;; -+ true,Darwin,10.*,3.11.*) -+ if [ `getconf LONG_BIT` = "32" ]; then -+ # Still a problem for x86_32 -+ NATDYNLINKFLAG=os5fixme -+ else -+ # Not a problem for x86_64 -+ NATDYNLINKFLAG=$HASNATDYNLINK -+ fi;; -+ *) -+ NATDYNLINKFLAG=$HASNATDYNLINK;; -+esac -+ -+# Camlp4 / Camlp5 configuration -+ -+if [ "$camlp5dir" != "" ]; then -+ CAMLP4=camlp5 -+ CAMLP4LIB=$camlp5dir -+ if [ ! -f $camlp5dir/camlp5.cma ]; then -+ echo "Cannot find camlp5 libraries in $camlp5dir (camlp5.cma not found)." -+ echo "Configuration script failed!" -+ exit 1 -+ fi -+ camlp4oexec=`echo $camlp4oexec | sed -e 's/4/5/'` -+else -+ case $CAMLTAG in -+ OCAML31*) -+ if [ -x "${CAMLLIB}/camlp5" ]; then -+ CAMLP4LIB=+camlp5 -+ elif [ -x "${CAMLLIB}/site-lib/camlp5" ]; then -+ CAMLP4LIB=+site-lib/camlp5 -+ else -+ echo "Objective Caml $CAMLVERSION found but no Camlp5 installed." -+ echo "Configuration script failed!" -+ exit 1 -+ fi -+ CAMLP4=camlp5 -+ camlp4oexec=`echo $camlp4oexec | sed -e 's/4/5/'` -+ ;; -+ *) -+ CAMLP4=camlp4 -+ CAMLP4LIB=+camlp4 -+ ;; -+ esac -+fi -+ -+if [ "$CAMLP4" = "camlp5" ] && `$camlp4oexec -v 2>&1 | grep -q 5.00`; then -+ echo "Camlp5 version 5.00 not supported: versions 4.0x or >= 5.01 are OK" -+ echo "(depending also on your ocaml version)." -+ echo "Configuration script failed!" -+ exit 1 -+fi -+ -+ -+case $CAMLP4LIB in -+ +*) FULLCAMLP4LIB=$CAMLLIB/`echo $CAMLP4LIB | cut -b 2-`;; -+ *) FULLCAMLP4LIB=$CAMLP4LIB;; -+esac -+ -+# Assume that camlp(4|5) binaries are at the same place as ocaml ones -+# (this should become configurable some day) -+CAMLP4BIN=${CAMLBIN} -+ -+# do we have a native compiler: test of ocamlopt and its version -+ -+if [ "$best_compiler" = "opt" ] ; then -+ if test -e "$nativecamlc" || test -e "`which $nativecamlc`"; then -+ CAMLOPTVERSION=`"$nativecamlc" -v | sed -n -e 's|.*version* *\(.*\)$|\1|p' ` -+ if [ "`uname -s`" = "Darwin" -a "$ARCH" = "i386" ]; then -+ case $CAMLOPTVERSION in -+ 3.09.3|3.1?*) ;; -+ *) echo "Native compilation on MacOS X Pentium requires Objective-Caml >= 3.09.3," -+ best_compiler=byte -+ echo "only the bytecode version of Coq will be available." -+ esac -+ elif [ ! -f $FULLCAMLP4LIB/gramlib.cmxa ]; then -+ best_compiler=byte -+ echo "Cannot find native-code $CAMLP4," -+ echo "only the bytecode version of Coq will be available." -+ else -+ if [ "$CAMLOPTVERSION" != "$CAMLVERSION" ] ; then -+ echo "Native and bytecode compilers do not have the same version!" -+ fi -+ echo "You have native-code compilation. Good!" -+ fi -+ else -+ best_compiler=byte -+ echo "You have only bytecode compilation." -+ fi -+fi -+ -+# OS dependent libraries -+ -+case $ARCH in -+ sun4*) OS=`uname -r` -+ case $OS in -+ 5*) OS="Sun Solaris $OS" -+ OSDEPLIBS="-cclib -lunix -cclib -lnsl -cclib -lsocket";; -+ *) OS="Sun OS $OS" -+ OSDEPLIBS="-cclib -lunix" -+ esac;; -+ alpha) OSDEPLIBS="-cclib -lunix";; -+ win32) OS="Win32" -+ OSDEPLIBS="-cclib -lunix" -+ cflags="-mno-cygwin $cflags";; -+ *) OSDEPLIBS="-cclib -lunix" -+esac -+ -+# lablgtk2 and CoqIDE -+ -+# -byte-only should imply -coqide byte, unless the user decides otherwise -+ -+if [ "$best_compiler" = "byte" -a "$coqide_spec" = "no" ]; then -+ coqide_spec=yes -+ COQIDE=byte -+fi -+ -+# Which coqide is asked ? which one is possible ? -+ -+if [ "$coqide_spec" = "yes" -a "$COQIDE" = "no" ]; then -+ echo "CoqIde disabled as requested." -+else -+ case $lablgtkdir_spec in -+ no) -+ if [ -f "${CAMLLIB}/lablgtk2/glib.mli" ]; then -+ lablgtkdir=${CAMLLIB}/lablgtk2 -+ elif [ -f "${CAMLLIB}/site-lib/lablgtk2/glib.mli" ]; then -+ lablgtkdir=${CAMLLIB}/site-lib/lablgtk2 -+ fi;; -+ yes) -+ if [ ! -f "$lablgtkdir/glib.mli" ]; then -+ echo "Incorrect LablGtk2 library (glib.mli not found)." -+ echo "Configuration script failed!" -+ exit 1 -+ fi;; -+ esac -+ if [ "$lablgtkdir" = "" ]; then -+ echo "LablGtk2 not found: CoqIde will not be available." -+ COQIDE=no -+ elif [ -z "`grep -w convert_with_fallback "$lablgtkdir/glib.mli"`" ]; then -+ echo "LablGtk2 found but too old: CoqIde will not be available." -+ COQIDE=no; -+ elif [ "$coqide_spec" = "yes" -a "$COQIDE" = "byte" ]; then -+ echo "LablGtk2 found, bytecode CoqIde will be used as requested." -+ COQIDE=byte -+ elif [ ! -f "${CAMLLIB}/threads/threads.cmxa" ]; then -+ echo "LablGtk2 found, no native threads: bytecode CoqIde will be available." -+ COQIDE=byte -+ else -+ echo "LablGtk2 found, native threads: native CoqIde will be available." -+ COQIDE=opt -+ fi -+fi -+ -+case $COQIDE in -+ byte|opt) -+ case $lablgtkdir_spec in -+ no) LABLGTKLIB=+lablgtk2 # Pour le message -+ LABLGTKINCLUDES="-I $LABLGTKLIB";; # Pour le makefile -+ yes) LABLGTKLIB="$lablgtkdir" # Pour le message -+ LABLGTKINCLUDES="-I \"$LABLGTKLIB\"";; # Pour le makefile -+ esac;; -+ no) LABLGTKINCLUDES="";; -+esac -+ -+# strip command -+ -+case $ARCH in -+ win32) -+ # true -> strip : it exists under cygwin ! -+ STRIPCOMMAND="strip";; -+ *) -+ if [ "$coq_profile_flag" = "-p" ] || [ "$coq_debug_flag" = "-g" ] || -+ [ "`uname -s`" = "Darwin" -a "$HASNATDYNLINK" = "true" ] -+ then -+ STRIPCOMMAND="true" -+ else -+ STRIPCOMMAND="strip" -+ fi -+esac -+ -+# mktexlsr -+#MKTEXLSR=`which mktexlsr` -+#case $MKTEXLSR in -+# "") MKTEXLSR=true;; -+#esac -+ -+# " -+### Test if documentation can be compiled (latex, hevea) -+ -+if test "$with_doc" = "all" -+then -+ for cmd in "latex" "hevea" ; do -+ if test ! -x "`which $cmd`" -+ then -+ echo "$cmd was not found; documentation will not be available" -+ with_doc=no -+ break -+ fi -+ done -+fi -+ -+########################################### -+# bindir, libdir, mandir, docdir, etc. -+ -+case $src_spec in -+ no) COQTOP=${COQSRC} -+esac -+ -+# OCaml only understand Windows filenames (C:\...) -+case $ARCH in -+ win32) COQTOP=`cygpath -m ${COQTOP}` -+esac -+ -+case $ARCH in -+ win32) -+ bindir_def='C:\coq\bin' -+ libdir_def='C:\coq\lib' -+ mandir_def='C:\coq\man' -+ docdir_def='C:\coq\doc' -+ emacslib_def='C:\coq\emacs' -+ coqdocdir_def='C:\coq\latex';; -+ *) -+ bindir_def=/usr/local/bin -+ libdir_def=/usr/local/lib/coq -+ mandir_def=/usr/local/man -+ docdir_def=/usr/local/share/doc/coq -+ emacslib_def=/usr/local/share/emacs/site-lisp -+ coqdocdir_def=/usr/local/share/texmf/tex/latex/misc;; -+esac -+ -+emacs_def=emacs -+ -+case $bindir_spec/$prefix_spec/$local in -+ yes/*/*) BINDIR=$bindir ;; -+ */yes/*) BINDIR=$prefix/bin ;; -+ */*/true) BINDIR=$COQTOP/bin ;; -+ *) printf "Where should I install the Coq binaries [$bindir_def]? " -+ read BINDIR -+ case $BINDIR in -+ "") BINDIR=$bindir_def;; -+ *) true;; -+ esac;; -+esac -+ -+case $libdir_spec/$prefix_spec/$local in -+ yes/*/*) LIBDIR=$libdir;; -+ */yes/*) -+ case $ARCH in -+ win32) LIBDIR=$prefix ;; -+ *) LIBDIR=$prefix/lib/coq ;; -+ esac ;; -+ */*/true) LIBDIR=$COQTOP ;; -+ *) printf "Where should I install the Coq library [$libdir_def]? " -+ read LIBDIR -+ case $LIBDIR in -+ "") LIBDIR=$libdir_def;; -+ *) true;; -+ esac;; -+esac -+ -+case $mandir_spec/$prefix_spec/$local in -+ yes/*/*) MANDIR=$mandir;; -+ */yes/*) MANDIR=$prefix/man ;; -+ */*/true) MANDIR=$COQTOP/man ;; -+ *) printf "Where should I install the Coq man pages [$mandir_def]? " -+ read MANDIR -+ case $MANDIR in -+ "") MANDIR=$mandir_def;; -+ *) true;; -+ esac;; -+esac -+ -+case $docdir_spec/$prefix_spec/$local in -+ yes/*/*) DOCDIR=$docdir; HTMLREFMANDIR=$DOCDIR/html/refman;; -+ */yes/*) DOCDIR=$prefix/share/doc/coq; HTMLREFMANDIR=$DOCDIR/html/refman;; -+ */*/true) DOCDIR=$COQTOP/doc; HTMLREFMANDIR=$DOCDIR/refman/html;; -+ *) printf "Where should I install the Coq documentation [$docdir_def]? " -+ read DOCDIR -+ case $DOCDIR in -+ "") DOCDIR=$docdir_def; HTMLREFMANDIR=$DOCDIR/html/refman;; -+ *) true;; -+ esac;; -+esac -+ -+case $emacslib_spec/$prefix_spec/$local in -+ yes/*/*) EMACSLIB=$emacslib;; -+ */yes/*) -+ case $ARCH in -+ win32) EMACSLIB=$prefix/emacs ;; -+ *) EMACSLIB=$prefix/share/emacs/site-lisp ;; -+ esac ;; -+ */*/true) EMACSLIB=$COQTOP/tools/emacs ;; -+ *) printf "Where should I install the Coq Emacs mode [$emacslib_def]? " -+ read EMACSLIB -+ case $EMACSLIB in -+ "") EMACSLIB=$emacslib_def;; -+ *) true;; -+ esac;; -+esac -+ -+case $coqdocdir_spec/$prefix_spec/$local in -+ yes/*/*) COQDOCDIR=$coqdocdir;; -+ */yes/*) -+ case $ARCH in -+ win32) COQDOCDIR=$prefix/latex ;; -+ *) COQDOCDIR=$prefix/share/emacs/site-lisp ;; -+ esac ;; -+ */*/true) COQDOCDIR=$COQTOP/tools/coqdoc ;; -+ *) printf "Where should I install Coqdoc TeX/LaTeX files [$coqdocdir_def]? " -+ read COQDOCDIR -+ case $COQDOCDIR in -+ "") COQDOCDIR=$coqdocdir_def;; -+ *) true;; -+ esac;; -+esac -+ -+# Determine if we enable -custom by default (Windows and MacOS) -+CUSTOM_OS=no -+if [ "$ARCH" = "win32" ] || [ "`uname -s`" = "Darwin" ]; then -+ CUSTOM_OS=yes -+fi -+ -+BUILDLDPATH="# you might want to set CAML_LD_LIBRARY_PATH by hand!" -+case $coqrunbyteflags_spec/$local/$custom_spec/$CUSTOM_OS in -+ yes/*/*/*) COQRUNBYTEFLAGS="$coqrunbyteflags";; -+ */*/yes/*|*/*/*/yes) COQRUNBYTEFLAGS="-custom";; -+ */true/*/*) COQRUNBYTEFLAGS="-dllib -lcoqrun -dllpath '$COQTOP'/kernel/byterun";; -+ *) -+ COQRUNBYTEFLAGS="-dllib -lcoqrun -dllpath '$LIBDIR'" -+ BUILDLDPATH="export CAML_LD_LIBRARY_PATH='$COQTOP'/kernel/byterun";; -+esac -+case $coqtoolsbyteflags_spec/$custom_spec/$CUSTOM_OS in -+ yes/*/*) COQTOOLSBYTEFLAGS="$coqtoolsbyteflags";; -+ */yes/*|*/*/yes) COQTOOLSBYTEFLAGS="-custom";; -+ *) COQTOOLSBYTEFLAGS="";; -+esac -+ -+# case $emacs_spec in -+# no) printf "Which Emacs command should I use to compile coq.el [$emacs_def]? " -+# read EMACS -+ -+# case $EMACS in -+# "") EMACS=$emacs_def;; -+# *) true;; -+# esac;; -+# yes) EMACS=$emacs;; -+# esac -+ -+ -+ -+########################################### -+# Summary of the configuration -+ -+echo "" -+echo " Coq top directory : $COQTOP" -+echo " Architecture : $ARCH" -+if test ! -z "$OS" ; then -+ echo " Operating system : $OS" -+fi -+echo " Coq VM bytecode link flags : $COQRUNBYTEFLAGS" -+echo " Coq tools bytecode link flags : $COQTOOLSBYTEFLAGS" -+echo " OS dependent libraries : $OSDEPLIBS" -+echo " Objective-Caml/Camlp4 version : $CAMLVERSION" -+echo " Objective-Caml/Camlp4 binaries in : $CAMLBIN" -+echo " Objective-Caml library in : $CAMLLIB" -+echo " Camlp4 library in : $CAMLP4LIB" -+if test "$best_compiler" = opt ; then -+echo " Native dynamic link support : $HASNATDYNLINK" -+fi -+if test "$COQIDE" != "no"; then -+echo " Lablgtk2 library in : $LABLGTKLIB" -+fi -+if test "$with_doc" = "all"; then -+echo " Documentation : All" -+else -+echo " Documentation : None" -+fi -+echo " CoqIde : $COQIDE" -+echo " Web browser : $BROWSER" -+echo " Coq web site : $WWWCOQ" -+echo "" -+ -+echo " Paths for true installation:" -+echo " binaries will be copied in $BINDIR" -+echo " library will be copied in $LIBDIR" -+echo " man pages will be copied in $MANDIR" -+echo " documentation will be copied in $DOCDIR" -+echo " emacs mode will be copied in $EMACSLIB" -+echo "" -+ -+################################################## -+# Building the $COQTOP/dev/ocamldebug-coq file -+################################################## -+ -+OCAMLDEBUGCOQ=$COQSRC/dev/ocamldebug-coq -+ -+if test "$coq_debug_flag" = "-g" ; then -+ rm -f $OCAMLDEBUGCOQ -+ sed -e "s|COQTOPDIRECTORY|$COQTOP|" \ -+ -e "s|COQLIBDIRECTORY|$LIBDIR|" \ -+ -e "s|CAMLBINDIRECTORY|$CAMLBIN|" \ -+ -e "s|CAMLP4LIBDIRECTORY|$FULLCAMLP4LIB|"\ -+ $OCAMLDEBUGCOQ.template > $OCAMLDEBUGCOQ -+ chmod a-w,a+x $OCAMLDEBUGCOQ -+fi -+ -+#################################################### -+# Fixing lablgtk types (before/after 2.6.0) -+#################################################### -+ -+if [ ! "$COQIDE" = "no" ]; then -+ if grep "class view " "$lablgtkdir/gText.mli" | grep -q "\[>" ; then -+ if grep -q "?accepts_tab:bool" "$lablgtkdir/gText.mli" ; then -+ cp -f ide/undo_lablgtk_ge212.mli ide/undo.mli -+ else -+ cp -f ide/undo_lablgtk_ge26.mli ide/undo.mli -+ fi -+ else -+ cp -f ide/undo_lablgtk_lt26.mli ide/undo.mli -+ fi -+fi -+ -+############################################## -+# Creation of configuration files -+############################################## -+ -+mlconfig_file="$COQSRC/config/coq_config.ml" -+config_file="$COQSRC/config/Makefile" -+config_template="$COQSRC/config/Makefile.template" -+ -+ -+### Warning !! -+### After this line, be careful when using variables, -+### since some of them (e.g. $COQSRC) will be escaped -+ -+ -+# An escaped version of a variable -+escape_var () { -+"$ocamlexec" 2>&1 1>/dev/null < $mlconfig_file -+(* DO NOT EDIT THIS FILE: automatically generated by ../configure *) -+ -+let local = $local -+let coqrunbyteflags = "$COQRUNBYTEFLAGS" -+let coqlib = "$LIBDIR" -+let coqsrc = "$COQSRC" -+let ocaml = "$ocamlexec" -+let ocamlc = "$bytecamlc" -+let ocamlopt = "$nativecamlc" -+let ocamlmklib = "$ocamlmklibexec" -+let ocamldep = "$ocamldepexec" -+let ocamldoc = "$ocamldocexec" -+let ocamlyacc = "$ocamlyaccexec" -+let ocamllex = "$ocamllexexec" -+let camlbin = "$CAMLBIN" -+let camllib = "$CAMLLIB" -+let camlp4 = "$CAMLP4" -+let camlp4o = "$camlp4oexec" -+let camlp4bin = "$CAMLP4BIN" -+let camlp4lib = "$CAMLP4LIB" -+let camlp4compat = "$CAMLP4COMPAT" -+let coqideincl = "$LABLGTKINCLUDES" -+let cflags = "$cflags" -+let best = "$best_compiler" -+let arch = "$ARCH" -+let has_coqide = "$COQIDE" -+let has_natdynlink = $HASNATDYNLINK -+let natdynlinkflag = "$NATDYNLINKFLAG" -+let osdeplibs = "$OSDEPLIBS" -+let version = "$VERSION" -+let caml_version = "$CAMLVERSION" -+let date = "$DATE" -+let compile_date = "$COMPILEDATE" -+let vo_magic_number = $VOMAGIC -+let state_magic_number = $STATEMAGIC -+let exec_extension = "$EXE" -+let with_geoproof = ref $with_geoproof -+let browser = "$BROWSER" -+let wwwcoq = "$WWWCOQ" -+let wwwrefman = wwwcoq ^ "distrib/" ^ version ^ "/refman/" -+let wwwstdlib = wwwcoq ^ "distrib/" ^ version ^ "/stdlib/" -+let localwwwrefman = "file://$HTMLREFMANDIR/" -+ -+END_OF_COQ_CONFIG -+ -+# to be sure printf is found on windows when spaces occur in PATH variable -+PRINTF=`which printf` -+ -+# Subdirectories of theories/ added in coq_config.ml -+subdirs () { -+ (cd $1; find * \( -name .svn -prune \) -o \( -type d -exec $PRINTF "\"%s\";\n" {} \; \) >> "$mlconfig_file") -+} -+ -+echo "let theories_dirs = [" >> "$mlconfig_file" -+subdirs theories -+echo "]" >> "$mlconfig_file" -+ -+echo "let plugins_dirs = [" >> "$mlconfig_file" -+subdirs plugins -+echo "]" >> "$mlconfig_file" -+ -+chmod a-w "$mlconfig_file" -+ -+ -+############################################### -+# Building the $COQTOP/config/Makefile file -+############################################### -+ -+rm -f "$config_file" -+ -+sed -e "s|LOCALINSTALLATION|$local|" \ -+ -e "s|XCOQRUNBYTEFLAGS|$COQRUNBYTEFLAGS|" \ -+ -e "s|XCOQTOOLSBYTEFLAGS|$COQTOOLSBYTEFLAGS|" \ -+ -e "s|COQSRCDIRECTORY|$COQSRC|" \ -+ -e "s|COQVERSION|$VERSION|" \ -+ -e "s|BINDIRDIRECTORY|$BINDIR|" \ -+ -e "s|COQLIBDIRECTORY|$LIBDIR|" \ -+ -e "s|BUILDLDPATH=|$BUILDLDPATH|" \ -+ -e "s|MANDIRDIRECTORY|$MANDIR|" \ -+ -e "s|DOCDIRDIRECTORY|$DOCDIR|" \ -+ -e "s|EMACSLIBDIRECTORY|$EMACSLIB|" \ -+ -e "s|EMACSCOMMAND|$EMACS|" \ -+ -e "s|COQDOCDIRECTORY|$COQDOCDIR|" \ -+ -e "s|MKTEXLSRCOMMAND|$MKTEXLSR|" \ -+ -e "s|ARCHITECTURE|$ARCH|" \ -+ -e "s|OSDEPENDENTLIBS|$OSDEPLIBS|" \ -+ -e "s|OSDEPENDENTP4OPTFLAGS|$OSDEPP4OPTFLAGS|" \ -+ -e "s|CAMLLIBDIRECTORY|$CAMLLIB|" \ -+ -e "s|CAMLTAG|$CAMLTAG|" \ -+ -e "s|CAMLP4BINDIRECTORY|$CAMLP4BIN|" \ -+ -e "s|CAMLP4LIBDIRECTORY|$CAMLP4LIB|" \ -+ -e "s|CAMLP4TOOL|$camlp4oexec|" \ -+ -e "s|CAMLP4COMPATFLAGS|$CAMLP4COMPAT|" \ -+ -e "s|LABLGTKINCLUDES|$LABLGTKINCLUDES|" \ -+ -e "s|COQDEBUGFLAGOPT|$coq_debug_flag_opt|" \ -+ -e "s|COQDEBUGFLAG|$coq_debug_flag|" \ -+ -e "s|COQPROFILEFLAG|$coq_profile_flag|" \ -+ -e "s|CAMLANNOTATEFLAG|$coq_annotate_flag|" \ -+ -e "s|CCOMPILEFLAGS|$cflags|" \ -+ -e "s|BESTCOMPILER|$best_compiler|" \ -+ -e "s|DLLEXTENSION|$DLLEXT|" \ -+ -e "s|EXECUTEEXTENSION|$EXE|" \ -+ -e "s|BYTECAMLC|$bytecamlc|" \ -+ -e "s|OCAMLMKLIBEXEC|$ocamlmklibexec|" \ -+ -e "s|NATIVECAMLC|$nativecamlc|" \ -+ -e "s|OCAMLEXEC|$ocamlexec|" \ -+ -e "s|OCAMLDEPEXEC|$ocamldepexec|" \ -+ -e "s|OCAMLDOCEXEC|$ocamldocexec|" \ -+ -e "s|OCAMLLEXEXEC|$ocamllexexec|" \ -+ -e "s|OCAMLYACCEXEC|$ocamlyaccexec|" \ -+ -e "s|CAMLMKTOPEXEC|$ocamlmktopexec|" \ -+ -e "s|CCEXEC|$gcc_exec|" \ -+ -e "s|AREXEC|$ar_exec|" \ -+ -e "s|RANLIBEXEC|$ranlib_exec|" \ -+ -e "s|STRIPCOMMAND|$STRIPCOMMAND|" \ -+ -e "s|COQIDEOPT|$COQIDE|" \ -+ -e "s|CHECKEDOUTSOURCETREE|$checkedout|" \ -+ -e "s|WITHDOCOPT|$with_doc|" \ -+ -e "s|HASNATIVEDYNLINK|$NATDYNLINKFLAG|" \ -+ "$config_template" > "$config_file" -+ -+chmod a-w "$config_file" -+ -+################################################## -+# The end -+#################################################### -+ -+echo "If anything in the above is wrong, please restart './configure'." -+echo -+echo "*Warning* To compile the system for a new architecture" -+echo " don't forget to do a 'make archclean' before './configure'." -+ -+# $Id: configure 14833 2011-12-19 21:57:30Z notin $ diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index bf759a4a326..9596c30ee6a 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -1,15 +1,13 @@ # - coqide compilation can be disabled by setting lablgtk to null; -{stdenv, fetchurl, ocaml, findlib, camlp5, ncurses, lablgtk ? null}: +{stdenv, fetchurl, pkgconfig, ocaml, findlib, camlp5, ncurses, lablgtk ? null}: let - version = "8.3pl4"; + version = "8.4"; buildIde = lablgtk != null; ideFlags = if buildIde then "-lablgtkdir ${lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else ""; - idePatch = if buildIde then '' - substituteInPlace scripts/coqmktop.ml --replace \ - "\"-I\"; \"+lablgtk2\"" \ - "\"-I\"; \"$(echo "${lablgtk}"/lib/ocaml/*/site-lib/lablgtk2)\"; \"-I\"; \"$(echo "${lablgtk}"/lib/ocaml/*/site-lib/stublibs)\"" + idePath = if buildIde then '' + CAML_LD_LIBRARY_PATH=${lablgtk}/lib/ocaml/3.12.1/site-lib/stublibs '' else ""; in @@ -17,24 +15,11 @@ stdenv.mkDerivation { name = "coq-${version}"; src = fetchurl { - url = "http://coq.inria.fr/V${version}/files/coq-${version}.tar.gz"; - sha256 = "17d3lmchmqir1rawnr52g78srg4wkd7clzpzfsivxc4y1zp6rwkr"; + url = "http://pauillac.inria.fr/~herbelin/coq/distrib/V${version}/files/coq-${version}.tar.gz"; + sha256 = "0ka2lak9il4hlblk461awf0hbi3mxqhc1wz6kllxradyy2vfaspl"; }; - buildInputs = [ ocaml findlib camlp5 ncurses lablgtk ]; - - prefixKey = "-prefix "; - - preConfigure = '' - configureFlagsArray=( - -opt - -camldir ${ocaml}/bin - -camlp5dir $(ocamlfind query camlp5) - ${ideFlags} - ) - ''; - - buildFlags = "world"; # Debug with "world VERBOSE=1"; + buildInputs = [ pkgconfig ocaml findlib camlp5 ncurses lablgtk ]; patches = [ ./configure.patch ]; @@ -43,16 +28,21 @@ stdenv.mkDerivation { RM=$(type -tp rm) substituteInPlace configure --replace "/bin/uname" "$UNAME" substituteInPlace tools/beautify-archive --replace "/bin/rm" "$RM" - ${idePatch} ''; - # This post install step is needed to build ssrcoqide from the ssreflect package - # It could be made optional, but I see little harm in including it in the default - # distribution -- roconnor - # This will likely no longer be necessary for coq >= 8.4. -- roconnor - postInstall = if buildIde then '' - cp ide/*.cmi ide/ide.*a $out/lib/coq/ide/ - '' else ""; + preConfigure = '' + buildFlagsArray=(${idePath}) + configureFlagsArray=( + -opt + -camldir ${ocaml}/bin + -camlp5dir $(ocamlfind query camlp5) + ${ideFlags} + ) + ''; + + prefixKey = "-prefix "; + + buildFlags = "revision coq coqide"; meta = { description = "Coq proof assistant"; diff --git a/pkgs/applications/science/logic/isabelle/default.nix b/pkgs/applications/science/logic/isabelle/default.nix index 4a268cac645..bbc868910f5 100644 --- a/pkgs/applications/science/logic/isabelle/default.nix +++ b/pkgs/applications/science/logic/isabelle/default.nix @@ -2,9 +2,7 @@ # nettools needed for hostname let - pname = "Isabelle"; - version = "2011"; - name = "${pname}${version}"; + name = "Isabelle2012"; theories = ["HOL" "FOL" "ZF"]; in @@ -12,8 +10,8 @@ stdenv.mkDerivation { inherit name theories; src = fetchurl { - url = http://isabelle.in.tum.de/website-Isabelle2011/dist/Isabelle2011.tar.gz; - sha256 = "ea85eb2a859891be387f020b2e45f8c9a0bd1d8bbc3902f28a429e9c61cb0b6a"; + url = http://www.cl.cam.ac.uk/research/hvg/isabelle/dist/Isabelle2012.tar.gz; + sha256 = "1w2k5cg0d9hyigax0hwp6d84jnylb13ysk4x5kwl2412xryravxq"; }; buildInputs = [ perl polyml nettools ]; diff --git a/pkgs/applications/science/logic/ssreflect/default.nix b/pkgs/applications/science/logic/ssreflect/default.nix index c554b5dcea1..764954f54f8 100644 --- a/pkgs/applications/science/logic/ssreflect/default.nix +++ b/pkgs/applications/science/logic/ssreflect/default.nix @@ -6,7 +6,7 @@ let pname = "ssreflect"; - version = "1.3pl4"; + version = "1.4"; name = "${pname}-${version}"; webpage = http://www.msr-inria.inria.fr/Projects/math-components; in @@ -15,22 +15,16 @@ stdenv.mkDerivation { inherit name; src = fetchurl { - url = "${webpage}/${name}.tar.gz"; - sha256 = "1ha3iiqq79pgll5ra9z0xdi3d3dr3wb9f5vsm4amy884l5anva02"; + url = "${webpage}/${name}-coq8.4.tar.gz"; + sha256 = "1ysx29xw09i86lq0d92z9cnyx133jfgq4qddy3501000fn7xwi7h"; }; buildInputs = [ ocaml camlp5 coq makeWrapper ]; patches = [ ./static.patch ]; - postBuild = '' - cd src - coqmktop -ide -opt ssreflect.cmx -o ../bin/ssrcoqide - cd .. - ''; - installPhase = '' - COQLIB=$out/lib/coq make -f Makefile.coq install -e + COQLIB=$out/lib/coq/ make -f Makefile.coq install -e mkdir -p $out/bin cp bin/* $out/bin for i in $out/bin/*; do @@ -39,6 +33,7 @@ stdenv.mkDerivation { --add-flags "$out/lib/coq/user-contrib/Ssreflect" \ --add-flags "Ssreflect" done + makeWrapper "${coq}/bin/coqide" "$out/bin/ssrcoqide" --add-flags "-coqtop" --add-flags "$out/bin/ssrcoq" ''; meta = { diff --git a/pkgs/applications/science/logic/ssreflect/static.patch b/pkgs/applications/science/logic/ssreflect/static.patch index edb8a6111f7..2211d880258 100644 --- a/pkgs/applications/science/logic/ssreflect/static.patch +++ b/pkgs/applications/science/logic/ssreflect/static.patch @@ -1,33 +1,21 @@ ---- ssreflect1.3pl4/Make (revision 3823) -+++ ssreflect1.3pl4/Make (working copy) -@@ -1,18 +1,18 @@ - ## Uncomment for static linking - ## --# --#-custom "$(COQBIN)coqmktop -opt -o bin/ssrcoq src/ssreflect.cmx" "src/ssreflect.cmx" bin/ssrcoq --#-custom "$(COQBIN)coqmktop -o bin/ssrcoq.byte src/ssreflect.cmo" "src/ssreflect.cmo bin/ssrcoq" bin/ssrcoq.byte +--- ssreflect1.4-coq8.4/Make (revision 3823) ++++ ssreflect1.4-coq8.4/Make (working copy) +@@ -1,10 +1,10 @@ +-### Uncomment for static linking +-## +-#-custom "$(COQBIN)coqmktop -coqlib `$(COQBIN)coqtop -where` -opt -o bin/ssrcoq src/ssrmatching.cmx src/ssreflect.cmx" "src/ssrmatching.cmx src/ssreflect.cmx" bin/ssrcoq +-#-custom "$(COQBIN)coqmktop -coqlib `$(COQBIN)coqtop -where` -o bin/ssrcoq.byte src/ssrmatching.cmo src/ssreflect.cmo" "src/ssrmatching.cmo src/ssreflect.cmo" bin/ssrcoq.byte -#-custom "$(SSRCOQ) $(COQFLAGS) -compile $*" "%.v $(SSRCOQ)" "%.vo" -#SSRCOQ = bin/ssrcoq --# -+ -+-custom "$(COQBIN)coqmktop -opt -o bin/ssrcoq src/ssreflect.cmx" "src/ssreflect.cmx" bin/ssrcoq -+-custom "$(COQBIN)coqmktop -o bin/ssrcoq.byte src/ssreflect.cmo" "src/ssreflect.cmo bin/ssrcoq" bin/ssrcoq.byte +-## ++## Uncomment for static linking ++# ++-custom "$(COQBIN)coqmktop -coqlib `$(COQBIN)coqtop -where` -opt -o bin/ssrcoq src/ssrmatching.cmx src/ssreflect.cmx" "src/ssrmatching.cmx src/ssreflect.cmx" bin/ssrcoq ++-custom "$(COQBIN)coqmktop -coqlib `$(COQBIN)coqtop -where` -o bin/ssrcoq.byte src/ssrmatching.cmo src/ssreflect.cmo" "src/ssrmatching.cmo src/ssreflect.cmo" bin/ssrcoq.byte +-custom "$(SSRCOQ) $(COQFLAGS) -compile $*" "%.v $(SSRCOQ)" "%.vo" +SSRCOQ = bin/ssrcoq -+ - ## - - ## Uncomment for dynamic linking - ## -- ---I src -- +# -+#-I src -+# - ## ## What follows should be left untouched by the final user of ssreflect -Common subdirectories: old/src and new/src -Common subdirectories: old/test and new/test -Common subdirectories: old/theories and new/theories + -R theories Ssreflect + diff --git a/pkgs/applications/science/logic/tptp/default.nix b/pkgs/applications/science/logic/tptp/default.nix index ecd70843e0f..87a32006713 100644 --- a/pkgs/applications/science/logic/tptp/default.nix +++ b/pkgs/applications/science/logic/tptp/default.nix @@ -11,10 +11,10 @@ let (builtins.attrNames (builtins.removeAttrs x helperArgNames)); sourceInfo = rec { baseName="TPTP"; - version="5.3.0"; + version="5.4.0"; name="${baseName}-${version}"; url="http://www.cs.miami.edu/~tptp/TPTP/Distribution/TPTP-v${version}.tgz"; - hash="0xzybh332x53q4cmb3i47ygln0x6rd2nx810la1hmja9d1ixnz9b"; + hash="0nyq2kkiphwgj3hczc7zglzqjj6hxxsh6zcygpy4yhxh9a9rpkg1"; }; in rec { diff --git a/pkgs/applications/science/math/maxima/default.nix b/pkgs/applications/science/math/maxima/default.nix index 0d3a12b38c2..41c21f94b01 100644 --- a/pkgs/applications/science/math/maxima/default.nix +++ b/pkgs/applications/science/math/maxima/default.nix @@ -2,7 +2,7 @@ let name = "maxima"; - version = "5.26.0"; + version = "5.27.0"; searchPath = stdenv.lib.makeSearchPath "bin" @@ -13,7 +13,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://sourceforge/${name}/${name}-${version}.tar.gz"; - sha256 = "887105c99a91122f3e622472aa39bdd1ca8ed6198cf09b49917f63f8396dced9"; + sha256 = "9006803714f1385221c4395697fad53f125a13d29b50b188d045d08e25f8dca7"; }; buildInputs = [sbcl texinfo perl makeWrapper]; diff --git a/pkgs/applications/science/math/wxmaxima/default.nix b/pkgs/applications/science/math/wxmaxima/default.nix index 9592f8f9871..52048dc9d19 100644 --- a/pkgs/applications/science/math/wxmaxima/default.nix +++ b/pkgs/applications/science/math/wxmaxima/default.nix @@ -2,14 +2,14 @@ let name = "wxmaxima"; - version = "12.01.0"; + version = "12.04.0"; in stdenv.mkDerivation { name = "${name}-${version}"; src = fetchurl { url = "mirror://sourceforge/${name}/wxMaxima-${version}.tar.gz"; - sha256 = "358cdafe81b7e7290f6bb8c93580b0e2f0ae5a4d148a476e5af375aa9bf77054"; + sha256 = "60110507e0a63738a1f420b22697eaac9bea3866122e072dcd697077e8744824"; }; buildInputs = [wxGTK maxima makeWrapper]; diff --git a/pkgs/applications/version-management/bazaar/default.nix b/pkgs/applications/version-management/bazaar/default.nix index 462aede3b1c..856320f0168 100644 --- a/pkgs/applications/version-management/bazaar/default.nix +++ b/pkgs/applications/version-management/bazaar/default.nix @@ -23,5 +23,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://bazaar-vcs.org/; description = "A distributed version control system that Just Works"; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/version-management/darcs/default.nix b/pkgs/applications/version-management/darcs/default.nix index 53cb4b360a0..3fb667b9461 100644 --- a/pkgs/applications/version-management/darcs/default.nix +++ b/pkgs/applications/version-management/darcs/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "darcs"; - version = "2.8.1"; - sha256 = "1fz9k9zihb0fz0w2y55iqa1fd604nxzz48r62sx3ixxn8qqsvrd1"; + version = "2.8.2"; + sha256 = "1gd8028k91hjsd9hvx3pw4h5zsn2ckc7pfp7f1f566dpp1g422v5"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 53e214e8f37..efe4fcb2d7c 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -69,22 +69,8 @@ rec { inherit stdenv fetchurl unzip; }; - tig = stdenv.mkDerivation { - name = "tig-0.16"; - src = fetchurl { - url = "http://jonas.nitro.dk/tig/releases/tig-0.16.tar.gz"; - sha256 = "167kak44n66wqjj6jrv8q4ijjac07cw22rlpqjqz3brlhx4cb3ix"; - }; - buildInputs = [ncurses asciidoc xmlto docbook_xsl]; - installPhase = '' - make install - make install-doc - ''; - meta = { - description = "console git repository browser that additionally can act as a pager for output from various git commands"; - homepage = http://jonas.nitro.dk/tig/; - license = "GPLv2"; - }; + tig = import ./tig { + inherit stdenv fetchurl ncurses asciidoc xmlto docbook_xsl; }; gitFastExport = import ./fast-export { diff --git a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix index 16f62ad50ec..86c8e9717b1 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix @@ -5,14 +5,14 @@ }: let - version = "3.20120629"; + version = "3.20120825"; in stdenv.mkDerivation { name = "git-annex-${version}"; src = fetchurl { url = "http://git.kitenet.net/?p=git-annex.git;a=snapshot;sf=tgz;h=refs/tags/${version}"; - sha256 = "0dajcmx1sn3rqlba5b66lkiwji849gxzcb5d8666in21g7lc1ccs"; + sha256 = "edffe6a99d07599f62d4d5f6823de8a830abe8977c7671fd6eb21aeaebc0b8d0"; name = "git-annex-${version}.tar.gz"; }; 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 4ed5f78d6e0..b48c5f05d9e 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -9,10 +9,10 @@ let - version = "1.7.11"; - + version = "1.7.12"; + svn = subversionClient.override { perlBindings = true; }; - + in stdenv.mkDerivation { @@ -20,7 +20,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://git-core.googlecode.com/files/git-${version}.tar.gz"; - sha256 = "0qgi1cj19dnn0sl3n38dbz68nllvyppdvs2jb77ksiar4jb9lsc3"; + sha256 = "3b8661782dc280d3d4be5193bcb8a1895c1ba272cf02efb70857bbcc4415f505"; }; patches = [ ./docbook2texi.patch ]; @@ -100,7 +100,7 @@ stdenv.mkDerivation { for prog in bin/gitk libexec/git-core/{git-gui,git-citool,git-gui--askpass}; do sed -i -e "s|exec 'wish'|exec '${tk}/bin/wish'|g" \ -e "s|exec wish|exec '${tk}/bin/wish'|g" \ - "$out/$prog" + "$out/$prog" done '' else '' # Don't wrap Tcl/Tk, replace them by notification scripts diff --git a/pkgs/applications/version-management/git-and-tools/tig/default.nix b/pkgs/applications/version-management/git-and-tools/tig/default.nix new file mode 100644 index 00000000000..d567e20d732 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/tig/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, ncurses, asciidoc, xmlto, docbook_xsl }: + +stdenv.mkDerivation { + name = "tig-1.0"; + src = fetchurl { + url = "http://jonas.nitro.dk/tig/releases/tig-1.0.tar.gz"; + md5 = "a2d414d1cebbc9cd4f3d545bc6f225c6"; + }; + buildInputs = [ncurses asciidoc xmlto docbook_xsl]; + installPhase = '' + make install + make install-doc + ''; + meta = { + description = "Tig is a git repository browser that additionally can act as a pager for output from various git commands"; + homepage = "http://jonas.nitro.dk/tig/"; + license = "GPLv2"; + }; +} diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 24e1b95bf0c..486bebc2531 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -2,14 +2,14 @@ , guiSupport ? false, tk ? null, curses }: let - name = "mercurial-2.1.2"; + name = "mercurial-2.2.3"; in stdenv.mkDerivation { inherit name; src = fetchurl { url = "http://mercurial.selenic.com/release/${name}.tar.gz"; - sha256 = "11lqjnbal667rkbafby9qvb7hyxfycyc7h3hw04p4s4mw64lhkci"; + sha256 = "0yv7kn96270fixigry910c1i3zzivimh1xjxywqjn9dshn2y6qbw"; }; inherit python; # pass it so that the same version can be used in hg2git @@ -43,7 +43,7 @@ stdenv.mkDerivation { # copy hgweb.cgi to allow use in apache mkdir -p $out/share/cgi-bin - cp -v hgweb.cgi $out/share/cgi-bin + cp -v hgweb.cgi contrib/hgweb.wsgi $out/share/cgi-bin chmod u+x $out/share/cgi-bin/hgweb.cgi ''; diff --git a/pkgs/applications/version-management/mr/default.nix b/pkgs/applications/version-management/mr/default.nix new file mode 100644 index 00000000000..9e8024d7b19 --- /dev/null +++ b/pkgs/applications/version-management/mr/default.nix @@ -0,0 +1,56 @@ +{ stdenv, fetchurl, perl }: + +stdenv.mkDerivation rec { + + version = "1.13"; + name = "mr-" + version; + + src = fetchurl { + url = "http://ftp.de.debian.org/debian/pool/main/m/mr/mr_${version}.tar.gz"; + sha256 = "1q3qxk8dwbv30v2xxh852wnwl1msgkvk5cgxyicpqj8kh5b96zlz"; + }; + + buildInputs = [perl]; + + buildPhase = '' + make build + ''; + + installPhase = '' + mkdir -pv $out/bin $out/share/man/man1 + cp -v mr $out/bin + cp -v webcheckout $out/bin + cp -v mr.1 $out/share/man/man1 + cp -v webcheckout.1 $out/share/man/man1 + ''; + + meta = { + description = "Multiple Repository management tool"; + longDescription = ''The mr(1) command can checkout, update, or perform other actions on a + set of repositories as if they were one combined respository. It + supports any combination of subversion, git, cvs, mercurial, bzr, + darcs, cvs, vcsh, fossil and veracity repositories, and support for + other revision control systems can easily be added. (There are + extensions adding support for unison and git-svn.) + + It is extremely configurable via simple shell scripting. Some examples + of things it can do include: + + - Update a repository no more frequently than once every twelve + hours. + - Run an arbitrary command before committing to a + repository. + - When updating a git repository, pull from two + different upstreams and merge the two together. + - Run several repository updates in parallel, greatly speeding + up the update process. + - Remember actions that failed due to a laptop being + offline, so they can be retried when it comes back online. + ''; + homepage = http://joeyh.name/code/mr/; + license = "GPLv2+"; + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.antono ]; + }; +} + diff --git a/pkgs/applications/version-management/veracity/default.nix b/pkgs/applications/version-management/veracity/default.nix index 91650deb077..6bf452c1821 100644 --- a/pkgs/applications/version-management/veracity/default.nix +++ b/pkgs/applications/version-management/veracity/default.nix @@ -63,7 +63,7 @@ rec { export SGNEEDS_DIR="$out"/sgneeds/ export VVTHIRDPARTY="$out"/sgneeds/ - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$out/sgneeds/include" + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I"$out/sgneeds/include" -Wno-error" '') ["minInit" "defEnsureDir"]; prepareMakefiles = a.fullDepEntry '' diff --git a/pkgs/applications/version-management/veracity/src-for-default.nix b/pkgs/applications/version-management/veracity/src-for-default.nix index b074c3ec507..395dda240b8 100644 --- a/pkgs/applications/version-management/veracity/src-for-default.nix +++ b/pkgs/applications/version-management/veracity/src-for-default.nix @@ -1,9 +1,9 @@ rec { - version="1.5.0.10647"; - name="veracity-1.5.0.10647"; - hash="1b10npyxxg9592wigfpv66h17bzbsg2hqcfm7imyn941a34qrkd3"; - url="http://download.sourcegear.com/Veracity/nightly/1.5.0.10647/veracity-source-${version}.tar.gz"; - advertisedUrl="http://download.sourcegear.com/Veracity/nightly/1.5.0.10647/veracity-source-1.5.0.10647.tar.gz"; + version="2.0.0.10822"; + name="veracity-2.0.0.10822"; + hash="0zgvrsjxfd1p9pflx1kxggmk953jhjk02h1hili9h1vdasvn2188"; + url="http://download.sourcegear.com/Veracity/release/2.0.0.10822/veracity-source-${version}.tar.gz"; + advertisedUrl="http://download.sourcegear.com/Veracity/release/2.0.0.10822/veracity-source-2.0.0.10822.tar.gz"; } diff --git a/pkgs/applications/video/MPlayer/default.nix b/pkgs/applications/video/MPlayer/default.nix index 3c1cd2ff447..566089201cd 100644 --- a/pkgs/applications/video/MPlayer/default.nix +++ b/pkgs/applications/video/MPlayer/default.nix @@ -97,7 +97,7 @@ stdenv.mkDerivation rec { buildInputs = [ freetype zlib pkgconfig ] - ++ stdenv.lib.optional x11Support [ libX11 libXext mesa ] + ++ stdenv.lib.optionals x11Support [ libX11 libXext mesa ] ++ stdenv.lib.optional alsaSupport alsaLib ++ stdenv.lib.optional xvSupport libXv ++ stdenv.lib.optional theoraSupport libtheora diff --git a/pkgs/applications/video/bangarang/default.nix b/pkgs/applications/video/bangarang/default.nix index 2fe4b4d0bdc..0bc7476dc82 100644 --- a/pkgs/applications/video/bangarang/default.nix +++ b/pkgs/applications/video/bangarang/default.nix @@ -1,13 +1,14 @@ { stdenv, fetchurl, cmake, qt4, kdelibs, automoc4, phonon, soprano, shared_desktop_ontologies, kdemultimedia, taglib, glibc, gettext }: stdenv.mkDerivation rec { - name = "bangarang-2.0"; + name = "bangarang-2.1"; src = fetchurl { url = "http://bangarangissuetracking.googlecode.com/files/${name}.tar.gz"; - sha256 = "1fixqx56k0mk0faz35rzpdg6zaa0mvm4548rg0g7fhafl35fxzlz"; + sha256 = "1g4pap79k8qaqi0py34xqvisxln1nc5hbvph692ah3af06n6cly1"; }; - buildInputs = [ cmake qt4 kdelibs automoc4 phonon soprano shared_desktop_ontologies kdemultimedia taglib glibc gettext ]; + buildInputs = [ kdelibs phonon soprano shared_desktop_ontologies kdemultimedia taglib gettext ]; + buildNativeInputs = [ cmake ]; meta = with stdenv.lib; { description = "A media player for KDE based on Nepomuk and Phonon"; @@ -17,7 +18,7 @@ stdenv.mkDerivation rec { ''; homepage = http://bangarangkde.wordpress.com/; license = "GPLv3"; - maintainers = [ maintainers.phreedom ]; + maintainers = [ maintainers.phreedom maintainers.urkud ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/video/kdenlive/default.nix b/pkgs/applications/video/kdenlive/default.nix index d8620eb33cd..b518e9c7456 100644 --- a/pkgs/applications/video/kdenlive/default.nix +++ b/pkgs/applications/video/kdenlive/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, lib, cmake, qt4, perl, kdelibs, automoc4, phonon , mlt, gettext , qimageblitz, qjson, shared_mime_info, soprano -, pkgconfig }: +, pkgconfig, shared_desktop_ontologies }: stdenv.mkDerivation rec { name = "kdenlive-${version}"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake qt4 perl kdelibs automoc4 phonon mlt gettext qimageblitz - qjson shared_mime_info soprano pkgconfig + qjson shared_mime_info soprano pkgconfig shared_desktop_ontologies ]; meta = { diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index b33bcddbffb..65357acf00f 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { name = "vlc-${version}"; - version = "2.0.1"; + version = "2.0.3"; src = fetchurl { url = "http://download.videolan.org/pub/videolan/vlc/${version}/${name}.tar.xz"; - sha256 = "7f485725c17487a77d70844cbd9acf528360d65cd6ff79d206657920f4fcbf4b"; + sha256 = "1lnjfpizgp8slj6i4fgk5wld6nfw08wfhkb1i1dvzbhmfigq1agv"; }; buildInputs = diff --git a/pkgs/applications/video/xine-ui/default.nix b/pkgs/applications/video/xine-ui/default.nix index 38bacb25117..821e1c7bb0c 100644 --- a/pkgs/applications/video/xine-ui/default.nix +++ b/pkgs/applications/video/xine-ui/default.nix @@ -1,18 +1,18 @@ -{stdenv, fetchurl, pkgconfig, xlibs, xineLib, libpng12, readline, ncurses, curl -, lirc, shared_mime_info }: +{stdenv, fetchurl, pkgconfig, xlibs, libpng, xineLib, readline, ncurses, curl +, lirc, shared_mime_info, libjpeg }: stdenv.mkDerivation rec { - name = "xine-ui-0.99.6"; + name = "xine-ui-0.99.7"; src = fetchurl { url = "mirror://sourceforge/xine/${name}.tar.xz"; - sha256 = "1wwylnckm5kfq5fi154w8jqf5cwvp7c1ani15q7sgfrfdkmy7caf"; + sha256 = "1i3byriqav06b55kwzs4dkzrjw7mmmcv0rc7jzb52hn8qp8xz34x"; }; buildNativeInputs = [ pkgconfig shared_mime_info ]; buildInputs = - [ xineLib libpng12 readline ncurses curl lirc + [ xineLib libpng readline ncurses curl lirc libjpeg xlibs.xlibs xlibs.libXext xlibs.libXv xlibs.libXxf86vm xlibs.libXtst xlibs.inputproto xlibs.libXinerama xlibs.libXi xlibs.libXft ]; diff --git a/pkgs/applications/virtualization/virt-manager/custom_runner.py b/pkgs/applications/virtualization/virt-manager/custom_runner.py new file mode 100644 index 00000000000..5322c20dd32 --- /dev/null +++ b/pkgs/applications/virtualization/virt-manager/custom_runner.py @@ -0,0 +1,13 @@ +#!/usr/bin/python -t +# this script was written to use /etc/nixos/nixpkgs/pkgs/development/python-modules/generic/wrap.sh +# which already automates python executable wrapping by extending the PATH/pythonPath + +# from http://docs.python.org/library/subprocess.html +# Warning Invoking the system shell with shell=True can be a security hazard if combined with untrusted input. See the warning under Frequently Used Arguments for details. + +from subprocess import Popen, PIPE, STDOUT + +cmd = 'PYTHON_EXECUTABLE_PATH -t THE_CUSTOM_PATH/share/virt-manager/THE_CUSTOM_PROGRAM.py' +p = Popen(cmd, shell=True, stdin=PIPE, stdout=PIPE, stderr=STDOUT, close_fds=True) +output = p.stdout.read() +print output diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index c41db3f58c5..79ea777eead 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -1,70 +1,85 @@ -x@{builderDefsPackage - , gnome, gtk, glib, libxml2, libvirt, gtkvnc, cyrus_sasl, libtasn1, makeWrapper - , intltool, python, pygtk, libxml2Python - # virtinst is required, but it breaks when building - , ...}: -builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ - ["gnome"]; +{ stdenv, fetchurl, pythonPackages, intltool, libvirt, libxml2Python, curl, python, makeWrapper, virtinst, pyGtkGlade, pythonDBus, gnome_python, gtkvnc}: - buildInputs = (map (n: builtins.getAttr n x) - (builtins.attrNames (builtins.removeAttrs x helperArgNames))) - ++ [gnome.libglade intltool python libvirt]; - sourceInfo = rec { - baseName="virt-manager"; +with stdenv.lib; - version = "0.9.1"; - name = "virt-manager-${version}"; +let version = "0.9.1"; in + +stdenv.mkDerivation rec { + name = "virt-manager-${version}"; + + src = fetchurl { url = "http://virt-manager.et.redhat.com/download/sources/virt-manager/virt-manager-${version}.tar.gz"; - hash = "15e064167ba5ff84ce6fc8790081d61890430f2967f89886a84095a23e40094a"; - }; -in -rec { - src = a.fetchurl { - url = sourceInfo.url; - sha256 = sourceInfo.hash; + sha256 = "15e064167ba5ff84ce6fc8790081d61890430f2967f89886a84095a23e40094a"; }; - patchPhase = a.fullDepEntry '' - substituteInPlace "src/virt-manager.in" --replace "exec /usr/bin/python" "exec ${python}/bin/python" - sed -e '/import libxml2/i import sys\ - sys.path.append("${libxml2Python}/lib/${python.libPrefix}/site-packages")' \ - -i src/virtManager/util.py - sed -e '/import libxml2/i import sys\ - sys.path.append("${libxml2Python}/lib/${python.libPrefix}/site-packages")' \ - -i src/virtManager/libvirtobject.py - '' ["minInit"]; + pythonPath = with pythonPackages; + [ setuptools eventlet greenlet gflags netaddr sqlalchemy carrot routes + paste_deploy m2crypto ipy boto_1_9 twisted sqlalchemy_migrate + distutils_extra simplejson readline glance cheetah lockfile httplib2 + # !!! should libvirt be a build-time dependency? Note that + # libxml2Python is a dependency of libvirt.py. + libvirt libxml2Python urlgrabber virtinst pyGtkGlade pythonDBus gnome_python gtkvnc + ]; - inherit (sourceInfo) name version; - inherit buildInputs; + buildInputs = + [ pythonPackages.python + pythonPackages.wrapPython + pythonPackages.mox + pythonPackages.urlgrabber + intltool + pyGtkGlade + pythonDBus + gnome_python + gtkvnc + ] ++ pythonPath; - /* doConfigure should be removed if not needed */ - phaseNames = [ "doUnpack" "patchPhase" "doConfigure" "doMakeInstall" "installPhase" ]; + buildPhase = "make"; + + buildNativeInputs = [ makeWrapper pythonPackages.wrapPython ]; - installPhase = a.fullDepEntry '' - wrapProgram $out/bin/virt-manager --set PYTHONPATH $PYTHONPATH - '' ["minInit"]; + # patch the runner script in order to make wrapPythonPrograms work and run the program using a syscall + # example code: /etc/nixos/nixpkgs/pkgs/development/interpreters/spidermonkey/1.8.0-rc1.nix + customRunner = ./custom_runner.py; - #NIX_CFLAGS_COMPILE = "-fno-stack-protector"; + # TODO + # virt-manager -> import gtk.glade -> No module named glade --> fixed by removing 'pygtk' and by only using pyGtkGlade + # -> import gconf -> ImportError: No module named gconf + # -> pfad um gtk-2.0 erweitern in virt-manger runner -> /nix/store/hnyxc9i4yz2mc42n44ms13mn8n486s5h-gnome-python-2.28.1/lib/python2.7/site-packages/gtk-2.0 + # -> Error starting Virtual Machine Manager: Failed to contact configuration server; the most common cause is a missing or misconfigured D-Bus session bus daemon. See http://projects.gnome.org/gconf/ for information. (Details - 1: GetIOR failed: GDBus.Error:org.freedesktop.DBus.Error.ServiceUnknown: The name org.gnome.GConf was not provided by any .service files) + +#Traceback (most recent call last): +# File "/nix/store/y9rcdiv6686sqcv4r39p575s37jzc2cz-virt-manager-0.9.1/share/virt-manager/virt-manager.py", line 383, in +# main() +# File "/nix/store/y9rcdiv6686sqcv4r39p575s37jzc2cz-virt-manager-0.9.1/share/virt-manager/virt-manager.py", line 315, in main +# config = virtManager.config.vmmConfig(appname, appversion, glade_dir) +# File "/nix/store/y9rcdiv6686sqcv4r39p575s37jzc2cz-virt-manager-0.9.1/share/virt-manager/virtManager/config.py", line 98, in __init__ +# self.conf.add_dir(self.conf_dir, gconf.CLIENT_PRELOAD_NONE) +#GError: Failed to contact configuration server; the most common cause is a missing or misconfigured D-Bus session bus daemon. See http://projects.gnome.org/gconf/ for information. (Details - 1: GetIOR failed: GDBus.Error:org.freedesktop.DBus.Error.ServiceUnknown: The name org.gnome.GConf was not provided by any .service files) +# -> fixed by http://nixos.org/wiki/Solve_GConf_errors_when_running_GNOME_applications & a restart + # virt-manager-tui -> ImportError: No module named newt_syrup.dialogscreen + + patchPhase = '' + cat ${customRunner} > src/virt-manager.in + substituteInPlace "src/virt-manager.in" --replace "THE_CUSTOM_PATH" "$out" + substituteInPlace "src/virt-manager.in" --replace "THE_CUSTOM_PROGRAM" "virt-manager" + substituteInPlace "src/virt-manager.in" --replace "PYTHON_EXECUTABLE_PATH" "${python}/bin/python" + + cat ${customRunner} > src/virt-manager-tui.in + substituteInPlace "src/virt-manager-tui.in" --replace "THE_CUSTOM_PATH" "$out" + substituteInPlace "src/virt-manager-tui.in" --replace "THE_CUSTOM_PROGRAM" "virt-manager-tui" + substituteInPlace "src/virt-manager-tui.in" --replace "PYTHON_EXECUTABLE_PATH" "${python}/bin/python" + ''; + + # /etc/nixos/nixpkgs/pkgs/development/python-modules/generic/wrap.sh + installPhase = '' + make install + wrapPythonPrograms + ''; meta = { homepage = http://virt-manager.org; description = "The 'Virtual Machine Manager' application (virt-manager for short package name) is a desktop user interface for managing virtual machines."; - - maintainers = with a.lib.maintainers; - [ - qknight - ]; - platforms = with a.lib.platforms; - linux; - license = a.lib.licenses.gpl2; + license = "GPLv2"; + maintainers = with stdenv.lib.maintainers; [qknight]; }; - passthru = { - updateInfo = { - downloadPage = "http://virt-manager.org/download.html"; - }; - }; -}) x - +} diff --git a/pkgs/applications/virtualization/virtinst/default.nix b/pkgs/applications/virtualization/virtinst/default.nix index 0c574db2391..2bb2adaa00a 100644 --- a/pkgs/applications/virtualization/virtinst/default.nix +++ b/pkgs/applications/virtualization/virtinst/default.nix @@ -30,19 +30,11 @@ stdenv.mkDerivation rec { buildPhase = "python setup.py build"; - PYTHON_EGG_CACHE = "`pwd`/.egg-cache"; - -# substituteInPlace nova/api/ec2/cloud.py \ -# --replace 'sh genrootca.sh' $out/libexec/nova/genrootca.sh -# ''; - installPhase = '' python setup.py install --prefix="$out"; ''; - #checkPhase = "python setup.py test"; - meta = { homepage = http://virt-manager.org; license = "GPLv2+"; diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 1e17c10ffd2..56387f9e5c4 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -8,21 +8,38 @@ with stdenv.lib; -let version = "4.1.16"; in +let -stdenv.mkDerivation { + version = "4.1.22"; + + forEachModule = action: '' + for mod in \ + $sourcedir/out/linux.*/release/bin/src/vboxdrv \ + $sourcedir/out/linux.*/release/bin/src/vboxpci \ + $sourcedir/out/linux.*/release/bin/src/vboxnetadp \ + $sourcedir/out/linux.*/release/bin/src/vboxnetflt + do + if [ "x$(basename "$mod")" != xvboxdrv -a ! -e "$mod/Module.symvers" ] + then + cp -v $sourcedir/out/linux.*/release/bin/src/vboxdrv/Module.symvers \ + "$mod/Module.symvers" + fi + INSTALL_MOD_PATH="$out" INSTALL_MOD_DIR=misc \ + make -C "$MODULES_BUILD_DIR" "M=$mod" DEPMOD=/do_not_use_depmod ${action} + done + ''; + +in stdenv.mkDerivation { name = "virtualbox-${version}-${kernel.version}"; - NIX_CFLAGS_COMPILE="-I${kernel}/lib/modules/${kernel.modDirVersion}/build/include/generated"; - src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2"; - sha256 = "0kl21wqz822qgdcilfail5qqgsbhgzixwbbwpkmsh6670jc4jw5n"; + sha256 = "7abb506203dd0d69b4b408fd999b5b9a479a9adce5f80e9b5569641c053dd153"; }; buildInputs = [ iasl dev86 libxslt libxml2 xproto libX11 libXext libXcursor qt4 libIDL SDL - libcap glib kernel python alsaLib curl pam xorriso makeself perl jdk + libcap glib kernel python alsaLib curl pam xorriso makeself perl pkgconfig which libXmu ] ++ optional javaBindings jdk ++ optional pythonBindings python; @@ -34,18 +51,19 @@ stdenv.mkDerivation { -e 's@MKISOFS --version@MKISOFS -version@' \ -e 's@PYTHONDIR=.*@PYTHONDIR=${if pythonBindings then python else ""}@' \ -i configure - ls kBuild/bin/linux.x86/k* tools/linux.x86/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux.so.2 - ls kBuild/bin/linux.amd64/k* tools/linux.amd64/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 + ls kBuild/bin/linux.x86/k* tools/linux.x86/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux.so.2 + ls kBuild/bin/linux.amd64/k* tools/linux.amd64/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 find . -type f | xargs sed 's/depmod -a/true/' -i export USER=nix set +x ''; configurePhase = '' + sourcedir="$(pwd)" ./configure --with-qt4-dir=${qt4} \ ${optionalString (!javaBindings) "--disable-java"} \ ${optionalString (!pythonBindings) "--disable-python"} \ - --disable-pulse --disable-hardening \ + --disable-pulse --disable-hardening --disable-kmods \ --with-mkisofs=${xorriso}/bin/xorrisofs sed -e 's@PKG_CONFIG_PATH=.*@PKG_CONFIG_PATH=${libIDL}/lib/pkgconfig:${glib}/lib/pkgconfig ${libIDL}/bin/libIDL-config-2@' \ -i AutoConfig.kmk @@ -55,7 +73,9 @@ stdenv.mkDerivation { cat >> AutoConfig.kmk << END_PATHS VBOX_PATH_APP_PRIVATE := $out VBOX_PATH_APP_DOCS := $out/doc - VBOX_JAVA_HOME := ${jdk} + ${optionalString javaBindings '' + VBOX_JAVA_HOME := ${jdk} + ''} END_PATHS echo "VBOX_WITH_DOCS :=" >> LocalConfig.kmk echo "VBOX_WITH_WARNINGS_AS_ERRORS :=" >> LocalConfig.kmk @@ -63,51 +83,35 @@ stdenv.mkDerivation { enableParallelBuilding = true; - preBuild = '' + buildPhase = '' source env.sh kmk - cd out/linux.*/release/bin/src - export KERN_DIR=${kernel}/lib/modules/*/build + ${forEachModule "modules"} ''; - postBuild = '' - cd ../../../../.. - ''; - installPhase = '' libexec=$out/libexec/virtualbox - + # Install VirtualBox files cd out/linux.*/release/bin mkdir -p $libexec cp -av * $libexec - - # Install kernel module - cd src - kernelVersion=$(cd ${kernel}/lib/modules; ls) - export MODULE_DIR=$out/lib/modules/$kernelVersion/misc - - # Remove root ownership stuff, since this does not work in a chroot environment - for i in `find . -name Makefile`; do - sed -i -e "s|-o root||g" \ - -e "s|-g root||g" $i - done - + # Install kernel modules - make install - + ${forEachModule "modules_install"} + # Create wrapper script mkdir -p $out/bin for file in VirtualBox VBoxManage VBoxSDL VBoxBalloonCtrl VBoxBFE VBoxHeadless; do ln -s "$libexec/$file" $out/bin/$file done - + # Create and fix desktop item mkdir -p $out/share/applications sed -i -e "s|Icon=VBox|Icon=$libexec/VBox.png|" $libexec/virtualbox.desktop ln -sfv $libexec/virtualbox.desktop $out/share/applications ''; - + meta = { description = "PC emulator"; homepage = http://www.virtualbox.org/; diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index 7583b706e4c..d903c44866c 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, lib, patchelf, cdrkit, kernel, which, makeWrapper , libX11, libXt, libXext, libXmu, libXcomposite, libXfixes, libXrandr, libXcursor}: -let version = "4.1.16"; in +let version = "4.1.22"; in stdenv.mkDerivation { name = "VirtualBox-GuestAdditions-${version}"; src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso"; - sha256 = "1f2p26cg005xc6vi9dbim0macv60d8k8nq20rk7awrbghfib5imm"; + sha256 = "5c7d9a4a31c8a926ba6dbae2b9704a561638e94ea0fc4f805a9231dd4f932d46"; }; KERN_DIR = "${kernel}/lib/modules/*/build"; buildInputs = [ patchelf cdrkit makeWrapper ]; @@ -17,16 +17,16 @@ stdenv.mkDerivation { cp -r install/* $out ''; - + buildCommand = '' ${if stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" then '' isoinfo -J -i $src -x /VBoxLinuxAdditions.run > ./VBoxLinuxAdditions.run chmod 755 ./VBoxLinuxAdditions.run - ./VBoxLinuxAdditions.run --noexec --keep + ./VBoxLinuxAdditions.run --noexec --keep '' else throw ("Architecture: "+stdenv.system+" not supported for VirtualBox guest additions") } - + # Unpack files cd install ${if stdenv.system == "i686-linux" then '' @@ -38,31 +38,31 @@ stdenv.mkDerivation { else throw ("Architecture: "+stdenv.system+" not supported for VirtualBox guest additions") } - - # Build kernel modules - cd src + + # Build kernel modules + cd src for i in * do - cd $i - find . -type f | xargs sed 's/depmod -a/true/' -i - make - cd .. + cd $i + find . -type f | xargs sed 's/depmod -a/true/' -i + make + cd .. done cd .. - + # Change the interpreter for various binaries for i in sbin/VBoxService bin/{VBoxClient,VBoxControl} do ${if stdenv.system == "i686-linux" then '' patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux.so.2 $i - '' - else if stdenv.system == "x86_64-linux" then '' - patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 $i - '' - else throw ("Architecture: "+stdenv.system+" not supported for VirtualBox guest additions") - } + '' + else if stdenv.system == "x86_64-linux" then '' + patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 $i + '' + else throw ("Architecture: "+stdenv.system+" not supported for VirtualBox guest additions") + } done # Change rpath for various binaries and libraries @@ -72,11 +72,11 @@ stdenv.mkDerivation { do patchelf --set-rpath $out/lib $i done - + # Remove references to /usr from various scripts and files sed -i -e "s|/usr/bin|$out/bin|" share/VBoxGuestAdditions/vboxclient.desktop sed -i -e "s|/usr/bin|$out/bin|" bin/VBoxClient-all - + # Install binaries mkdir -p $out/sbin install -m 755 sbin/VBoxService $out/sbin @@ -94,7 +94,7 @@ stdenv.mkDerivation { cp -v lib/VBoxOGL*.so $out/lib mkdir -p $out/lib/dri ln -s $out/lib/VBoxOGL.so $out/lib/dri/vboxvideo_dri.so - + # Install desktop file mkdir -p $out/share/autostart cp -v share/VBoxGuestAdditions/vboxclient.desktop $out/share/autostart @@ -103,23 +103,23 @@ stdenv.mkDerivation { mkdir -p $out/lib/xorg/modules/{drivers,input} install -m 644 lib/VBoxGuestAdditions/vboxvideo_drv_19.so $out/lib/xorg/modules/drivers/vboxvideo_drv.so # There doesn't appear to be a vboxmouse driver for Xorg 1.9. Was there ever? -# install -m 644 lib/VBoxGuestAdditions/vboxmouse_drv_19.so $out/lib/xorg/modules/input/vboxmouse_drv.so + #install -m 644 lib/VBoxGuestAdditions/vboxmouse_drv_19.so $out/lib/xorg/modules/input/vboxmouse_drv.so # Install kernel modules cd src - + for i in * do cd $i - kernelVersion=$(cd ${kernel}/lib/modules; ls) - export MODULE_DIR=$out/lib/modules/$kernelVersion/misc - find . -type f | xargs sed -i -e "s|-o root||g" \ - -e "s|-g root||g" - make install - cd .. - done - ''; - + kernelVersion=$(cd ${kernel}/lib/modules; ls) + export MODULE_DIR=$out/lib/modules/$kernelVersion/misc + find . -type f | xargs sed -i -e "s|-o root||g" \ + -e "s|-g root||g" + make install + cd .. + done + ''; # */ + meta = { description = "Guest additions for VirtualBox"; longDescriptions = '' @@ -129,5 +129,6 @@ stdenv.mkDerivation { ''; license = "GPL"; maintainers = [ lib.maintainers.sander ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/virtualization/xen/default.nix b/pkgs/applications/virtualization/xen/default.nix index ce799242e12..3cb16a6b442 100644 --- a/pkgs/applications/virtualization/xen/default.nix +++ b/pkgs/applications/virtualization/xen/default.nix @@ -79,6 +79,9 @@ stdenv.mkDerivation { substituteInPlace tools/xenstat/Makefile \ --replace /usr/include/curses.h ${ncurses}/include/curses.h + substituteInPlace tools/ioemu-qemu-xen/xen-hooks.mak \ + --replace /usr/include/pci ${pciutils}/include/pci + # Work around a bug in our GCC wrapper: `gcc -MF foo -v' doesn't # print the GCC version number properly. substituteInPlace xen/Makefile \ diff --git a/pkgs/applications/window-managers/awesome/cmake284.patch b/pkgs/applications/window-managers/awesome/cmake284.patch deleted file mode 100644 index 4af70227805..00000000000 --- a/pkgs/applications/window-managers/awesome/cmake284.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 1aedd853fcaeeafadd24512f84e6e269f5db0b4e Mon Sep 17 00:00:00 2001 -From: Thomas Moschny -Date: Mon, 21 Feb 2011 17:58:04 +0100 -Subject: [PATCH] Normalize icon path names (fixes #869). - -The elements in ${icon_sources}, as returned by file(GLOB ...) contain -double slashes, could be a bug in cmake. This causes building with -cmake 2.8.4 to fail, due to dependency problems lateron. - -This patch works around the issue by normalizing all path names in -${icon_sources} while appending them to ${ALL_ICONS}, thereby removing -the double slashes. ---- - CMakeLists.txt | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 64be9b9..472bec2 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -244,14 +244,15 @@ endif() - - # {{{ Theme icons - file(GLOB icon_sources RELATIVE ${SOURCE_DIR} ${SOURCE_DIR}/themes/*/titlebar/*.png) --set(ALL_ICONS ${icon_sources}) - - foreach(icon ${icon_sources}) - # Copy all icons to the build dir to simplify the following code. - # Source paths are interpreted relative to ${SOURCE_DIR}, target paths - # relative to ${BUILD_DIR}. - get_filename_component(icon_path ${icon} PATH) -+ get_filename_component(icon_name ${icon} NAME) - file(COPY ${icon} DESTINATION ${icon_path}) -+ set(ALL_ICONS ${ALL_ICONS} "${icon_path}/${icon_name}") - endforeach() - - macro(a_icon_convert match replacement input) --- -1.7.3.4 - diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix index 5110e42fb18..5e24a42d3a7 100644 --- a/pkgs/applications/window-managers/awesome/default.nix +++ b/pkgs/applications/window-managers/awesome/default.nix @@ -6,7 +6,7 @@ , docbook_xml_dtd_45, libxslt, coreutils}: let - version = "3.4.11"; + version = "3.4.13"; in stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://awesome.naquadah.org/download/awesome-${version}.tar.xz"; - sha256 = "576b4f6d2c3f56dfbe52ad92f2eecece111f0f05816e32126cd03d4b4387761d"; + sha256 = "0jhsgb8wdzpfmdyl9fxp2w6app7l6zl8b513z3ff513nvdlxj5hr"; }; buildInputs = [ cmake gperf imagemagick pkgconfig lua glib cairo pango @@ -36,19 +36,9 @@ stdenv.mkDerivation rec { # asciidoc: FAILED: : line 3: section title expected # make[2]: *** [manpages/ru/man1/awesome.1.xml] Error 1 substituteInPlace CMakeLists.txt \ - --replace "set(AWE_MAN_LANGS es fr de ru)" \ - "set(AWE_MAN_LANGS es fr de)" + --replace "set(AWE_MAN_LANGS it es fr de ru)" \ + "set(AWE_MAN_LANGS it es fr de)" ''; - - # XXX: maybe not needed anymore - # Somehow libev does not get into the rpath, although it should. - # Something may be wrong in the gcc wrapper. - preBuild = '' - export NIX_LDFLAGS_BEFORE="-lev"; - ''; - - # Cmake fails strangely at finding lua. Looks to me like a cmake 2.8 error. - cmakeFlags = [ "-DLUA_LIBRARIES=${lua}/lib/liblua.a" ]; meta = { homepage = http://awesome.naquadah.org/; diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix index 04e50f80827..14fd6ce4193 100644 --- a/pkgs/applications/window-managers/i3/default.nix +++ b/pkgs/applications/window-managers/i3/default.nix @@ -13,18 +13,13 @@ stdenv.mkDerivation rec { buildInputs = [ which pkgconfig libxcb xcbutilkeysyms xcbutil bison xcbutilwm libstartup_notification libX11 pcre libev yajl flex libXcursor perl ]; - prePatch = '' - sed s,/usr/bin/env,${coreutils}/bin/env, -i generate-command-parser.pl - sed s,/usr/bin/env,${coreutils}/bin/env, -i i3-migrate-config-to-v4 - sed s,/usr/bin/env,${coreutils}/bin/env, -i i3-wsbar - ''; + patchPhase = "patchShebangs ."; - makeFlags = "all"; - installFlags = "PREFIX=\${out}"; + configurePhase = "makeFlags=PREFIX=$out"; meta = { description = "i3 is a tiling window manager"; - homepage = http://i3wm.org; + homepage = "http://i3wm.org"; maintainers = [ stdenv.lib.maintainers.garbas ]; license = stdenv.lib.licenses.bsd3; }; diff --git a/pkgs/applications/window-managers/ratpoison/default.nix b/pkgs/applications/window-managers/ratpoison/default.nix index 77a998b9f74..262b46190fb 100644 --- a/pkgs/applications/window-managers/ratpoison/default.nix +++ b/pkgs/applications/window-managers/ratpoison/default.nix @@ -9,44 +9,43 @@ stdenv.mkDerivation rec { sha256 = "7391079db20b8613eecfd81d64d243edc9d3c586750c8f2da2bb9db14d260f03"; }; - patches = - [ (fetchurl { - url = "http://git.savannah.gnu.org/cgit/ratpoison.git/patch/?id=4ad0b38fb53506d613c4b4f7268dadfcedae9b8e"; - sha256 = "118c5b481fa22b8fefbe34e3dbb157f621a3bf5de0c7beb540001c99ff403a5f"; - }) - ]; - - preConfigure = "autoreconf -vf"; # needed because of the patch above - - NIX_CFLAGS_COMPILE = "-I${freetype}/include/freetype2"; # urgh - buildInputs = [ libX11 inputproto libXt libXpm libXft fontconfig freetype libXtst xextproto readline libXi pkgconfig perl autoconf automake ]; + NIX_CFLAGS_COMPILE = "-I${freetype}/include/freetype2"; # urgh + + preConfigure = "autoreconf -vf"; # needed because of the patch above + + patches = [ ./glibc-fix.patch ]; + + postInstall = '' + mkdir -p $out/share/emacs/site-lisp + mv "$out/share/ratpoison/"*.el $out/share/emacs/site-lisp/ + ''; + meta = { + homepage = "http://www.nongnu.org/ratpoison/"; description = "Ratpoison, a simple mouse-free tiling window manager"; - longDescription = - '' Ratpoison is a simple window manager with no fat library - dependencies, no fancy graphics, no window decorations, and no - rodent dependence. It is largely modelled after GNU Screen which - has done wonders in the virtual terminal market. - - The screen can be split into non-overlapping frames. All windows - are kept maximized inside their frames to take full advantage of - your precious screen real estate. - - All interaction with the window manager is done through keystrokes. - Ratpoison has a prefix map to minimize the key clobbering that - cripples Emacs and other quality pieces of software. - ''; - license = "GPLv2+"; - homepage = http://www.nongnu.org/ratpoison/; + longDescription = '' + Ratpoison is a simple window manager with no fat library + dependencies, no fancy graphics, no window decorations, and no + rodent dependence. It is largely modelled after GNU Screen which + has done wonders in the virtual terminal market. + + The screen can be split into non-overlapping frames. All windows + are kept maximized inside their frames to take full advantage of + your precious screen real estate. + + All interaction with the window manager is done through keystrokes. + Ratpoison has a prefix map to minimize the key clobbering that + cripples Emacs and other quality pieces of software. + ''; maintainers = [ stdenv.lib.maintainers.ludo stdenv.lib.maintainers.simons ]; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/window-managers/ratpoison/glibc-fix.patch b/pkgs/applications/window-managers/ratpoison/glibc-fix.patch new file mode 100644 index 00000000000..c779d5af795 --- /dev/null +++ b/pkgs/applications/window-managers/ratpoison/glibc-fix.patch @@ -0,0 +1,22 @@ +From 4ad0b38fb53506d613c4b4f7268dadfcedae9b8e Mon Sep 17 00:00:00 2001 +From: Shawn Betts +Date: Mon, 13 Jul 2009 01:23:25 +0000 +Subject: check for getline in configure.in + +This fixes a build error encountered on glibc 2.10 systems +--- +diff --git a/configure.in b/configure.in +index 0c1b42c..08f4ee8 100644 +--- a/configure.in ++++ b/configure.in +@@ -146,7 +146,7 @@ AC_CHECK_HEADERS(unistd.h stdarg.h) + dnl Checks for typedefs, structures, and compiler characteristics. + + dnl Checks for library functions. +-AC_CHECK_FUNCS(getopt getopt_long setsid setpgid setpgrp putenv vsnprintf usleep) ++AC_CHECK_FUNCS(getopt getopt_long setsid setpgid setpgrp putenv vsnprintf usleep getline) + + AC_TYPE_SIGNAL + +-- +cgit v0.9.0.2 diff --git a/pkgs/applications/window-managers/trayer/default.nix b/pkgs/applications/window-managers/trayer/default.nix index ce66f7d9bcc..b8ecf81f7fc 100644 --- a/pkgs/applications/window-managers/trayer/default.nix +++ b/pkgs/applications/window-managers/trayer/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pkgconfig, gdk_pixbuf, gtk, libXmu }: stdenv.mkDerivation rec { - name = "trayer-1.1.3"; + name = "trayer-1.1.5"; buildInputs = [ pkgconfig gdk_pixbuf gtk libXmu ]; src = fetchurl { url = "https://github.com/sargon/trayer-srg/tarball/${name}"; name = "${name}.tar.gz"; - sha256 = "03be5ea47278ecdb6ffb1d3b5115a855a6eccd6aa6702b84e89ee047ddd76558"; + sha256 = "98804500188c0bb99c7389ebea4b2e4dfffa2f3d06dc97e633b4934cf7c29757"; }; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/build-support/buildenv/builder.pl b/pkgs/build-support/buildenv/builder.pl index 71502c9f668..08331b178f4 100755 --- a/pkgs/build-support/buildenv/builder.pl +++ b/pkgs/build-support/buildenv/builder.pl @@ -66,7 +66,7 @@ sub findFiles { unless (-d $target && ($oldTarget eq "" || -d $oldTarget)) { if ($ignoreCollisions) { - warn "collision between `$target' and `$oldTarget'"; + warn "collision between `$target' and `$oldTarget'" if $ignoreCollisions == 1; return; } else { die "collision between `$target' and `$oldTarget'"; @@ -122,7 +122,7 @@ while (scalar(keys %postponed) > 0) { my @pkgDirs = keys %postponed; %postponed = (); foreach my $pkgDir (sort @pkgDirs) { - addPkg($pkgDir, 1); + addPkg($pkgDir, 2); } } diff --git a/pkgs/build-support/cabal/default.nix b/pkgs/build-support/cabal/default.nix index 8ae8c06d513..42392aff60c 100644 --- a/pkgs/build-support/cabal/default.nix +++ b/pkgs/build-support/cabal/default.nix @@ -1,6 +1,6 @@ # generic builder for Cabal packages -{stdenv, fetchurl, lib, pkgconfig, ghc, Cabal, enableLibraryProfiling ? false} : +{ stdenv, fetchurl, lib, pkgconfig, ghc, Cabal, jailbreakCabal, enableLibraryProfiling ? false }: { mkDerivation = args : # arguments for the individual package, can modify the defaults @@ -86,7 +86,8 @@ configurePhase = '' eval "$preConfigure" - for i in Setup.hs Setup.lhs; do + ${lib.optionalString (lib.attrByPath ["jailbreak"] false self) "${jailbreakCabal}/bin/jailbreak-cabal ${self.pname}.cabal && " + }for i in Setup.hs Setup.lhs; do test -f $i && ghc --make $i done diff --git a/pkgs/build-support/fetchhg/default.nix b/pkgs/build-support/fetchhg/default.nix index bc27516f46d..537867f215b 100644 --- a/pkgs/build-support/fetchhg/default.nix +++ b/pkgs/build-support/fetchhg/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "hg-archive" + (if (name != null) then "-${name}" else ""); builder = ./builder.sh; - buildInputs = [mercurial nix]; + buildInputs = [mercurial]; # Nix <= 0.7 compatibility. id = md5; diff --git a/pkgs/build-support/fetchurl/default.nix b/pkgs/build-support/fetchurl/default.nix index ec3d45e652e..cc59dd7fab1 100644 --- a/pkgs/build-support/fetchurl/default.nix +++ b/pkgs/build-support/fetchurl/default.nix @@ -22,6 +22,21 @@ let then builtins.attrNames mirrors else [] /* backwards compatibility */; + impureEnvVars = [ + # We borrow these environment variables from the caller to allow + # easy proxy configuration. This is impure, but a fixed-output + # derivation like fetchurl is allowed to do so since its result is + # by definition pure. + "http_proxy" "https_proxy" "ftp_proxy" "all_proxy" "no_proxy" + + # This variable allows the user to pass additional options to curl + "NIX_CURL_FLAGS" + + # This variable allows the user to override hashedMirrors from the + # command-line. + "NIX_HASHED_MIRRORS" + ] ++ (map (site: "NIX_MIRRORS_${site}") sites); + in { # URL to fetch. @@ -83,23 +98,8 @@ stdenv.mkDerivation { if sha256 != "" then "sha256" else if sha1 != "" then "sha1" else "md5"; outputHash = if outputHash != "" then outputHash else if sha256 != "" then sha256 else if sha1 != "" then sha1 else md5; - - impureEnvVars = [ - # We borrow these environment variables from the caller to allow - # easy proxy configuration. This is impure, but a fixed-output - # derivation like fetchurl is allowed to do so since its result is - # by definition pure. - "http_proxy" "https_proxy" "ftp_proxy" "all_proxy" "no_proxy" - # This variable allows the user to pass additional options to curl - "NIX_CURL_FLAGS" - - # This variable allows the user to override hashedMirrors from the - # command-line. - "NIX_HASHED_MIRRORS" - ] ++ (map (site: "NIX_MIRRORS_${site}") sites); - - inherit showURLs mirrorsFile; + inherit showURLs mirrorsFile impureEnvVars; # Doing the download on a remote machine just duplicates network # traffic, so don't do that. diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix index 0491e4994b6..dd81692b5f2 100644 --- a/pkgs/build-support/fetchurl/mirrors.nix +++ b/pkgs/build-support/fetchurl/mirrors.nix @@ -24,9 +24,6 @@ rec { # GNU (http://www.gnu.org/prep/ftp.html). gnu = [ - # This one is the master repository, and thus it's always up-to-date. - http://ftp.gnu.org/pub/gnu/ - # This one redirects to a (supposedly) nearby and (supposedly) up-to-date # mirror. http://ftpmirror.gnu.org/ @@ -37,6 +34,9 @@ rec { ftp://ftp.cs.tu-berlin.de/pub/gnu/ ftp://ftp.chg.ru/pub/gnu/ ftp://ftp.funet.fi/pub/mirrors/ftp.gnu.org/gnu/ + + # This one is the master repository, and thus it's always up-to-date. + http://ftp.gnu.org/pub/gnu/ ]; # GCC. diff --git a/pkgs/build-support/gcc-wrapper/buildergo.sh b/pkgs/build-support/gcc-wrapper/buildergo.sh new file mode 100644 index 00000000000..cb6bfd7f051 --- /dev/null +++ b/pkgs/build-support/gcc-wrapper/buildergo.sh @@ -0,0 +1,194 @@ +source $stdenv/setup + + +mkdir -p $out/bin +mkdir -p $out/nix-support + + +if test -z "$nativeLibc"; then + dynamicLinker="$libc/lib/$dynamicLinker" + echo $dynamicLinker > $out/nix-support/dynamic-linker + + if test -e $libc/lib/32/ld-linux.so.2; then + echo $libc/lib/32/ld-linux.so.2 > $out/nix-support/dynamic-linker-m32 + fi + + # The "-B$libc/lib/" flag is a quick hack to force gcc to link + # against the crt1.o from our own glibc, rather than the one in + # /usr/lib. (This is only an issue when using an `impure' + # compiler/linker, i.e., one that searches /usr/lib and so on.) + # + # Unfortunately, setting -B appears to override the default search + # path. Thus, the gcc-specific "../includes-fixed" directory is + # now longer searched and glibc's header fails to + # compile, because it uses "#include_next " to find the + # limits.h file in ../includes-fixed. To remedy the problem, + # another -idirafter is necessary to add that directory again. + echo "-B$libc/lib/ -idirafter $libc/include -idirafter $gcc/lib/gcc/*/*/include-fixed" > $out/nix-support/libc-cflags + + echo "-L$libc/lib" > $out/nix-support/libc-ldflags + + # The dynamic linker is passed in `ldflagsBefore' to allow + # explicit overrides of the dynamic linker by callers to gcc/ld + # (the *last* value counts, so ours should come first). + echo "-dynamic-linker $dynamicLinker" > $out/nix-support/libc-ldflags-before +fi + +if test -n "$nativeTools"; then + gccPath="$nativePrefix/bin" + ldPath="$nativePrefix/bin" +else + if test -e "$gcc/lib64"; then + gccLDFlags="$gccLDFlags -L$gcc/lib64" + fi + gccLDFlags="$gccLDFlags -L$gcc/lib" + if [ -n "$langVhdl" ]; then + gccLDFlags="$gccLDFlags -L$zlib/lib" + fi + echo "$gccLDFlags" > $out/nix-support/gcc-ldflags + + # GCC shows $gcc/lib in `gcc -print-search-dirs', but not + # $gcc/lib64 (even though it does actually search there...).. + # This confuses libtool. So add it to the compiler tool search + # path explicitly. + if test -e "$gcc/lib64"; then + gccCFlags="$gccCFlags -B$gcc/lib64" + fi + + # Find the gcc libraries path (may work only without multilib) + if [ -n "$langAda" ]; then + basePath=`echo $gcc/lib/*/*/*` + gccCFlags="$gccCFlags -B$basePath -I$basePath/adainclude" + + gnatCFlags="-aI$basePath/adainclude -aO$basePath/adalib" + echo "$gnatCFlags" > $out/nix-support/gnat-cflags + fi + echo "$gccCFlags" > $out/nix-support/gcc-cflags + + gccPath="$gcc/bin" + ldPath="$binutils/bin" +fi + + +doSubstitute() { + local src=$1 + local dst=$2 + # Can't use substitute() here, because replace may not have been + # built yet (in the bootstrap). + sed \ + -e "s^@out@^$out^g" \ + -e "s^@shell@^$shell^g" \ + -e "s^@gcc@^$gcc^g" \ + -e "s^@gccProg@^$gccProg^g" \ + -e "s^@gnatProg@^$gnatProg^g" \ + -e "s^@gnatlinkProg@^$gnatlinkProg^g" \ + -e "s^@binutils@^$binutils^g" \ + -e "s^@coreutils@^$coreutils^g" \ + -e "s^@libc@^$libc^g" \ + -e "s^@ld@^$ldPath/ld^g" \ + < "$src" > "$dst" +} + + +# Make wrapper scripts around gcc, g++, and gfortran. Also make symlinks +# cc, c++, and f77. +mkGccWrapper() { + local dst=$1 + local src=$2 + + if ! test -f "$src"; then + echo "$src does not exist (skipping)" + return 1 + fi + + gccProg="$src" + doSubstitute "$gccWrapper" "$dst" + chmod +x "$dst" +} + +mkGnatWrapper() { + local dst=$1 + local src=$2 + + if ! test -f "$src"; then + echo "$src does not exist (skipping)" + return 1 + fi + + gnatProg="$src" + doSubstitute "$gnatWrapper" "$dst" + chmod +x "$dst" +} + +mkGnatLinkWrapper() { + local dst=$1 + local src=$2 + + if ! test -f "$src"; then + echo "$src does not exist (skipping)" + return 1 + fi + + gnatlinkProg="$src" + doSubstitute "$gnatlinkWrapper" "$dst" + chmod +x "$dst" +} + +if mkGccWrapper $out/bin/gcc $gccPath/gcc +then + ln -sv gcc $out/bin/cc +fi + +if mkGccWrapper $out/bin/g++ $gccPath/g++ +then + ln -sv g++ $out/bin/c++ +fi + +if mkGccWrapper $out/bin/gfortran $gccPath/gfortran +then + ln -sv gfortran $out/bin/g77 + ln -sv gfortran $out/bin/f77 +fi + +mkGccWrapper $out/bin/gcj $gccPath/gcj || true + +mkGccWrapper $out/bin/gccgo $gccPath/gccgo || true + +mkGccWrapper $out/bin/gnatgcc $gccPath/gnatgcc || true +mkGnatWrapper $out/bin/gnatmake $gccPath/gnatmake || true +mkGnatWrapper $out/bin/gnatbind $gccPath/gnatbind || true +mkGnatLinkWrapper $out/bin/gnatlink $gccPath/gnatlink || true + +if [ -f $gccPath/ghdl ]; then + ln -sf $gccPath/ghdl $out/bin/ghdl +fi + +# Create a symlink to as (the assembler). This is useful when a +# gcc-wrapper is installed in a user environment, as it ensures that +# the right assembler is called. +ln -s $ldPath/as $out/bin/as + + +# Make a wrapper around the linker. +doSubstitute "$ldWrapper" "$out/bin/ld" +chmod +x "$out/bin/ld" + + +# Emit a setup hook. Also store the path to the original GCC and +# Glibc. +test -n "$gcc" && echo $gcc > $out/nix-support/orig-gcc +test -n "$libc" && echo $libc > $out/nix-support/orig-libc + +doSubstitute "$addFlags" "$out/nix-support/add-flags.sh" + +doSubstitute "$setupHook" "$out/nix-support/setup-hook" + +cp -p $utils $out/nix-support/utils.sh + + +# Propagate the wrapped gcc so that if you install the wrapper, you get +# tools like gcov, the manpages, etc. as well (including for binutils +# and Glibc). +if test -z "$nativeTools"; then + echo $gcc $binutils $libc > $out/nix-support/propagated-user-env-packages +fi diff --git a/pkgs/build-support/gcc-wrapper/default.nix b/pkgs/build-support/gcc-wrapper/default.nix index d3fe5a0569f..5e50a5c7dfb 100644 --- a/pkgs/build-support/gcc-wrapper/default.nix +++ b/pkgs/build-support/gcc-wrapper/default.nix @@ -21,10 +21,11 @@ let gccVersion = (builtins.parseDrvName gcc.name).version; gccName = (builtins.parseDrvName gcc.name).name; - + + langGo = if nativeTools then false else gcc ? langGo && gcc.langGo; in -stdenv.mkDerivation { +stdenv.mkDerivation ({ name = (if name != "" then name else gccName + "-wrapper") + (if gcc != null && gccVersion != "" then "-" + gccVersion else ""); @@ -90,3 +91,9 @@ stdenv.mkDerivation { abort "don't know the name of the dynamic linker for this platform") else ""; } +# This go wrapper should be reworked in stdenv-updates. +// (if langGo then +{ + inherit langGo; + builder = ./buildergo.sh; +} else {})) diff --git a/pkgs/build-support/release/ant-build.nix b/pkgs/build-support/release/ant-build.nix index fe15f93a8fe..0cabdf2f7e7 100644 --- a/pkgs/build-support/release/ant-build.nix +++ b/pkgs/build-support/release/ant-build.nix @@ -8,8 +8,8 @@ , antProperties ? [] , antBuildInputs ? [] , buildfile ? "build.xml" -, ant ? pkgs.ant -, jre ? pkgs.jre +, ant ? pkgs.apacheAntOpenJDK +, jre ? pkgs.openjdk , hydraAntLogger ? pkgs.hydraAntLogger , ... } @ args: @@ -100,15 +100,10 @@ stdenv.mkDerivation ( postHook = '' mkdir -p $out/nix-support echo "$system" > $out/nix-support/system + . ${./functions.sh} - # If `src' is the result of a call to `makeSourceTarball', then it - # has a subdirectory containing the actual tarball(s). If there are - # multiple tarballs, just pick the first one. origSrc=$src - if test -d $src/tarballs; then - src=$(ls $src/tarballs/*.tar.bz2 $src/tarballs/*.tar.gz | sort | head -1) - fi - + src=$(findTarballs $src | head -1) ''; } ) diff --git a/pkgs/build-support/release/binary-tarball.nix b/pkgs/build-support/release/binary-tarball.nix index 6901c9f5555..41fab231ee3 100644 --- a/pkgs/build-support/release/binary-tarball.nix +++ b/pkgs/build-support/release/binary-tarball.nix @@ -35,14 +35,10 @@ stdenv.mkDerivation ( postHook = '' mkdir -p $out/nix-support echo "$system" > $out/nix-support/system + . ${./functions.sh} - # If `src' is the result of a call to `makeSourceTarball', then it - # has a subdirectory containing the actual tarball(s). If there are - # multiple tarballs, just pick the first one. origSrc=$src - if test -d $src/tarballs; then - src=$(ls $src/tarballs/*.tar.bz2 $src/tarballs/*.tar.gz | sort | head -1) - fi + src=$(findTarballs $src | head -1) if test -e $origSrc/nix-support/hydra-release-name; then releaseName=$(cat $origSrc/nix-support/hydra-release-name) diff --git a/pkgs/build-support/release/debian-build.nix b/pkgs/build-support/release/debian-build.nix index 0095a2ff881..feb15267f59 100644 --- a/pkgs/build-support/release/debian-build.nix +++ b/pkgs/build-support/release/debian-build.nix @@ -30,17 +30,10 @@ vmTools.runInLinuxImage (stdenv.mkDerivation ( # !!! cut&paste from rpm-build.nix postHook = '' - mkdir -p $out/nix-support - cat "$diskImage"/nix-support/full-name > $out/nix-support/full-name - - # If `src' is the result of a call to `makeSourceTarball', then it - # has a subdirectory containing the actual tarball(s). If there are - # multiple tarballs, just pick the first one. - echo $src - if test -d $src/tarballs; then - src=$(ls $src/tarballs/*.tar.bz2 $src/tarballs/*.tar.gz | sort | head -1) - fi - ''; # */ + . ${./functions.sh} + propagateImageName + src=$(findTarballs $src | head -1) # Find a tarball. + ''; installExtraDebsPhase = '' for i in $extraDebs; do diff --git a/pkgs/build-support/release/functions.sh b/pkgs/build-support/release/functions.sh new file mode 100644 index 00000000000..9f2d03519c8 --- /dev/null +++ b/pkgs/build-support/release/functions.sh @@ -0,0 +1,14 @@ +findTarballs() { + local suffix + test -d "$1/tarballs/" && { + for suffix in tar.gz tgz tar.bz2 tbz2 tar.xz tar.lzma; do + ls $1/tarballs/*.$suffix 2> /dev/null + done | sort + } + echo "$1" +} + +propagateImageName() { + ensureDir $out/nix-support + cat "$diskImage"/nix-support/full-name > $out/nix-support/full-name +} diff --git a/pkgs/build-support/release/nix-build.nix b/pkgs/build-support/release/nix-build.nix index 8abbca97875..336563ae285 100644 --- a/pkgs/build-support/release/nix-build.nix +++ b/pkgs/build-support/release/nix-build.nix @@ -58,13 +58,9 @@ stdenv.mkDerivation ( name = name + (if src ? version then "-" + src.version else ""); postHook = '' - # If `src' is the result of a call to `makeSourceTarball', then it - # has a subdirectory containing the actual tarball(s). If there are - # multiple tarballs, just pick the first one. + . ${./functions.sh} origSrc=$src - if test -d $src/tarballs; then - src=$(ls $src/tarballs/*.tar.bz2 $src/tarballs/*.tar.gz $src/tarballs/*.tar.xz | sort | head -1) - fi + src=$(findTarballs $src | head -1) # Set GCC flags for coverage analysis, if desired. if test -n "${toString doCoverageAnalysis}"; then diff --git a/pkgs/build-support/release/rpm-build.nix b/pkgs/build-support/release/rpm-build.nix index 9ec9ace0757..708b62302d5 100644 --- a/pkgs/build-support/release/rpm-build.nix +++ b/pkgs/build-support/release/rpm-build.nix @@ -14,16 +14,10 @@ vmTools.buildRPM ( name = name + "-" + diskImage.name + (if src ? version then "-" + src.version else ""); preBuild = '' - mkdir -p $out/nix-support - cat "$diskImage"/nix-support/full-name > $out/nix-support/full-name - - # If `src' is the result of a call to `makeSourceTarball', then it - # has a subdirectory containing the actual tarball(s). If there are - # multiple tarballs, just pick the first one. - if test -d $src/tarballs; then - src=$(ls $src/tarballs/*.tar.bz2 $src/tarballs/*.tar.gz | sort | head -1) - fi - ''; # */ + . ${./functions.sh} + propagateImageName + src=$(findTarballs $src | head -1) # Pick the first tarball. + ''; postInstall = '' declare -a rpms rpmNames @@ -36,12 +30,12 @@ vmTools.buildRPM ( done echo "installing ''${rpms[*]}..." - rpm -ip ''${rpms[*]} --excludepath /nix/store + rpm -Up ''${rpms[*]} --excludepath /nix/store eval "$postRPMInstall" echo "uninstalling ''${rpmNames[*]}..." - rpm -e ''${rpmNames[*]} + rpm -e ''${rpmNames[*]} --nodeps for i in $out/rpms/*/*.src.rpm; do echo "file srpm $i" >> $out/nix-support/hydra-build-products diff --git a/pkgs/build-support/upstream-updater/attrset-to-dir.sh b/pkgs/build-support/upstream-updater/attrset-to-dir.sh index 0e0c50e1259..2d99ef110a1 100755 --- a/pkgs/build-support/upstream-updater/attrset-to-dir.sh +++ b/pkgs/build-support/upstream-updater/attrset-to-dir.sh @@ -1,8 +1,8 @@ #! /bin/sh [ -n "$2" ] && NIXPKGS_ALL="$2"; -[ -z "$NIXPKGS_ALL" ] && [ -f "/etc/nixos/nixpkgs" ] && NIXPKGS_ALL="/etc/nixos/nixpkgs"; -[ -z "$NIXPKGS_ALL" ] && [ -f "$HOME/nixpkgs" ] && NIXPKGS_ALL="$HOME/nixpkgs"; +[ -z "$NIXPKGS_ALL" ] && [ -d "/etc/nixos/nixpkgs" ] && NIXPKGS_ALL="/etc/nixos/nixpkgs"; +[ -z "$NIXPKGS_ALL" ] && [ -d "$HOME/nixpkgs" ] && NIXPKGS_ALL="$HOME/nixpkgs"; [ -z "$NIXPKGS_ALL" ] && { echo "Cannot find Nixpkgs source. Please specify it via NIXPKGS_ALL or second command line argument" exit 1 diff --git a/pkgs/build-support/vm/deb/deb-closure.pl b/pkgs/build-support/vm/deb/deb-closure.pl index 5e4ea54c43f..1d41f89218b 100644 --- a/pkgs/build-support/vm/deb/deb-closure.pl +++ b/pkgs/build-support/vm/deb/deb-closure.pl @@ -53,6 +53,8 @@ foreach my $cdata (values %packages) { my @provides = getDeps(Dpkg::Deps::parse($cdata->{Provides})); foreach my $name (@provides) { #die "conflicting provide: $name\n" if defined $provides{$name}; + #warn "provide by $cdata->{Package} conflicts with package with the same name: $name\n"; + next if defined $packages{$name}; $provides{$name} = $cdata->{Package}; } } @@ -67,7 +69,7 @@ sub closePackage { my $pkgName = shift; print STDERR ">>> $pkgName\n"; my $cdata = $packages{$pkgName}; - + if (!defined $cdata) { die "unknown (virtual) package $pkgName" unless defined $provides{$pkgName}; @@ -75,7 +77,7 @@ sub closePackage { $pkgName = $provides{$pkgName}; $cdata = $packages{$pkgName}; } - + die "unknown package $pkgName" unless defined $cdata; return if defined $donePkgs{$pkgName}; $donePkgs{$pkgName} = 1; @@ -85,9 +87,9 @@ sub closePackage { $provides{$name} = $cdata->{Package}; } } - + my @depNames = (); - + if (defined $cdata->{Depends}) { print STDERR " $pkgName: $cdata->{Depends}\n"; my $deps = Dpkg::Deps::parse($cdata->{Depends}); @@ -141,7 +143,7 @@ foreach my $pkgName (@order) { my $origName = basename $cdata->{Filename}; my $cleanedName = $origName; $cleanedName =~ s/~//g; - + print " (fetchurl {\n"; print " url = $urlPrefix/$cdata->{Filename};\n"; print " sha256 = \"$cdata->{SHA256}\";\n"; @@ -165,4 +167,3 @@ if ($newComponent != 1) { print STDERR "argh: ", keys %forward, "\n"; exit 1; } - diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 6af4a5c0574..8781fbf2d10 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -34,7 +34,7 @@ rec { '' mkdir -p $out/bin mkdir -p $out/lib - + # Copy what we need from Glibc. cp -p ${pkgs.stdenv.glibc}/lib/ld-linux*.so.? $out/lib cp -p ${pkgs.stdenv.glibc}/lib/libc.so.* $out/lib @@ -60,7 +60,7 @@ rec { cp ${module_init_tools}/sbin/insmod $out/bin/insmod cp ${nettools}/sbin/ifconfig $out/bin cp ${sysvinit}/sbin/halt $out/bin - + # Run patchelf to make the programs refer to the copied libraries. for i in $out/bin/* $out/lib/*; do if ! test -L $i; then nuke-refs $i; fi; done @@ -70,17 +70,19 @@ rec { done ''; # */ - + createDeviceNodes = dev: '' - mknod ${dev}/null c 1 3 - mknod ${dev}/zero c 1 5 - mknod ${dev}/tty c 5 0 + mknod ${dev}/null c 1 3 + mknod ${dev}/zero c 1 5 + mknod ${dev}/random c 1 8 + mknod ${dev}/urandom c 1 9 + mknod ${dev}/tty c 5 0 . /sys/class/block/${hd}/uevent mknod ${dev}/${hd} b $MAJOR $MINOR ''; - + stage1Init = writeScript "vm-run-stage1" '' #! ${initrdUtils}/bin/bash -e echo START @@ -122,7 +124,7 @@ rec { mount -t tmpfs none /dev ${createDeviceNodes "/dev"} - + ifconfig eth0 up 10.0.2.15 mkdir /fs @@ -155,7 +157,7 @@ rec { mkdir -p /fs/etc ln -sf /proc/mounts /fs/etc/mtab - + echo "Now running: $command" test -n "$command" @@ -169,7 +171,7 @@ rec { halt -d -p -f ''; - + initrd = makeInitrd { contents = [ { object = stage1Init; @@ -178,11 +180,11 @@ rec { ]; }; - + stage2Init = writeScript "vm-run-stage2" '' #! ${bash}/bin/sh source /tmp/xchg/saved-env - + export NIX_STORE=/nix/store export NIX_BUILD_TOP=/tmp export TMPDIR=/tmp @@ -250,6 +252,7 @@ rec { path = $TMPDIR/xchg read only = no guest ok = yes + $EXTRA_SAMBA_CONF SMB rm -f ./samba @@ -285,12 +288,12 @@ rec { chmod +x ./run-vm source ./run-vm - + if ! test -e xchg/in-vm-exit; then echo "Virtual machine didn't produce an exit code." exit 1 fi - + eval "$postVM" exit $(cat xchg/in-vm-exit) @@ -342,7 +345,7 @@ rec { If the build fails and Nix is run with the `-K' option, a script `run-vm' will be left behind in the temporary build directory that allows you to boot into the VM and debug it interactively. */ - + runInLinuxVM = drv: lib.overrideDerivation drv (attrs: { requiredSystemFeatures = [ "kvm" ]; builder = "${bash}/bin/sh"; @@ -352,7 +355,7 @@ rec { QEMU_OPTS = "-m ${toString (if attrs ? memSize then attrs.memSize else 256)}"; }); - + extractFs = {file, fs ? null} : with pkgs; runInLinuxVM ( stdenv.mkDerivation { @@ -378,7 +381,7 @@ rec { ''; }); - + extractMTDfs = {file, fs ? null} : with pkgs; runInLinuxVM ( stdenv.mkDerivation { @@ -405,7 +408,7 @@ rec { ''; }); - + qemuCommandGeneric = '' PATH="${samba}/sbin:$PATH" \ ${kvm}/bin/qemu-kvm \ @@ -414,7 +417,7 @@ rec { $QEMU_OPTS ''; - + /* Run a command in an x86 virtual machine image containing an arbitrary OS. The VM should be configured to do the following: @@ -459,7 +462,7 @@ rec { the Nix store, but using the tools provided by /bin, /usr/bin etc. from the specified filesystem image, which typically is a filesystem containing a non-NixOS Linux distribution. */ - + runInLinuxImage = attrs: runInLinuxVM (attrs // { mountDisk = true; @@ -490,12 +493,12 @@ rec { /* Create a filesystem image of the specified size and fill it with a set of RPM packages. */ - + fillDiskWithRPMs = { size ? 4096, rpms, name, fullName, preInstall ? "", postInstall ? "" , runScripts ? true, createRootFS ? defaultCreateRootFS }: - + runInLinuxVM (stdenv.mkDerivation { inherit name preInstall postInstall rpms; memSize = 512; @@ -505,7 +508,7 @@ rec { ${createRootFS} chroot=$(type -tP chroot) - + echo "unpacking RPMs..." for i in $rpms; do echo "$i..." @@ -524,19 +527,19 @@ rec { mkdir -p /mnt/nix/store ${utillinux}/bin/mount -o bind /nix/store /mnt/nix/store ${utillinux}/bin/mount -o bind /tmp /mnt/tmp - + echo "installing RPMs..." PATH=/usr/bin:/bin:/usr/sbin:/sbin $chroot /mnt \ rpm -iv ${if runScripts then "" else "--noscripts"} $rpms echo "running post-install script..." eval "$postInstall" - + rm /mnt/.debug - ${utillinux}/bin/umount /mnt/nix/store - ${utillinux}/bin/umount /mnt/tmp - ${utillinux}/bin/umount /mnt + ${utillinux}/bin/umount /mnt/nix/store + ${utillinux}/bin/umount /mnt/tmp + ${utillinux}/bin/umount /mnt ''; passthru = { inherit fullName; }; @@ -545,7 +548,7 @@ rec { /* Generate a script that can be used to run an interactive session in the given image. */ - + makeImageTestScript = image: writeScript "image-test" '' #! ${bash}/bin/sh if test -z "$1"; then @@ -570,7 +573,7 @@ rec { /* Build RPM packages from the tarball `src' in the Linux distribution installed in the filesystem `diskImage'. The tarball must contain an RPM specfile. */ - + buildRPM = attrs: runInLinuxImage (stdenv.mkDerivation ({ phases = "prepareImagePhase sysInfoPhase buildPhase installPhase"; @@ -583,7 +586,7 @@ rec { done fi ''; - + sysInfoPhase = '' echo "System/kernel: $(uname -a)" if test -e /etc/fedora-release; then echo "Fedora release: $(cat /etc/fedora-release)"; fi @@ -592,7 +595,7 @@ rec { rpm -qa --qf "%{Name}-%{Version}-%{Release} (%{Arch}; %{Distribution}; %{Vendor})\n" stopNest ''; - + buildPhase = '' eval "$preBuild" @@ -609,7 +612,7 @@ rec { mkdir $rpmout $rpmout/SPECS $rpmout/BUILD $rpmout/RPMS $rpmout/SRPMS echo "%_topdir $rpmout" >> $HOME/.rpmmacros - + rpmbuild -vv -ta "$srcName" eval "$postBuild" @@ -639,7 +642,7 @@ rec { fillDiskWithDebs = { size ? 4096, debs, name, fullName, postInstall ? null, createRootFS ? defaultCreateRootFS }: - + runInLinuxVM (stdenv.mkDerivation { inherit name postInstall; @@ -655,7 +658,7 @@ rec { # Unpack the .debs. We do this to prevent pre-install scripts # (which have lots of circular dependencies) from barfing. echo "unpacking Debs..." - + for deb in $debs; do if test "$deb" != "|"; then echo "$deb..." @@ -668,7 +671,7 @@ rec { ${utillinux}/bin/mount -o bind /nix/store /mnt/inst/nix/store ${utillinux}/bin/mount -o bind /proc /mnt/proc ${utillinux}/bin/mount -o bind /dev /mnt/dev - + # Misc. files/directories assumed by various packages. echo "initialising Dpkg DB..." touch /mnt/etc/shells @@ -682,7 +685,7 @@ rec { echo "installing Debs..." export DEBIAN_FRONTEND=noninteractive - + oldIFS="$IFS" IFS="|" for component in $debs; do @@ -697,13 +700,13 @@ rec { PATH=/usr/bin:/bin:/usr/sbin:/sbin $chroot /mnt \ /usr/bin/dpkg --install --force-all $debs < /dev/null || true done - + echo "running post-install script..." eval "$postInstall" ln -sf dash /mnt/bin/sh rm /mnt/.debug - + ${utillinux}/bin/umount /mnt/inst/nix/store ${utillinux}/bin/umount /mnt/proc ${utillinux}/bin/umount /mnt/dev @@ -717,10 +720,10 @@ rec { /* Generate a Nix expression containing fetchurl calls for the closure of a set of top-level RPM packages from the `primary.xml.gz' file of a Fedora or openSUSE distribution. */ - + rpmClosureGenerator = {name, packagesLists, urlPrefixes, packages, archs ? []}: - assert (builtins.length packagesLists) == (builtins.length urlPrefixes) ; + assert (builtins.length packagesLists) == (builtins.length urlPrefixes); runCommand "${name}.nix" {buildInputs = [perl perlPackages.XMLSimple]; inherit archs;} '' ${lib.concatImapStrings (i: pl: '' gunzip < ${pl} > ./packages_${toString i}.xml @@ -734,7 +737,7 @@ rec { /* Helper function that combines rpmClosureGenerator and fillDiskWithRPMs to generate a disk image from a set of package names. */ - + makeImageFromRPMDist = { name, fullName, size ? 4096 , urlPrefix ? "", urlPrefixes ? [urlPrefix] @@ -756,10 +759,13 @@ rec { (i.e. generate a closure from a Packages.bz2 file). */ debClosureGenerator = - {name, packagesList, urlPrefix, packages}: - + {name, packagesLists, urlPrefix, packages}: + runCommand "${name}.nix" {} '' - bunzip2 < ${packagesList} > ./Packages + for i in ${toString packagesLists}; do + echo "adding $i..." + bunzip2 < $i >> ./Packages + done # Work around this bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=452279 sed -i ./Packages -e s/x86_64-linux-gnu/x86-64-linux-gnu/g @@ -767,19 +773,20 @@ rec { ${perl}/bin/perl -I${dpkg} -w ${deb/deb-closure.pl} \ ./Packages ${urlPrefix} ${toString packages} > $out ''; - + /* Helper function that combines debClosureGenerator and fillDiskWithDebs to generate a disk image from a set of package names. */ - + makeImageFromDebDist = - { name, fullName, size ? 4096, urlPrefix, packagesList + { name, fullName, size ? 4096, urlPrefix + , packagesList ? "", packagesLists ? [packagesList] , packages, extraPackages ? [], postInstall ? "" }: let expr = debClosureGenerator { - inherit name packagesList urlPrefix; + inherit name packagesLists urlPrefix; packages = packages ++ extraPackages; }; in @@ -790,7 +797,7 @@ rec { /* The set of supported RPM-based distributions. */ - + rpmDistros = { fedora2i386 = { @@ -817,7 +824,7 @@ rec { runScripts = false; packages = commonFedoraPackages; }; - + fedora5i386 = { name = "fedora-core-5-i386"; fullName = "Fedora Core 5 (i386)"; @@ -828,7 +835,7 @@ rec { urlPrefix = mirror://fedora/linux/core/5/i386/os; packages = commonFedoraPackages ++ [ "util-linux" ]; }; - + fedora7i386 = { name = "fedora-7-i386"; fullName = "Fedora 7 (i386)"; @@ -839,7 +846,7 @@ rec { urlPrefix = mirror://fedora/linux/releases/7/Everything/i386/os; packages = commonFedoraPackages; }; - + fedora8i386 = { name = "fedora-8-i386"; fullName = "Fedora 8 (i386)"; @@ -1057,9 +1064,9 @@ rec { /* The set of supported Dpkg-based distributions. */ - + debDistros = { - + # Interestingly, the SHA-256 hashes provided by Ubuntu in # http://nl.archive.ubuntu.com/ubuntu/dists/{gutsy,hardy}/Release are # wrong, but the SHA-1 and MD5 hashes are correct. Intrepid is fine. @@ -1074,7 +1081,7 @@ rec { urlPrefix = mirror://ubuntu; packages = commonDebianPackages; }; - + ubuntu804i386 = { name = "ubuntu-8.04-hardy-i386"; fullName = "Ubuntu 8.04 Hardy (i386)"; @@ -1085,7 +1092,7 @@ rec { urlPrefix = mirror://ubuntu; packages = commonDebianPackages; }; - + ubuntu804x86_64 = { name = "ubuntu-8.04-hardy-amd64"; fullName = "Ubuntu 8.04 Hardy (amd64)"; @@ -1096,7 +1103,7 @@ rec { urlPrefix = mirror://ubuntu; packages = commonDebianPackages; }; - + ubuntu810i386 = { name = "ubuntu-8.10-intrepid-i386"; fullName = "Ubuntu 8.10 Intrepid (i386)"; @@ -1107,7 +1114,7 @@ rec { urlPrefix = mirror://ubuntu; packages = commonDebianPackages; }; - + ubuntu810x86_64 = { name = "ubuntu-8.10-intrepid-amd64"; fullName = "Ubuntu 8.10 Intrepid (amd64)"; @@ -1129,7 +1136,7 @@ rec { urlPrefix = mirror://ubuntu; packages = commonDebianPackages; }; - + ubuntu904x86_64 = { name = "ubuntu-9.04-jaunty-amd64"; fullName = "Ubuntu 9.04 Jaunty (amd64)"; @@ -1151,11 +1158,11 @@ rec { urlPrefix = mirror://ubuntu; packages = commonDebPackages ++ [ "diff" "mktemp" ]; }; - + ubuntu910x86_64 = { name = "ubuntu-9.10-karmic-amd64"; fullName = "Ubuntu 9.10 Karmic (amd64)"; - packagesList = fetchurl { + packagesList = fetchurl { url = mirror://ubuntu/dists/karmic/main/binary-amd64/Packages.bz2; sha256 = "3a604fcb0c135eeb8b95da3e90a8fd4cfeff519b858cd3c9e62ea808cb9fec40"; }; @@ -1173,7 +1180,7 @@ rec { urlPrefix = mirror://ubuntu; packages = commonDebPackages ++ [ "diffutils" "mktemp" ]; }; - + ubuntu1004x86_64 = { name = "ubuntu-10.04-lucid-amd64"; fullName = "Ubuntu 10.04 Lucid (amd64)"; @@ -1195,7 +1202,7 @@ rec { urlPrefix = mirror://ubuntu; packages = commonDebPackages ++ [ "diffutils" ]; }; - + ubuntu1010x86_64 = { name = "ubuntu-10.04-maverick-amd64"; fullName = "Ubuntu 10.04 Maverick (amd64)"; @@ -1217,7 +1224,7 @@ rec { urlPrefix = mirror://ubuntu; packages = commonDebPackages ++ [ "diffutils" ]; }; - + ubuntu1110x86_64 = { name = "ubuntu-11.10-oneiric-amd64"; fullName = "Ubuntu 11.10 Oneiric (amd64)"; @@ -1230,23 +1237,35 @@ rec { }; ubuntu1204i386 = { - name = "ubuntu-12.04-oneiric-i386"; + name = "ubuntu-12.04-precise-i386"; fullName = "Ubuntu 12.04 Precise (i386)"; - packagesList = fetchurl { - url = mirror://ubuntu/dists/precise/main/binary-i386/Packages.bz2; - sha256 = "18ns9h4qhvjfcip9z55grzi371racxavgqkp6b5kfkdq2wwwax2d"; - }; + packagesLists = + [ (fetchurl { + url = mirror://ubuntu/dists/precise/main/binary-i386/Packages.bz2; + sha256 = "18ns9h4qhvjfcip9z55grzi371racxavgqkp6b5kfkdq2wwwax2d"; + }) + (fetchurl { + url = mirror://ubuntu/dists/precise/universe/binary-i386/Packages.bz2; + sha256 = "085lkzbnzkc74kfdmwdc32sfqyfz8dr0rbiifk8kx9jih3xjw2jk"; + }) + ]; urlPrefix = mirror://ubuntu; packages = commonDebPackages ++ [ "diffutils" ]; }; - + ubuntu1204x86_64 = { - name = "ubuntu-12.04-oneiric-amd64"; + name = "ubuntu-12.04-precise-amd64"; fullName = "Ubuntu 12.04 Precise (amd64)"; - packagesList = fetchurl { - url = mirror://ubuntu/dists/precise/main/binary-amd64/Packages.bz2; - sha256 = "1aabpn0hdih6cbabyn87yvhccqj44q9k03mqmjsb920iqlckl3fc"; - }; + packagesList = + [ (fetchurl { + url = mirror://ubuntu/dists/precise/main/binary-amd64/Packages.bz2; + sha256 = "1aabpn0hdih6cbabyn87yvhccqj44q9k03mqmjsb920iqlckl3fc"; + }) + (fetchurl { + url = mirror://ubuntu/dists/precise/universe/binary-amd64/Packages.bz2; + sha256 = "0x4hz5aplximgb7gnpvrhkw8m7a40s80rkm5b8hil0afblwlg4vr"; + }) + ]; urlPrefix = mirror://ubuntu; packages = commonDebPackages ++ [ "diffutils" ]; }; @@ -1261,7 +1280,7 @@ rec { urlPrefix = mirror://debian; packages = commonDebianPackages; }; - + debian40x86_64 = { name = "debian-4.0r9-etch-amd64"; fullName = "Debian 4.0r9 Etch (amd64)"; @@ -1305,7 +1324,7 @@ rec { urlPrefix = mirror://debian; packages = commonDebianPackages; }; - + debian60x86_64 = { name = "debian-6.0.4-squeeze-amd64"; fullName = "Debian 6.0.4 Squeeze (amd64)"; @@ -1343,7 +1362,7 @@ rec { "unzip" ]; - + /* Common packages for openSUSE images. */ commonOpenSUSEPackages = [ "aaa_base" @@ -1387,7 +1406,7 @@ rec { "patch" "locales" # Needed by checkinstall: - "util-linux" + "util-linux" "file" "dpkg-dev" "pkg-config" @@ -1397,7 +1416,7 @@ rec { ]; commonDebianPackages = commonDebPackages ++ [ "sysvinit" "diff" "mktemp" ]; - + /* A set of functions that build the Linux distributions specified in `rpmDistros' and `debDistros'. For instance, @@ -1411,29 +1430,29 @@ rec { `diskImageFuns.ubuntu1004x86_64 { extraPackages = ["firefox"]; size = 8192; }' builds an 8 GiB image containing Firefox in addition to the default packages. */ - diskImageFuns = + diskImageFuns = (lib.mapAttrs (name: as: as2: makeImageFromRPMDist (as // as2)) rpmDistros) // (lib.mapAttrs (name: as: as2: makeImageFromDebDist (as // as2)) debDistros); - + /* Shorthand for `diskImageFuns. { extraPackages = ... }'. */ diskImageExtraFuns = lib.mapAttrs (name: f: extraPackages: f { inherit extraPackages; }) diskImageFuns; - + /* Default disk images generated from the `rpmDistros' and `debDistros' sets (along with Red Hat 9 and SuSE 9.0 images). */ diskImages = lib.mapAttrs (name: f: f {}) diskImageFuns // - + { redhat9i386 = fillDiskWithRPMs { name = "redhat-9-i386"; fullName = "Red Hat Linux 9 (i386)"; size = 1024; rpms = import ./rpm/redhat-9-i386.nix {inherit fetchurl;}; }; - + suse90i386 = fillDiskWithRPMs { name = "suse-9.0-i386"; fullName = "SUSE Linux 9.0 (i386)"; @@ -1453,7 +1472,7 @@ rec { echo 'video:x:33:' >> /mnt/etc/group ''; }; - + }; - + } diff --git a/pkgs/data/documentation/man-pages/default.nix b/pkgs/data/documentation/man-pages/default.nix index 0aca88a46c0..f9e4f1b4371 100644 --- a/pkgs/data/documentation/man-pages/default.nix +++ b/pkgs/data/documentation/man-pages/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "man-pages-3.41"; + name = "man-pages-3.42"; src = fetchurl { url = "mirror://kernel/linux/docs/man-pages/Archive/${name}.tar.xz"; - sha256 = "1fldlsw51al9cvmz8dixrfv2j80bamjd5bzxsa66cvhc48n8p2nf"; + sha256 = "11kh0ifzqbxk797lq037ixqhpf6h90w9xxygzh796mddg4rr4s9j"; }; preBuild = diff --git a/pkgs/data/fonts/lmodern/lmmath.nix b/pkgs/data/fonts/lmodern/lmmath.nix new file mode 100644 index 00000000000..651a84726af --- /dev/null +++ b/pkgs/data/fonts/lmodern/lmmath.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, unzip }: + +stdenv.mkDerivation { + name = "lmmath-0.903"; + + src = fetchurl { + url = "http://www.gust.org.pl/projects/e-foundry/lm-math/download/lmmath0903otf"; + sha256 = "ee96cb14f5c746d6c6b9ecfbdf97dafc2f535be3dd277e15e8ea6fb594995d64"; + name = "lmmath-0.903.zip"; + }; + + buildInputs = [unzip]; + + sourceRoot = "."; + + installPhase = '' + mkdir -p $out/texmf/fonts/opentype + mkdir -p $out/share/fonts/opentype + + cp *.{OTF,otf} $out/texmf/fonts/opentype/lmmath-regular.otf + cp *.{OTF,otf} $out/share/fonts/opentype/lmmath-regular.otf + + ln -s $out/texmf* $out/share/ + ''; + + meta = { + description = "Latin Modern font"; + }; +} + diff --git a/pkgs/data/fonts/tipa/default.nix b/pkgs/data/fonts/tipa/default.nix new file mode 100644 index 00000000000..47e98f7c53a --- /dev/null +++ b/pkgs/data/fonts/tipa/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation { + name = "tipa-1.3"; + + src = fetchurl { + url = "mirror://debian/pool/main/t/tipa/tipa_1.3.orig.tar.gz"; + sha256 = "1q1sisxdcd2zd9b7mnagr2mxf9v3n1r4s5892zx5ly4r0niyya9m"; + }; + + installPhase = '' + export PREFIX="$out/texmf" + mkdir -p "$PREFIX" "$out/share" + make install PREFIX="$PREFIX" + + ln -s $out/texmf* $out/share/ + ''; + + meta = { + description = "Phonetic font for TeX"; + }; +} + + diff --git a/pkgs/data/misc/cacert/default.nix b/pkgs/data/misc/cacert/default.nix index 4db1e84b485..7349ab3e982 100644 --- a/pkgs/data/misc/cacert/default.nix +++ b/pkgs/data/misc/cacert/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "cacert-20110902"; + name = "cacert-20120628"; src = fetchurl { url = "http://nixos.org/tarballs/${name}.pem.bz2"; - sha256 = "05vwziwrckgdg4l029jsb8apj65lcvk0rfcyyrvz34m2znk0vlmi"; + sha256 = "0xg9f1w2pmsv221lgc60c07bs0xf2rr189a2yp2y9an95h3gx7ir"; }; unpackPhase = "true"; diff --git a/pkgs/data/misc/hicolor-icon-theme/default.nix b/pkgs/data/misc/hicolor-icon-theme/default.nix index e249dac1dc9..553665396ec 100644 --- a/pkgs/data/misc/hicolor-icon-theme/default.nix +++ b/pkgs/data/misc/hicolor-icon-theme/default.nix @@ -11,5 +11,6 @@ stdenv.mkDerivation rec { meta = { description = "Default fallback theme used by implementations of the icon theme specification"; homepage = http://icon-theme.freedesktop.org/releases/; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/data/misc/mobile-broadband-provider-info/default.nix b/pkgs/data/misc/mobile-broadband-provider-info/default.nix index 830e0ffa68a..52e9ebf0617 100644 --- a/pkgs/data/misc/mobile-broadband-provider-info/default.nix +++ b/pkgs/data/misc/mobile-broadband-provider-info/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: let - version = "20110511"; + version = "20120614"; pname = "mobile-broadband-provider-info"; name = "${pname}-${version}"; in @@ -9,8 +9,8 @@ stdenv.mkDerivation rec { inherit name; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${version}/${name}.tar.bz2"; - sha256 = "0cny8bd6kdwvabnwdr00f4wp4xjbc8ynp0kcdg72c1q9186kdikj"; + url = "mirror://gnome/sources/${pname}/${version}/${name}.tar.xz"; + sha256 = "72507a732e0cd16cf27424bb094b1c7a03e2206c119ad124722a283e587755f1"; }; meta = { diff --git a/pkgs/data/misc/shared-desktop-ontologies/default.nix b/pkgs/data/misc/shared-desktop-ontologies/default.nix index 39fcc6d1a68..23a800f6ae0 100644 --- a/pkgs/data/misc/shared-desktop-ontologies/default.nix +++ b/pkgs/data/misc/shared-desktop-ontologies/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake }: stdenv.mkDerivation rec { - name = "shared-desktop-ontologies-0.8.1"; + name = "shared-desktop-ontologies-0.10.0"; src = fetchurl { url = "mirror://sourceforge/oscaf/${name}.tar.bz2"; - sha256 = "0w6rhhfjl5r6gv2jw3nc1sj5l4fxz4s1wv0iclcrak3wa5vyy6h3"; + sha256 = "00y55bjmxrwiiw8q0n0jcv95l945hp7nglbwj408sk5m2vq026di"; }; buildInputs = [ cmake ]; diff --git a/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix b/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix index 3d47ed56787..c65c8b98c6a 100644 --- a/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix +++ b/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix @@ -13,9 +13,10 @@ stdenv.mkDerivation rec { phases = "unpackPhase configurePhase buildPhase installPhase"; - # You should be using WAF instead; see the file INSTALL.WAF + # WAF is probably the biggest crap on this planet, btw i removed the /gtk-2.0 path thingy configurePhase = '' - python waf configure --prefix=$out + sed -e "s@{PYTHONDIR}/gtk-2.0@{PYTHONDIR}/@" -i gconf/wscript + python waf configure --prefix=$out ''; buildPhase = '' @@ -35,4 +36,4 @@ stdenv.mkDerivation rec { description = "Python wrapper for gconf"; maintainers = [ stdenv.lib.maintainers.qknight ]; }; -} \ No newline at end of file +} diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix index 943dbc9a500..36d0860caa5 100644 --- a/pkgs/desktops/gnome-2/default.nix +++ b/pkgs/desktops/gnome-2/default.nix @@ -44,6 +44,8 @@ gnome_mime_data = callPackage ./platform/gnome-mime-data { }; + gnome_python = callPackage ./bindings/gnome-python { }; + gnome_vfs = callPackage ./platform/gnome-vfs { }; gnome_vfs_monikers = callPackage ./platform/gnome-vfs-monikers { }; @@ -115,6 +117,4 @@ libglademm = callPackage ./bindings/libglademm { }; - gnome_python = callPackage ./bindings/gnome-python { }; - } diff --git a/pkgs/desktops/gnome-2/desktop/gnome-icon-theme/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-icon-theme/default.nix index a16dfb14d22..a1dbf78bba2 100644 --- a/pkgs/desktops/gnome-2/desktop/gnome-icon-theme/default.nix +++ b/pkgs/desktops/gnome-2/desktop/gnome-icon-theme/default.nix @@ -1,12 +1,14 @@ -{ stdenv, fetchurl, pkgconfig, intltool, iconnamingutils }: +{ stdenv, fetchurl, pkgconfig, intltool, iconnamingutils, gtk }: stdenv.mkDerivation rec { - name = "gnome-icon-theme-2.30.3"; + #name = "gnome-icon-theme-3.4.0"; + name = "gnome-icon-theme-2.91.93"; src = fetchurl { - url = mirror://gnome/sources/gnome-icon-theme/2.30/gnome-icon-theme-2.30.3.tar.bz2; - sha256 = "1iysjfw3rajv9skdhshwcbjsm4jrsl6sfvqzrfynsfl4fyfjyzj1"; + #url = "mirror://gnome/sources/gnome-icon-theme/3.4/${name}.tar.xz"; + url = "mirror://gnome/sources/gnome-icon-theme/2.91/${name}.tar.bz2"; + sha256 = "cc7f15e54e2640697b58c26e74cc3f6ebadeb4ef6622bffe9c1e6874cc3478d6"; }; - buildNativeInputs = [ pkgconfig intltool iconnamingutils ]; + buildNativeInputs = [ pkgconfig intltool iconnamingutils gtk ]; } diff --git a/pkgs/desktops/kde-4.7/kde-workspace.nix b/pkgs/desktops/kde-4.7/kde-workspace.nix index 20fc5b56455..8116f4bb6b5 100644 --- a/pkgs/desktops/kde-4.7/kde-workspace.nix +++ b/pkgs/desktops/kde-4.7/kde-workspace.nix @@ -27,6 +27,8 @@ kde { --replace /usr/share/X11 ${xkeyboard_config}/etc/X11 ''; + enableParallelBuilding = false; + meta = { description = "KDE workspace components such as Plasma, Kwin and System Settings"; license = "GPLv2"; diff --git a/pkgs/desktops/kde-4.8/support/akonadi/default.nix b/pkgs/desktops/kde-4.8/support/akonadi/default.nix index db0608ead3f..b939eb19b5e 100644 --- a/pkgs/desktops/kde-4.8/support/akonadi/default.nix +++ b/pkgs/desktops/kde-4.8/support/akonadi/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake, qt4, shared_mime_info, libxslt, boost, automoc4, soprano }: stdenv.mkDerivation rec { - name = "akonadi-1.7.0"; + name = "akonadi-1.7.2"; src = fetchurl { url = "mirror://kde/stable/akonadi/src/${name}.tar.bz2"; - sha256 = "105mjr6n1g6kl0djp2l8jr8b7j4s9gy2ls43g1wf3py1hf6j5fdz"; + sha256 = "07rbhc8aa3d896j2r64ljv3amd6s4xhlbgq7kx99m1f68yl1fwjb"; }; buildInputs = [ qt4 soprano libxslt boost ]; diff --git a/pkgs/desktops/xfce-4.8/support/gvfs.nix b/pkgs/desktops/xfce-4.8/support/gvfs.nix index 6e50e6825dd..33f7315a9d9 100644 --- a/pkgs/desktops/xfce-4.8/support/gvfs.nix +++ b/pkgs/desktops/xfce-4.8/support/gvfs.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, dbus, intltool, udev, libgdu }: +{ stdenv, fetchurl, pkgconfig, glib, dbus, intltool, udev, libgdu, fuse }: stdenv.mkDerivation rec { name = "gvfs-1.8.2"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0895ac8f6d416e1b15433b6b6b68eb119c6e8b04fdb66db665d684355ef89345"; }; - buildInputs = [ pkgconfig glib dbus.libs intltool udev libgdu ]; + buildInputs = [ pkgconfig glib dbus.libs intltool udev libgdu fuse ]; meta = { description = "Virtual Filesystem support library (for Xfce)"; diff --git a/pkgs/development/compilers/dev86/default.nix b/pkgs/development/compilers/dev86/default.nix index 0dfb0be96f9..539588ac3ad 100644 --- a/pkgs/development/compilers/dev86/default.nix +++ b/pkgs/development/compilers/dev86/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation { - name = "dev86-0.16.18"; + name = "dev86-0.16.19"; src = fetchurl { - url = http://www.debath.co.uk/dev86/Dev86src-0.16.18.tar.gz; - sha256 = "1wcg2x8i2fq7kqgazx2il3qfmikyi4kfb23vm45yxlwq72l55604"; + url = http://www.debath.co.uk/dev86/Dev86src-0.16.19.tar.gz; + sha256 = "33398b87ca85e2b69e4062cf59f2f7354af46da5edcba036c6f97bae17b8d00e"; }; makeFlags = "PREFIX=$(out)"; diff --git a/pkgs/development/compilers/gcc/4.5/default.nix b/pkgs/development/compilers/gcc/4.5/default.nix index b3c639c6f0a..9cf38718a47 100644 --- a/pkgs/development/compilers/gcc/4.5/default.nix +++ b/pkgs/development/compilers/gcc/4.5/default.nix @@ -40,7 +40,7 @@ assert libelf != null -> zlib != null; with stdenv.lib; with builtins; -let version = "4.5.3"; +let version = "4.5.4"; javaEcj = fetchurl { # The `$(top_srcdir)/ecj.jar' file is automatically picked up at # `configure' time. diff --git a/pkgs/development/compilers/gcc/4.5/sources.nix b/pkgs/development/compilers/gcc/4.5/sources.nix index acf1ec2971c..71e1e483cac 100644 --- a/pkgs/development/compilers/gcc/4.5/sources.nix +++ b/pkgs/development/compilers/gcc/4.5/sources.nix @@ -1,26 +1,26 @@ /* Automatically generated by `update-gcc.sh', do not edit. - For GCC 4.5.3. */ + For GCC 4.5.4. */ { fetchurl, optional, version, langC, langCC, langFortran, langJava, langAda }: -assert version == "4.5.3"; +assert version == "4.5.4"; optional /* langC */ true (fetchurl { url = "mirror://gcc/releases/gcc-${version}/gcc-core-${version}.tar.bz2"; - sha256 = "fef7ef1396d41f4af2dacbea8826a895060a8a72d9f05546c091085b036f1f87"; + sha256 = "894d90f72cbfc8707e330fa2b1847c443fa97cf9b7f26e86be554709510e624a"; }) ++ optional langCC (fetchurl { url = "mirror://gcc/releases/gcc-${version}/gcc-g++-${version}.tar.bz2"; - sha256 = "e088b9fe0016070da921f353ef8c0c2f81fd11d21e3aeb09210ab7bad080804b"; + sha256 = "f7e3bab5e22713fbce46c2acb35fb727748473a34a942ce00393d75e1b09b6b9"; }) ++ optional langFortran (fetchurl { url = "mirror://gcc/releases/gcc-${version}/gcc-fortran-${version}.tar.bz2"; - sha256 = "618e8a2334eb3e2baf00891e9b2da47f32e797520e230acddb5f02fada0006cd"; + sha256 = "cf0803b4f5334a526dd8da1b2171d6724f50c17346b2d5c509b6abc973d2ef34"; }) ++ optional langJava (fetchurl { url = "mirror://gcc/releases/gcc-${version}/gcc-java-${version}.tar.bz2"; - sha256 = "c687198d4882c9d505eeb406595dad041602a5b6c67da5cf15d4941b34d20144"; + sha256 = "c98398da6f8c4c7d1758e291089d99853fdd27112cd3f146b7a8c26e6d762a23"; }) ++ optional langAda (fetchurl { url = "mirror://gcc/releases/gcc-${version}/gcc-ada-${version}.tar.bz2"; - sha256 = "686a6d2453bc325f32ddc90edf86502dc68320c7cd6948d60d93d0b0f5965b8f"; + sha256 = "8abddae15be65572b4d639bd9818057019bb4a45da4decfc6451511c8d580c5e"; }) ++ [] diff --git a/pkgs/development/compilers/gcc/4.7/builder.sh b/pkgs/development/compilers/gcc/4.7/builder.sh new file mode 100644 index 00000000000..4ae7a1c193b --- /dev/null +++ b/pkgs/development/compilers/gcc/4.7/builder.sh @@ -0,0 +1,249 @@ +source $stdenv/setup + + +export NIX_FIXINC_DUMMY=$NIX_BUILD_TOP/dummy +mkdir $NIX_FIXINC_DUMMY + + +if test "$staticCompiler" = "1"; then + EXTRA_LDFLAGS="-static" +else + EXTRA_LDFLAGS="" +fi + +# GCC interprets empty paths as ".", which we don't want. +if test -z "$CPATH"; then unset CPATH; fi +if test -z "$LIBRARY_PATH"; then unset LIBRARY_PATH; fi +echo "\$CPATH is \`$CPATH'" +echo "\$LIBRARY_PATH is \`$LIBRARY_PATH'" + +if test "$noSysDirs" = "1"; then + + if test -e $NIX_GCC/nix-support/orig-libc; then + + # Figure out what extra flags to pass to the gcc compilers + # being generated to make sure that they use our glibc. + extraFlags="$(cat $NIX_GCC/nix-support/libc-cflags)" + extraLDFlags="$(cat $NIX_GCC/nix-support/libc-ldflags) $(cat $NIX_GCC/nix-support/libc-ldflags-before)" + + # Use *real* header files, otherwise a limits.h is generated + # that does not include Glibc's limits.h (notably missing + # SSIZE_MAX, which breaks the build). + export NIX_FIXINC_DUMMY=$(cat $NIX_GCC/nix-support/orig-libc)/include + + # The path to the Glibc binaries such as `crti.o'. + glibc_libdir="$(cat $NIX_GCC/nix-support/orig-libc)/lib" + + else + # Hack: support impure environments. + extraFlags="-isystem /usr/include" + extraLDFlags="-L/usr/lib64 -L/usr/lib" + glibc_libdir="/usr/lib" + export NIX_FIXINC_DUMMY=/usr/include + fi + + extraFlags="-I$NIX_FIXINC_DUMMY $extraFlags" + extraLDFlags="-L$glibc_libdir -rpath $glibc_libdir $extraLDFlags" + + # BOOT_CFLAGS defaults to `-g -O2'; since we override it below, + # make sure to explictly add them so that files compiled with the + # bootstrap compiler are optimized and (optionally) contain + # debugging information (info "(gccinstall) Building"). + if test -n "$dontStrip"; then + extraFlags="-O2 -g $extraFlags" + else + # Don't pass `-g' at all; this saves space while building. + extraFlags="-O2 $extraFlags" + fi + + EXTRA_FLAGS="$extraFlags" + for i in $extraLDFlags; do + EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,$i" + done + + if test -n "$targetConfig"; then + # Cross-compiling, we need gcc not to read ./specs in order to build + # the g++ compiler (after the specs for the cross-gcc are created). + # Having LIBRARY_PATH= makes gcc read the specs from ., and the build + # breaks. Having this variable comes from the default.nix code to bring + # gcj in. + unset LIBRARY_PATH + unset CPATH + if test -z "$crossStageStatic"; then + EXTRA_TARGET_CFLAGS="-B${libcCross}/lib -idirafter ${libcCross}/include" + EXTRA_TARGET_LDFLAGS="-Wl,-L${libcCross}/lib" + fi + else + if test -z "$NIX_GCC_CROSS"; then + EXTRA_TARGET_CFLAGS="$EXTRA_FLAGS" + EXTRA_TARGET_CXXFLAGS="$EXTRA_FLAGS" + EXTRA_TARGET_LDFLAGS="$EXTRA_LDFLAGS" + else + # This the case of cross-building the gcc. + # We need special flags for the target, different than those of the build + # Assertion: + test -e $NIX_GCC_CROSS/nix-support/orig-libc + + # Figure out what extra flags to pass to the gcc compilers + # being generated to make sure that they use our glibc. + extraFlags="$(cat $NIX_GCC_CROSS/nix-support/libc-cflags)" + extraLDFlags="$(cat $NIX_GCC_CROSS/nix-support/libc-ldflags) $(cat $NIX_GCC_CROSS/nix-support/libc-ldflags-before)" + + # Use *real* header files, otherwise a limits.h is generated + # that does not include Glibc's limits.h (notably missing + # SSIZE_MAX, which breaks the build). + NIX_FIXINC_DUMMY_CROSS=$(cat $NIX_GCC_CROSS/nix-support/orig-libc)/include + + # The path to the Glibc binaries such as `crti.o'. + glibc_libdir="$(cat $NIX_GCC_CROSS/nix-support/orig-libc)/lib" + + extraFlags="-I$NIX_FIXINC_DUMMY_CROSS $extraFlags" + extraLDFlags="-L$glibc_libdir -rpath $glibc_libdir $extraLDFlags" + + EXTRA_TARGET_CFLAGS="$extraFlags" + for i in $extraLDFlags; do + EXTRA_TARGET_LDFLAGS="$EXTRA_TARGET_LDFLAGS -Wl,$i" + done + fi + fi + + + # CFLAGS_FOR_TARGET are needed for the libstdc++ configure script to find + # the startfiles. + # FLAGS_FOR_TARGET are needed for the target libraries to receive the -Bxxx + # for the startfiles. + makeFlagsArray=( \ + "${makeFlagsArray[@]}" \ + NATIVE_SYSTEM_HEADER_DIR="$NIX_FIXINC_DUMMY" \ + SYSTEM_HEADER_DIR="$NIX_FIXINC_DUMMY" \ + CFLAGS_FOR_BUILD="$EXTRA_FLAGS $EXTRA_LDFLAGS" \ + CXXFLAGS_FOR_BUILD="$EXTRA_FLAGS $EXTRA_LDFLAGS" \ + CFLAGS_FOR_TARGET="$EXTRA_TARGET_CFLAGS $EXTRA_TARGET_LDFLAGS" \ + CXXFLAGS_FOR_TARGET="$EXTRA_TARGET_CFLAGS $EXTRA_TARGET_LDFLAGS" \ + FLAGS_FOR_TARGET="$EXTRA_TARGET_CFLAGS $EXTRA_TARGET_LDFLAGS" \ + LDFLAGS_FOR_BUILD="$EXTRA_FLAGS $EXTRA_LDFLAGS" \ + LDFLAGS_FOR_TARGET="$EXTRA_TARGET_LDFLAGS $EXTRA_TARGET_LDFLAGS" \ + ) + + if test -z "$targetConfig"; then + makeFlagsArray=( \ + "${makeFlagsArray[@]}" \ + BOOT_CFLAGS="$EXTRA_FLAGS $EXTRA_LDFLAGS" \ + BOOT_LDFLAGS="$EXTRA_TARGET_CFLAGS $EXTRA_TARGET_LDFLAGS" \ + ) + fi + + if test -n "$targetConfig" -a "$crossStageStatic" == 1; then + # We don't want the gcc build to assume there will be a libc providing + # limits.h in this stagae + makeFlagsArray=( \ + "${makeFlagsArray[@]}" \ + LIMITS_H_TEST=false \ + ) + else + makeFlagsArray=( \ + "${makeFlagsArray[@]}" \ + LIMITS_H_TEST=true \ + ) + fi +fi + +if test -n "$targetConfig"; then + # The host strip will destroy some important details of the objects + dontStrip=1 +fi + + +preConfigure() { + if test -n "$newlibSrc"; then + tar xvf "$newlibSrc" -C .. + ln -s ../newlib-*/newlib newlib + # Patch to get armvt5el working: + sed -i -e 's/ arm)/ arm*)/' newlib/configure.host + fi + # Bug - they packaged zlib + if test -d "zlib"; then + # This breaks the build without-headers, which should build only + # the target libgcc as target libraries. + # See 'configure:5370' + rm -Rf zlib + fi + + if test -f "$NIX_GCC/nix-support/orig-libc"; then + # Patch the configure script so it finds glibc headers. It's + # important for example in order not to get libssp built, + # because its functionality is in glibc already. + glibc_headers="$(cat $NIX_GCC/nix-support/orig-libc)/include" + sed -i \ + -e "s,glibc_header_dir=/usr/include,glibc_header_dir=$glibc_headers", \ + gcc/configure + fi + + if test -n "$crossMingw" -a -n "$crossStageStatic"; then + mkdir -p ../mingw + # --with-build-sysroot expects that: + cp -R $libcCross/include ../mingw + configureFlags="$configureFlags --with-build-sysroot=`pwd`/.." + fi + + # Perform the build in a different directory. + mkdir ../build + cd ../build + configureScript=../$sourceRoot/configure +} + + +postConfigure() { + # Don't store the configure flags in the resulting executables. + sed -e '/TOPLEVEL_CONFIGURE_ARGUMENTS=/d' -i Makefile +} + + +postInstall() { + # Remove precompiled headers for now. They are very big and + # probably not very useful yet. + find $out/include -name "*.gch" -exec rm -rf {} \; -prune + + # Remove `fixincl' to prevent a retained dependency on the + # previous gcc. + rm -rf $out/libexec/gcc/*/*/install-tools + rm -rf $out/lib/gcc/*/*/install-tools + + # More dependencies with the previous gcc or some libs (gccbug stores the build command line) + rm -rf $out/bin/gccbug + # Take out the bootstrap-tools from the rpath, as it's not needed at all having $out + for i in $out/libexec/gcc/*/*/*; do + if PREV_RPATH=`patchelf --print-rpath $i`; then + patchelf --set-rpath `echo $PREV_RPATH | sed 's,:[^:]*bootstrap-tools/lib,,'` $i + fi + done + + # Get rid of some "fixed" header files + rm -rf $out/lib/gcc/*/*/include/root + + # Replace hard links for i686-pc-linux-gnu-gcc etc. with symlinks. + for i in $out/bin/*-gcc*; do + if cmp -s $out/bin/gcc $i; then + ln -sfn gcc $i + fi + done + + for i in $out/bin/c++ $out/bin/*-c++* $out/bin/*-g++*; do + if cmp -s $out/bin/g++ $i; then + ln -sfn g++ $i + fi + done + + eval "$postInstallGhdl" +} + + +if test -z "$targetConfig" && test -z "$crossConfig"; then + if test -z "$profiledCompiler"; then + buildFlags="bootstrap $buildFlags" + else + buildFlags="profiledbootstrap $buildFlags" + fi +fi + +genericBuild diff --git a/pkgs/development/compilers/gcc/4.7/default.nix b/pkgs/development/compilers/gcc/4.7/default.nix new file mode 100644 index 00000000000..02733d04203 --- /dev/null +++ b/pkgs/development/compilers/gcc/4.7/default.nix @@ -0,0 +1,452 @@ +{ stdenv, fetchurl, noSysDirs +, langC ? true, langCC ? true, langFortran ? false +, langJava ? false +, langAda ? false +, langVhdl ? false +, langGo ? false +, profiledCompiler ? false +, staticCompiler ? false +, enableShared ? true +, texinfo ? null +, perl ? null # optional, for texi2pod (then pod2man); required for Java +, gmp, mpfr, mpc, gettext, which +, libelf # optional, for link-time optimizations (LTO) +, ppl ? null, cloog ? null # optional, for the Graphite optimization framework. +, zlib ? null, boehmgc ? null +, zip ? null, unzip ? null, pkgconfig ? null, gtk ? null, libart_lgpl ? null +, libX11 ? null, libXt ? null, libSM ? null, libICE ? null, libXtst ? null +, libXrender ? null, xproto ? null, renderproto ? null, xextproto ? null +, libXrandr ? null, libXi ? null, inputproto ? null, randrproto ? null +, gnatboot ? null +, enableMultilib ? false +, enablePlugin ? true # whether to support user-supplied plug-ins +, name ? "gcc" +, cross ? null +, binutilsCross ? null +, libcCross ? null +, crossStageStatic ? true +, gnat ? null +, libpthread ? null, libpthreadCross ? null # required for GNU/Hurd +, stripped ? true +, gnused ? null +}: + +assert langJava -> zip != null && unzip != null + && zlib != null && boehmgc != null + && perl != null; # for `--enable-java-home' +assert langAda -> gnatboot != null; +assert langVhdl -> gnat != null; + +# LTO needs libelf and zlib. +assert libelf != null -> zlib != null; + +# Make sure we get GNU sed. +assert stdenv.isDarwin -> gnused != null; + +# The go frontend is written in c++ +assert langGo -> langCC; + +with stdenv.lib; +with builtins; + +let version = "4.7.1"; + + # Whether building a cross-compiler for GNU/Hurd. + crossGNU = cross != null && cross.config == "i586-pc-gnu"; + + patches = [ ] + ++ optional (cross != null) ./libstdc++-target.patch + # ++ optional noSysDirs ./no-sys-dirs.patch + # The GNAT Makefiles did not pay attention to CFLAGS_FOR_TARGET for its + # target libraries and tools. + ++ optional langAda ./gnat-cflags.patch + ++ optional langFortran ./gfortran-driving.patch + ++ optional (stdenv.isGNU || crossGNU) ./hurd-sigrtmin.patch; + + javaEcj = fetchurl { + # The `$(top_srcdir)/ecj.jar' file is automatically picked up at + # `configure' time. + + # XXX: Eventually we might want to take it from upstream. + url = "ftp://sourceware.org/pub/java/ecj-4.3.jar"; + sha256 = "0jz7hvc0s6iydmhgh5h2m15yza7p2rlss2vkif30vm9y77m97qcx"; + }; + + # Antlr (optional) allows the Java `gjdoc' tool to be built. We want a + # binary distribution here to allow the whole chain to be bootstrapped. + javaAntlr = fetchurl { + url = http://www.antlr.org/download/antlr-3.1.3.jar; + sha256 = "1f41j0y4kjydl71lqlvr73yagrs2jsg1fjymzjz66mjy7al5lh09"; + }; + + xlibs = [ + libX11 libXt libSM libICE libXtst libXrender libXrandr libXi + xproto renderproto xextproto inputproto randrproto + ]; + + javaAwtGtk = langJava && gtk != null; + + /* Cross-gcc settings */ + gccArch = stdenv.lib.attrByPath [ "gcc" "arch" ] null cross; + gccCpu = stdenv.lib.attrByPath [ "gcc" "cpu" ] null cross; + gccAbi = stdenv.lib.attrByPath [ "gcc" "abi" ] null cross; + withArch = if gccArch != null then " --with-arch=${gccArch}" else ""; + withCpu = if gccCpu != null then " --with-cpu=${gccCpu}" else ""; + withAbi = if gccAbi != null then " --with-abi=${gccAbi}" else ""; + crossMingw = (cross != null && cross.libc == "msvcrt"); + + crossConfigureFlags = + "--target=${cross.config}" + + withArch + + withCpu + + withAbi + + (if (crossMingw && crossStageStatic) then + " --with-headers=${libcCross}/include" + + " --with-gcc" + + " --with-gnu-as" + + " --with-gnu-ld" + + " --with-gnu-ld" + + " --disable-shared" + + " --disable-nls" + + " --disable-debug" + + " --enable-sjlj-exceptions" + + " --enable-threads=win32" + + " --disable-win32-registry" + else if crossStageStatic then + " --disable-libssp --disable-nls" + + " --without-headers" + + " --disable-threads " + + " --disable-libmudflap " + + " --disable-libgomp " + + " --disable-libquadmath" + + " --disable-shared" + + " --disable-decimal-float" # libdecnumber requires libc + else + " --with-headers=${libcCross}/include" + + " --enable-__cxa_atexit" + + " --enable-long-long" + + (if crossMingw then + " --enable-threads=win32" + + " --enable-sjlj-exceptions" + + " --enable-hash-synchronization" + + " --disable-libssp" + + " --disable-nls" + + " --with-dwarf2" + + # I think noone uses shared gcc libs in mingw, so we better do the same. + # In any case, mingw32 g++ linking is broken by default with shared libs, + # unless adding "-lsupc++" to any linking command. I don't know why. + " --disable-shared" + + (if cross.config == "x86_64-w64-mingw32" then + # To keep ABI compatibility with upstream mingw-w64 + " --enable-fully-dynamic-string" + else "") + else (if cross.libc == "uclibc" then + # In uclibc cases, libgomp needs an additional '-ldl' + # and as I don't know how to pass it, I disable libgomp. + " --disable-libgomp" else "") + + " --enable-threads=posix" + + " --enable-nls" + + " --disable-decimal-float") # No final libdecnumber (it may work only in 386) + ); + stageNameAddon = if (crossStageStatic) then "-stage-static" else + "-stage-final"; + crossNameAddon = if (cross != null) then "-${cross.config}" + stageNameAddon else ""; + +in + +# We need all these X libraries when building AWT with GTK+. +assert gtk != null -> (filter (x: x == null) xlibs) == []; + +stdenv.mkDerivation ({ + name = "${name}${if stripped then "" else "-debug"}-${version}" + crossNameAddon; + + builder = ./builder.sh; + + src = fetchurl { + url = "mirror://gnu/gcc/gcc-${version}/gcc-${version}.tar.bz2"; + sha256 = "0vs0v89zzgkngkw2p8kdynyk7j8ky4wf6zyrg3rsschpl1pky28n"; + }; + + inherit patches; + + postPatch = + if (stdenv.isGNU + || (libcCross != null # e.g., building `gcc.hostDrv' + && libcCross ? crossConfig + && libcCross.crossConfig == "i586-pc-gnu") + || (crossGNU && libcCross != null)) + then + # On GNU/Hurd glibc refers to Hurd & Mach headers and libpthread is not + # in glibc, so add the right `-I' flags to the default spec string. + assert libcCross != null -> libpthreadCross != null; + let + libc = if libcCross != null then libcCross else stdenv.glibc; + gnu_h = "gcc/config/gnu.h"; + i386_gnu_h = "gcc/config/i386/gnu.h"; + extraCPPDeps = + libc.propagatedBuildInputs + ++ stdenv.lib.optional (libpthreadCross != null) libpthreadCross + ++ stdenv.lib.optional (libpthread != null) libpthread; + extraCPPSpec = + concatStrings (intersperse " " + (map (x: "-I${x}/include") extraCPPDeps)); + extraLibSpec = + if libpthreadCross != null + then "-L${libpthreadCross}/lib ${libpthreadCross.TARGET_LDFLAGS}" + else "-L${libpthread}/lib"; + in + '' echo "augmenting \`CPP_SPEC' in \`${i386_gnu_h}' with \`${extraCPPSpec}'..." + sed -i "${i386_gnu_h}" \ + -es'|CPP_SPEC *"\(.*\)$|CPP_SPEC "${extraCPPSpec} \1|g' + + echo "augmenting \`LIB_SPEC' in \`${gnu_h}' with \`${extraLibSpec}'..." + sed -i "${gnu_h}" \ + -es'|LIB_SPEC *"\(.*\)$|LIB_SPEC "${extraLibSpec} \1|g' + + echo "setting \`NATIVE_SYSTEM_HEADER_DIR' and \`STANDARD_INCLUDE_DIR' to \`${libc}/include'..." + sed -i "${gnu_h}" \ + -es'|#define STANDARD_INCLUDE_DIR.*$|#define STANDARD_INCLUDE_DIR "${libc}/include"|g' + sed -i gcc/config/t-gnu \ + -es'|NATIVE_SYSTEM_HEADER_DIR.*$|NATIVE_SYSTEM_HEADER_DIR = ${libc}/include|g' + '' + else if cross != null || stdenv.gcc.libc != null then + # On NixOS, use the right path to the dynamic linker instead of + # `/lib/ld*.so'. + let + libc = if (libcCross != null) then libcCross else stdenv.gcc.libc; + in + '' echo "fixing the \`GLIBC_DYNAMIC_LINKER' and \`UCLIBC_DYNAMIC_LINKER' macros..." + for header in "gcc/config/"*-gnu.h "gcc/config/"*"/"*.h + do + grep -q LIBC_DYNAMIC_LINKER "$header" || continue + echo " fixing \`$header'..." + sed -i "$header" \ + -e 's|define[[:blank:]]*\([UCG]\+\)LIBC_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define \1LIBC_DYNAMIC_LINKER\2 "${libc}\3"|g' + done + '' + else null; + + inherit noSysDirs profiledCompiler staticCompiler langJava crossStageStatic + libcCross crossMingw; + + buildNativeInputs = [ texinfo which gettext ] + ++ (optional (perl != null) perl) + ++ (optional javaAwtGtk pkgconfig); + + buildInputs = [ gmp mpfr mpc libelf ] + ++ (optional (ppl != null) ppl) + ++ (optional (cloog != null) cloog) + ++ (optional (zlib != null) zlib) + ++ (optionals langJava [ boehmgc zip unzip ]) + ++ (optionals javaAwtGtk ([ gtk libart_lgpl ] ++ xlibs)) + ++ (optionals (cross != null) [binutilsCross]) + ++ (optionals langAda [gnatboot]) + ++ (optionals langVhdl [gnat]) + + # The builder relies on GNU sed (for instance, Darwin's `sed' fails with + # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it. + ++ (optional stdenv.isDarwin gnused) + ; + + configureFlagsArray = stdenv.lib.optionals + (ppl != null && ppl ? dontDisableStatic && ppl.dontDisableStatic) + [ "--with-host-libstdcxx=-lstdc++ -lgcc_s" ]; + + # 'iant' at #go-nuts@freenode, gccgo maintainer, said that + # they have a bug in 4.7.1 if adding "--disable-static" + dontDisableStatic = langGo; + + configureFlags = " + ${if enableMultilib then "" else "--disable-multilib"} + ${if enableShared then "" else "--disable-shared"} + ${if enablePlugin then "--enable-plugin" else ""} + ${if ppl != null then "--with-ppl=${ppl}" else ""} + ${if cloog != null then + "--with-cloog=${cloog} --enable-cloog-backend=isl" + else ""} + ${if langJava then + "--with-ecj-jar=${javaEcj} " + + + # Follow Sun's layout for the convenience of IcedTea/OpenJDK. See + # . + "--enable-java-home --with-java-home=\${prefix}/lib/jvm/jre " + else ""} + ${if javaAwtGtk then "--enable-java-awt=gtk" else ""} + ${if langJava && javaAntlr != null then "--with-antlr-jar=${javaAntlr}" else ""} + --with-gmp=${gmp} + --with-mpfr=${mpfr} + --with-mpc=${mpc} + ${if (libelf != null) then "--with-libelf=${libelf}" else ""} + --disable-libstdcxx-pch + --without-included-gettext + --with-system-zlib + --enable-languages=${ + concatStrings (intersperse "," + ( optional langC "c" + ++ optional langCC "c++" + ++ optional langFortran "fortran" + ++ optional langJava "java" + ++ optional langAda "ada" + ++ optional langVhdl "vhdl" + ++ optional langGo "go" + ) + ) + } + ${if (stdenv ? glibc) then " --with-native-system-header-dir=${stdenv.glibc}/include" else ""} + ${ # Trick that should be taken out once we have a mips64el-linux not loongson2f + if cross == null && stdenv.system == "mips64el-linux" then "--with-arch=loongson2f" else ""} + ${if langAda then " --enable-libada" else ""} + ${if (cross == null && stdenv.isi686) then "--with-arch=i686" else ""} + ${if cross != null then crossConfigureFlags else ""} + "; + + targetConfig = if (cross != null) then cross.config else null; + + installTargets = + if stripped + then "install-strip" + else "install"; + + crossAttrs = { + patches = patches ++ [ ./hurd-sigrtmin.patch ]; + AR = "${stdenv.cross.config}-ar"; + LD = "${stdenv.cross.config}-ld"; + CC = "${stdenv.cross.config}-gcc"; + CXX = "${stdenv.cross.config}-gcc"; + AR_FOR_TARGET = "${stdenv.cross.config}-ar"; + LD_FOR_TARGET = "${stdenv.cross.config}-ld"; + CC_FOR_TARGET = "${stdenv.cross.config}-gcc"; + NM_FOR_TARGET = "${stdenv.cross.config}-nm"; + CXX_FOR_TARGET = "${stdenv.cross.config}-g++"; + # If we are making a cross compiler, cross != null + NIX_GCC_CROSS = if cross == null then "${stdenv.gccCross}" else ""; + dontStrip = true; + configureFlags = '' + ${if enableMultilib then "" else "--disable-multilib"} + ${if enableShared then "" else "--disable-shared"} + ${if ppl != null then "--with-ppl=${ppl.hostDrv}" else ""} + ${if cloog != null then "--with-cloog=${cloog.hostDrv} --enable-cloog-backend=isl" else ""} + ${if langJava then "--with-ecj-jar=${javaEcj.hostDrv}" else ""} + ${if javaAwtGtk then "--enable-java-awt=gtk" else ""} + ${if langJava && javaAntlr != null then "--with-antlr-jar=${javaAntlr.hostDrv}" else ""} + --with-gmp=${gmp.hostDrv} + --with-mpfr=${mpfr.hostDrv} + --disable-libstdcxx-pch + --without-included-gettext + --with-system-zlib + --enable-languages=${ + concatStrings (intersperse "," + ( optional langC "c" + ++ optional langCC "c++" + ++ optional langFortran "fortran" + ++ optional langJava "java" + ++ optional langAda "ada" + ++ optional langVhdl "vhdl" + ++ optional langGo "go" + ) + ) + } + ${if langAda then " --enable-libada" else ""} + ${if (cross == null && stdenv.isi686) then "--with-arch=i686" else ""} + ${if cross != null then crossConfigureFlags else ""} + --target=${stdenv.cross.config} + ''; + }; + + + # Needed for the cross compilation to work + AR = "ar"; + LD = "ld"; + CC = "gcc"; + + # Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find + # the library headers and binaries, regarless of the language being + # compiled. + + # Note: When building the Java AWT GTK+ peer, the build system doesn't + # honor `--with-gmp' et al., e.g., when building + # `libjava/classpath/native/jni/java-math/gnu_java_math_GMP.c', so we just + # add them to $CPATH and $LIBRARY_PATH in this case. + # + # Likewise, the LTO code doesn't find zlib. + + CPATH = concatStrings + (intersperse ":" (map (x: x + "/include") + (optionals (zlib != null) [ zlib ] + ++ optionals langJava [ boehmgc ] + ++ optionals javaAwtGtk xlibs + ++ optionals javaAwtGtk [ gmp mpfr ] + ++ optional (libpthread != null) libpthread + ++ optional (libpthreadCross != null) libpthreadCross + + # On GNU/Hurd glibc refers to Mach & Hurd + # headers. + ++ optionals (libcCross != null && + hasAttr "propagatedBuildInputs" libcCross) + libcCross.propagatedBuildInputs))); + + LIBRARY_PATH = concatStrings + (intersperse ":" (map (x: x + "/lib") + (optionals (zlib != null) [ zlib ] + ++ optionals langJava [ boehmgc ] + ++ optionals javaAwtGtk xlibs + ++ optionals javaAwtGtk [ gmp mpfr ] + ++ optional (libpthread != null) libpthread))); + + EXTRA_TARGET_CFLAGS = + if cross != null && libcCross != null + then "-idirafter ${libcCross}/include" + else null; + + EXTRA_TARGET_LDFLAGS = + if cross != null && libcCross != null + then "-B${libcCross}/lib -Wl,-L${libcCross}/lib" + + (optionalString (libpthreadCross != null) + " -L${libpthreadCross}/lib -Wl,${libpthreadCross.TARGET_LDFLAGS}") + else null; + + passthru = { inherit langC langCC langAda langFortran langVhdl + langGo enableMultilib version; }; + + /* From gccinstall.info: + "parallel make is currently not supported since collisions in profile + collecting may occur" + */ + enableParallelBuilding = !profiledCompiler; + + meta = { + homepage = http://gcc.gnu.org/; + license = "GPLv3+"; # runtime support libraries are typically LGPLv3+ + description = "GNU Compiler Collection, version ${version}" + + (if stripped then "" else " (with debugging info)"); + + longDescription = '' + The GNU Compiler Collection includes compiler front ends for C, C++, + Objective-C, Fortran, OpenMP for C/C++/Fortran, Java, and Ada, as well + as libraries for these languages (libstdc++, libgcj, libgomp,...). + + GCC development is a part of the GNU Project, aiming to improve the + compiler used in the GNU system including the GNU/Linux variant. + ''; + + maintainers = [ + stdenv.lib.maintainers.ludo + stdenv.lib.maintainers.viric + stdenv.lib.maintainers.shlevy + ]; + + # Volunteers needed for the {Cyg,Dar}win ports of *PPL. + # gnatboot is not available out of linux platforms, so we disable the darwin build + # for the gnat (ada compiler). + platforms = stdenv.lib.platforms.linux ++ optionals (langAda == false && libelf == null) [ "i686-darwin" ]; + }; +} + +// optionalAttrs (cross != null && cross.libc == "msvcrt" && crossStageStatic) { + makeFlags = [ "all-gcc" "all-target-libgcc" ]; + installTargets = "install-gcc install-target-libgcc"; +} + +# Strip kills static libs of other archs (hence cross != null) +// optionalAttrs (!stripped || cross != null) { dontStrip = true; NIX_STRIP_DEBUG = 0; } +) diff --git a/pkgs/development/compilers/gcc/4.7/gfortran-driving.patch b/pkgs/development/compilers/gcc/4.7/gfortran-driving.patch new file mode 100644 index 00000000000..70708886b40 --- /dev/null +++ b/pkgs/development/compilers/gcc/4.7/gfortran-driving.patch @@ -0,0 +1,20 @@ +This patch fixes interaction with Libtool. +See , for details. + +--- a/gcc/fortran/gfortranspec.c ++++ b/gcc/fortran/gfortranspec.c +@@ -461,8 +461,15 @@ For more information about these matters, see the file named COPYING\n\n")); + { + fprintf (stderr, _("Driving:")); + for (i = 0; i < g77_newargc; i++) ++ { ++ if (g77_new_decoded_options[i].opt_index == OPT_l) ++ /* Make sure no white space is inserted after `-l'. */ ++ fprintf (stderr, " -l%s", ++ g77_new_decoded_options[i].canonical_option[1]); ++ else + fprintf (stderr, " %s", + g77_new_decoded_options[i].orig_option_with_args_text); ++ } + fprintf (stderr, "\n"); + } diff --git a/pkgs/development/compilers/gcc/4.7/gnat-cflags.patch b/pkgs/development/compilers/gcc/4.7/gnat-cflags.patch new file mode 100644 index 00000000000..bf2acf065e9 --- /dev/null +++ b/pkgs/development/compilers/gcc/4.7/gnat-cflags.patch @@ -0,0 +1,33 @@ +diff --git a/libada/Makefile.in b/libada/Makefile.in +index f5057a0..337e0c6 100644 +--- a/libada/Makefile.in ++++ b/libada/Makefile.in +@@ -55,7 +55,7 @@ GCC_WARN_CFLAGS = $(LOOSE_WARN) + WARN_CFLAGS = @warn_cflags@ + + TARGET_LIBGCC2_CFLAGS= +-GNATLIBCFLAGS= -g -O2 ++GNATLIBCFLAGS= -g -O2 $(CFLAGS) + GNATLIBCFLAGS_FOR_C = $(GNATLIBCFLAGS) $(TARGET_LIBGCC2_CFLAGS) -fexceptions \ + -DIN_RTS @have_getipinfo@ + +--- a/gcc/ada/gcc-interface/Makefile.in ++++ b/gcc/ada/gcc-interface/Makefile.in +@@ -105,7 +105,7 @@ ADAFLAGS = -W -Wall -gnatpg -gnata + SOME_ADAFLAGS =-gnata + FORCE_DEBUG_ADAFLAGS = -g + GNATLIBFLAGS = -gnatpg -nostdinc +-GNATLIBCFLAGS = -g -O2 ++GNATLIBCFLAGS = -g -O2 $(CFLAGS_FOR_TARGET) + # Pretend that _Unwind_GetIPInfo is available for the target by default. This + # should be autodetected during the configuration of libada and passed down to + # here, but we need something for --disable-libada and hope for the best. +@@ -193,7 +193,7 @@ RTSDIR = rts$(subst /,_,$(MULTISUBDIR)) + # Link flags used to build gnat tools. By default we prefer to statically + # link with libgcc to avoid a dependency on shared libgcc (which is tricky + # to deal with as it may conflict with the libgcc provided by the system). +-GCC_LINK_FLAGS=-static-libgcc ++GCC_LINK_FLAGS=-static-libgcc $(CFLAGS_FOR_TARGET) + + # End of variables for you to override. + diff --git a/pkgs/development/compilers/gcc/4.7/hurd-sigrtmin.patch b/pkgs/development/compilers/gcc/4.7/hurd-sigrtmin.patch new file mode 100644 index 00000000000..dc8236d2b99 --- /dev/null +++ b/pkgs/development/compilers/gcc/4.7/hurd-sigrtmin.patch @@ -0,0 +1,14 @@ +GNU libc on GNU/Hurd doesn't define `__SIGRTMIN'. +From . + +--- a/libgcc/generic-morestack.c 2011-12-19 21:14:52.000000000 +0100 ++++ b/libgcc/generic-morestack.c 2011-12-19 21:15:35.000000000 +0100 +@@ -507,7 +507,7 @@ + sigemptyset (&__morestack_initial_sp.mask); + + sigfillset (&__morestack_fullmask); +-#ifdef __GLIBC__ ++#if defined(__GLIBC__) && defined(__SIGRTMIN) + /* In glibc, the first two real time signals are used by the NPTL + threading library. By taking them out of the set of signals, we + avoiding copying the signal mask in pthread_sigmask. More diff --git a/pkgs/development/compilers/gcc/4.7/java-jvgenmain-link.patch b/pkgs/development/compilers/gcc/4.7/java-jvgenmain-link.patch new file mode 100644 index 00000000000..2612e8bfbbb --- /dev/null +++ b/pkgs/development/compilers/gcc/4.7/java-jvgenmain-link.patch @@ -0,0 +1,17 @@ +The `jvgenmain' executable must be linked against `vec.o', among others, +since it uses its vector API. + +--- gcc-4.3.3/gcc/java/Make-lang.in 2008-12-05 00:00:19.000000000 +0100 ++++ gcc-4.3.3/gcc/java/Make-lang.in 2009-07-03 16:11:41.000000000 +0200 +@@ -109,9 +109,9 @@ jcf-dump$(exeext): $(JCFDUMP_OBJS) $(LIB + $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(JCFDUMP_OBJS) \ + $(CPPLIBS) $(ZLIB) $(LDEXP_LIB) $(LIBS) + +-jvgenmain$(exeext): $(JVGENMAIN_OBJS) $(LIBDEPS) ++jvgenmain$(exeext): $(JVGENMAIN_OBJS) $(LIBDEPS) $(BUILD_RTL) + rm -f $@ +- $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(JVGENMAIN_OBJS) $(LIBS) ++ $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(JVGENMAIN_OBJS) $(BUILD_RTL) $(LIBS) + + # + # Build hooks: diff --git a/pkgs/development/compilers/gcc/4.7/libstdc++-target.patch b/pkgs/development/compilers/gcc/4.7/libstdc++-target.patch new file mode 100644 index 00000000000..fb622b39580 --- /dev/null +++ b/pkgs/development/compilers/gcc/4.7/libstdc++-target.patch @@ -0,0 +1,32 @@ +Patch to make the target libraries 'configure' scripts find the proper CPP. +I noticed that building the mingw32 cross compiler. +Looking at the build script for mingw in archlinux, I think that only nixos +needs this patch. I don't know why. +diff --git a/Makefile.in b/Makefile.in +index 93f66b6..d691917 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -266,6 +266,7 @@ BASE_TARGET_EXPORTS = \ + AR="$(AR_FOR_TARGET)"; export AR; \ + AS="$(COMPILER_AS_FOR_TARGET)"; export AS; \ + CC="$(CC_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CC; \ ++ CPP="$(CC_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS -E"; export CC; \ + CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ + CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \ + CPPFLAGS="$(CPPFLAGS_FOR_TARGET)"; export CPPFLAGS; \ +@@ -291,11 +292,13 @@ BASE_TARGET_EXPORTS = \ + RAW_CXX_TARGET_EXPORTS = \ + $(BASE_TARGET_EXPORTS) \ + CXX_FOR_TARGET="$(RAW_CXX_FOR_TARGET)"; export CXX_FOR_TARGET; \ +- CXX="$(RAW_CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CXX; ++ CXX="$(RAW_CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CXX; \ ++ CXXCPP="$(RAW_CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS -E"; export CXX; + + NORMAL_TARGET_EXPORTS = \ + $(BASE_TARGET_EXPORTS) \ +- CXX="$(CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CXX; ++ CXX="$(CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CXX; \ ++ CXXCPP="$(CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS -E"; export CXX; + + # Where to find GMP + HOST_GMPLIBS = @gmplibs@ diff --git a/pkgs/development/compilers/gcc/4.7/no-sys-dirs.patch b/pkgs/development/compilers/gcc/4.7/no-sys-dirs.patch new file mode 100644 index 00000000000..79901703cb8 --- /dev/null +++ b/pkgs/development/compilers/gcc/4.7/no-sys-dirs.patch @@ -0,0 +1,41 @@ +diff -ru gcc-4.3.1-orig/gcc/cppdefault.c gcc-4.3.1/gcc/cppdefault.c +--- gcc-4.3.1-orig/gcc/cppdefault.c 2007-07-26 10:37:01.000000000 +0200 ++++ gcc-4.3.1/gcc/cppdefault.c 2008-06-25 17:48:23.000000000 +0200 +@@ -41,6 +41,10 @@ + # undef CROSS_INCLUDE_DIR + #endif + ++#undef LOCAL_INCLUDE_DIR ++#undef SYSTEM_INCLUDE_DIR ++#undef STANDARD_INCLUDE_DIR ++ + const struct default_include cpp_include_defaults[] + #ifdef INCLUDE_DEFAULTS + = INCLUDE_DEFAULTS; +diff -ru gcc-4.3.1-orig/gcc/gcc.c gcc-4.3.1/gcc/gcc.c +--- gcc-4.3.1-orig/gcc/gcc.c 2008-03-02 23:55:19.000000000 +0100 ++++ gcc-4.3.1/gcc/gcc.c 2008-06-25 17:52:53.000000000 +0200 +@@ -1478,10 +1478,10 @@ + /* Default prefixes to attach to command names. */ + + #ifndef STANDARD_STARTFILE_PREFIX_1 +-#define STANDARD_STARTFILE_PREFIX_1 "/lib/" ++#define STANDARD_STARTFILE_PREFIX_1 "" + #endif + #ifndef STANDARD_STARTFILE_PREFIX_2 +-#define STANDARD_STARTFILE_PREFIX_2 "/usr/lib/" ++#define STANDARD_STARTFILE_PREFIX_2 "" + #endif + + #ifdef CROSS_DIRECTORY_STRUCTURE /* Don't use these prefixes for a cross compiler. */ +--- gcc-4.3.1-orig/gcc/Makefile.in 2008-05-11 20:54:15.000000000 +0200 ++++ gcc-4.3.1/gcc/Makefile.in 2008-06-25 17:48:23.000000000 +0200 +@@ -3277,7 +3281,7 @@ + -DGPLUSPLUS_INCLUDE_DIR=\"$(gcc_gxx_include_dir)\" \ + -DGPLUSPLUS_TOOL_INCLUDE_DIR=\"$(gcc_gxx_include_dir)/$(target_noncanonical)\" \ + -DGPLUSPLUS_BACKWARD_INCLUDE_DIR=\"$(gcc_gxx_include_dir)/backward\" \ +- -DLOCAL_INCLUDE_DIR=\"$(local_includedir)\" \ ++ -DLOCAL_INCLUDE_DIR=\"/no-such-dir\" \ + -DCROSS_INCLUDE_DIR=\"$(CROSS_SYSTEM_HEADER_DIR)\" \ + -DTOOL_INCLUDE_DIR=\"$(gcc_tooldir)/include\" \ + -DPREFIX=\"$(prefix)/\" \ diff --git a/pkgs/development/compilers/ghc/7.6.1.nix b/pkgs/development/compilers/ghc/7.6.1.nix new file mode 100644 index 00000000000..335befb6c12 --- /dev/null +++ b/pkgs/development/compilers/ghc/7.6.1.nix @@ -0,0 +1,55 @@ +{ stdenv, fetchurl, ghc, perl, gmp, ncurses }: + +stdenv.mkDerivation rec { + version = "7.6.1"; + + name = "ghc-${version}"; + + src = fetchurl { + url = "http://haskell.org/ghc/dist/7.6.1/${name}-src.tar.bz2"; + sha256 = "1q5rqp8z90mq6ysf7h28zkbhfaxlrpva2qy0wnkr43d7214dzp7i"; + }; + + buildInputs = [ ghc perl gmp ncurses ]; + + # My attempts to compile GHC with parallel build support enabled, failed + # 4 consecutive times with the following error: + # + # building rts/dist/build/AutoApply.debug_o + # building rts/dist/build/AutoApply.thr_o + # rts_dist_HC rts/dist/build/AutoApply.debug_o + # /nix/store/1iigiim5855m8j7pmwf5xrnpf705s4dh-binutils-2.21.1a/bin/ld: cannot find libraries/integer-gmp/dist-install/build/cbits/gmp-wrappers_o_split/gmp-wrappers__1.o + # collect2: ld returned 1 exit status + # make[1]: *** [libraries/integer-gmp/dist-install/build/cbits/gmp-wrappers.p_o] Error 1 + enableParallelBuilding = false; + + 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 cf0c569d3be..566e7d80f86 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, ghc, perl, gmp, ncurses }: stdenv.mkDerivation rec { - version = "7.5.20120607"; + version = "7.5.20120714"; name = "ghc-${version}"; src = fetchurl { url = "http://haskell.org/ghc/dist/current/dist/${name}-src.tar.bz2"; - sha256 = "1xrdx646g5ip2f2jypbm46y6jis3ddf8bild2704swbl2j4yb3vb"; + sha256 = "02jicyqqr18yixf970f1rfrn64bm528aig6s9566galji063p6ah"; }; buildInputs = [ ghc perl gmp ncurses ]; diff --git a/pkgs/development/compilers/go/cacert.patch b/pkgs/development/compilers/go/cacert.patch new file mode 100644 index 00000000000..42a44313835 --- /dev/null +++ b/pkgs/development/compilers/go/cacert.patch @@ -0,0 +1,15 @@ +Go comes with hardcoded cacert. We add the usual in NixOS, +for easier NixOS life. + +diff --git a/src/pkg/crypto/x509/root_unix.go b/src/pkg/crypto/x509/root_unix.go +index 76e79f4..6ef1dd3 100644 +--- a/src/pkg/crypto/x509/root_unix.go ++++ b/src/pkg/crypto/x509/root_unix.go +@@ -15,6 +15,7 @@ var certFiles = []string{ + "/etc/ssl/ca-bundle.pem", // OpenSUSE + "/etc/ssl/cert.pem", // OpenBSD + "/usr/local/share/certs/ca-root-nss.crt", // FreeBSD ++ "/etc/ssl/certs/ca-bundle.crt", // NixOS + } + + func (c *Certificate) systemVerify(opts *VerifyOptions) (chains [][]*Certificate, err error) { diff --git a/pkgs/development/compilers/go/default.nix b/pkgs/development/compilers/go/default.nix index 143c091a1dc..1d9765539bf 100644 --- a/pkgs/development/compilers/go/default.nix +++ b/pkgs/development/compilers/go/default.nix @@ -1,50 +1,64 @@ -{ stdenv, fetchhg, bison, glibc, ed, which, bash, coreutils, makeWrapper, perl }: +{ stdenv, fetchurl, bison, glibc, bash, coreutils, makeWrapper}: let - version = "2010-06-09"; - sha256 = "b607879b333ef100466c726a13cc69ed143566a3c1af59f6d33a6e90b9d0c917"; - loader386 = "${glibc}/lib/ld-linux.so.2"; loaderAmd64 = "${glibc}/lib/ld-linux-x86-64.so.2"; + loaderArm = "${glibc}/lib/ld-linux.so.3"; in stdenv.mkDerivation { - name = "go-" + version; + name = "go-1.0.2"; - # No tarball yet. - src = fetchhg { - url = https://go.googlecode.com/hg/; - tag = "release." + version; - inherit sha256; + src = fetchurl { + url = http://go.googlecode.com/files/go1.0.2.src.tar.gz; + sha256 = "1a4mpkb3bd9dwp0r3fgrfcyk5lgw0f0cfrbskg2lrhc7a12zpz3h"; }; - buildInputs = [ bison glibc ed which bash makeWrapper ]; + buildInputs = [ bison glibc bash makeWrapper ]; + + # I'm not sure what go wants from its 'src', but the go installation manual + # describes an installation keeping the src. + preUnpack = '' + mkdir -p $out/share + cd $out/share + ''; prePatch = '' + cd .. + if [ ! -d go ]; then + mv * go + fi + cd go + patchShebangs ./ # replace /bin/bash - # only for 386 build # !!! substituteInPlace does not seems to be effective. sed -i 's,/lib/ld-linux.so.2,${loader386},' src/cmd/8l/asm.c sed -i 's,/lib64/ld-linux-x86-64.so.2,${loaderAmd64},' src/cmd/6l/asm.c - sed -i 's,/usr/share/zoneinfo/,${glibc}/share/zoneinfo/,' src/pkg/time/zoneinfo.go - sed -i 's,/bin/ed,${ed}/bin/ed,' src/cmd/6l/mkenam + sed -i 's,/lib64/ld-linux-x86-64.so.3,${loaderArm},' src/cmd/5l/asm.c + sed -i 's,/usr/share/zoneinfo/,${glibc}/share/zoneinfo/,' src/pkg/time/zoneinfo_unix.go - sed -i -e 's,/bin/cat,${coreutils}/bin/cat,' \ - -e 's,/bin/echo,${coreutils}/bin/echo,' \ - src/pkg/exec/exec_test.go + #sed -i -e 's,/bin/cat,${coreutils}/bin/cat,' \ + # -e 's,/bin/echo,${coreutils}/bin/echo,' \ + # src/pkg/exec/exec_test.go # Disabling the 'os/http/net' tests (they want files not available in # chroot builds) - sed -i -e '/^NOTEST=/a\\tos\\\n\thttp\\\n\tnet\\' src/pkg/Makefile - - sed -i -e 's,/bin:/usr/bin:/usr/local/bin,'$PATH, test/run - sed -i -e 's,/usr/bin/perl,${perl}/bin/perl,' test/errchk + rm src/pkg/net/{multicast_test.go,parse_test.go,port_test.go} + # The os test wants to read files in an existing path. Just it don't be /usr/bin. + sed -i 's,/usr/bin,'"`pwd`", src/pkg/os/os_test.go + sed -i 's,/bin/pwd,'"`type -P pwd`", src/pkg/os/os_test.go + # Disable the hostname test + sed -i '/TestHostname/areturn' src/pkg/os/os_test.go ''; + patches = [ ./cacert.patch ]; + GOOS = "linux"; GOARCH = if (stdenv.system == "i686-linux") then "386" else if (stdenv.system == "x86_64-linux") then "amd64" + else if (stdenv.system == "armv5tel-linux") then "arm" else throw "Unsupported system"; + GOARM = stdenv.lib.optionalString (stdenv.system == "armv5tel-linux") "5"; installPhase = '' mkdir -p "$out/bin" @@ -55,28 +69,17 @@ stdenv.mkDerivation { ./all.bash cd - - # Handle Libraries and make them availabale under /share/go. - export GOLIB="pkg/"$GOOS"_"$GOARCH - mkdir -p "$out/lib/go/$GOLIB" - cp -r ./$GOLIB $out/lib/go/pkg/ - - # this line set $AS $CC $GC $LD - source ./src/Make.$GOARCH - - # Wrap the compiler and the linker to define the location of the + # Wrap the tools to define the location of the # libraries. - wrapProgram "$out/bin/$GC" \ - --add-flags "-I" \ - --add-flags "$out/lib/go/$GOLIB" - - wrapProgram "$out/bin/$LD" \ - --set "GOROOT" "$out/lib/go/" \ - --set "GOOS" "$GOOS" \ - --set "GOARCH" "$GOARCH" + for a in go gofmt godoc; do + wrapProgram "$out/bin/$a" \ + --set "GOROOT" $out/share/go \ + ${if (stdenv.system == "armv5tel-linux") then "--set GOARM $GOARM" else ""} + done # Copy the emacs configuration for Go files. mkdir -p "$out/share/emacs/site-lisp" - cp ./misc/emacs/* $out/share/emacs/site-lisp/ # */ + cp ./misc/emacs/* $out/share/emacs/site-lisp/ ''; meta = { diff --git a/pkgs/development/compilers/jdk/builder.sh b/pkgs/development/compilers/jdk/builder.sh deleted file mode 100644 index ccfe2838d1b..00000000000 --- a/pkgs/development/compilers/jdk/builder.sh +++ /dev/null @@ -1,34 +0,0 @@ -buildInputs="$unzip" -source $stdenv/setup - -unzip $src || true - -mkdir -p $out -mv $dirname/* $out/ - -# Remove crap in the root directory. -for file in $out/* -do - if test -f $file ; then - rm $file - fi -done - -# Set the dynamic linker. -rpath= -for i in $libraries; do - rpath=$rpath${rpath:+:}$i/lib -done -find $out -type f -perm +100 \ - -exec patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ - --set-rpath "$rpath" {} \; - -# Unpack .pack files. -for i in $(find $out -name "*.pack"); do - echo "unpacking $i..." - $out/bin/unpack200 "$i" "$(dirname $i)/$(basename $i .pack).jar" - rm "$i" -done - -# Put the *_md.h files in the right place. -cd $out/include && ln -s */*_md.h . diff --git a/pkgs/development/compilers/jdk/default-1.4.nix b/pkgs/development/compilers/jdk/default-1.4.nix deleted file mode 100644 index 48eb5e6e7b7..00000000000 --- a/pkgs/development/compilers/jdk/default-1.4.nix +++ /dev/null @@ -1,9 +0,0 @@ -{stdenv, fetchurl}: - -if stdenv.system == "i686-linux" - then - (import ./j2sdk-1.4.x-sun-linux.nix) { - inherit stdenv fetchurl; - } - else - abort "the Java 2 SDK is not supported on this platform" diff --git a/pkgs/development/compilers/jdk/default-5.nix b/pkgs/development/compilers/jdk/default-5.nix deleted file mode 100644 index dfd4e31f4b3..00000000000 --- a/pkgs/development/compilers/jdk/default-5.nix +++ /dev/null @@ -1,9 +0,0 @@ -{stdenv, fetchurl, unzip, requireFile}: - -if stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" - then - (import ./jdk5-oracle-linux.nix) { - inherit stdenv fetchurl unzip requireFile; - } - else - abort "the Java 5 SDK is not supported on this platform" diff --git a/pkgs/development/compilers/jdk/default.nix b/pkgs/development/compilers/jdk/default.nix index 547833c15cd..8940be7f34d 100644 --- a/pkgs/development/compilers/jdk/default.nix +++ b/pkgs/development/compilers/jdk/default.nix @@ -2,8 +2,6 @@ args: if args.stdenv.system == "i686-linux" || args.stdenv.system == "x86_64-linux" then (import ./jdk6-linux.nix) ( removeAttrs args ["cabextract"] ) -else if args.stdenv.system == "powerpc-linux" then - (import ./jdk5-ibm-powerpc-linux.nix) (removeAttrs args ["pluginSupport" "xlibs" "installjdk" "cabextract"]) else if args.stdenv.system == "i686-cygwin" then (import ./jdk6-cygwin.nix) (removeAttrs args ["pluginSupport" "xlibs" "installjdk" "xlibs"]) else diff --git a/pkgs/development/compilers/jdk/ibm-builder.sh b/pkgs/development/compilers/jdk/ibm-builder.sh deleted file mode 100644 index 2ff3a71322a..00000000000 --- a/pkgs/development/compilers/jdk/ibm-builder.sh +++ /dev/null @@ -1,29 +0,0 @@ -source $stdenv/setup - -if ! test -e "$pathname"; then - echo "" - echo "SORRY!" - echo "You should download \`$(basename $pathname)' from IBM and place it in $(dirname $pathname)." - echo "Blame IBM, not us." - echo "" - exit 1 -fi - -actual=$(md5sum -b $pathname | cut -c1-32) -if test "$actual" != "$md5"; then - echo "hash is $actual, expected $md5" - exit 1 -fi - -tar zxf $pathname || true - -mkdir -p $out -mv $dirname/* $out/ - -# Remove crap in the root directory. -for file in $out/* -do - if test -f $file ; then - rm $file - fi -done diff --git a/pkgs/development/compilers/jdk/j2sdk-1.4.x-sun-linux.nix b/pkgs/development/compilers/jdk/j2sdk-1.4.x-sun-linux.nix deleted file mode 100644 index 846055ce523..00000000000 --- a/pkgs/development/compilers/jdk/j2sdk-1.4.x-sun-linux.nix +++ /dev/null @@ -1,24 +0,0 @@ -/** - * This Nix expression requires the user to download the j2sdk - * distribution to /tmp. Please obtain j2sdk-1_4_2_03-linux-i586.bin - * from java.sun.com by hand and place it in /tmp. Blame Sun, not me. - * - * Note that this is not necessary if someone has already pushed a - * binary. - * - * @author Martin Bravenboer - */ -{stdenv, fetchurl}: - -assert stdenv.system == "i686-linux"; - -derivation { - name = "j2sdk-1.4.2"; - filename = "j2sdk-1.4.2_05"; - dirname = "j2sdk1.4.2_05"; - system = stdenv.system; - builder = ./builder.sh; - pathname = "/tmp/j2sdk-1_4_2_05-linux-i586.bin"; - md5 = "825ff134f3e370f6e677638d32962082"; - stdenv = stdenv; -} diff --git a/pkgs/development/compilers/jdk/jdk5-ibm-powerpc-linux.nix b/pkgs/development/compilers/jdk/jdk5-ibm-powerpc-linux.nix deleted file mode 100644 index a4c2bd589af..00000000000 --- a/pkgs/development/compilers/jdk/jdk5-ibm-powerpc-linux.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ swingSupport ? true -, stdenv, fetchurl, unzip, makeWrapper, libX11 ? null, libXext ? null -}: - -assert stdenv.system == "powerpc-linux"; - -assert swingSupport -> libX11 != null && libXext != null; - -(stdenv.mkDerivation { - name = "jdk-1.5.0"; - builder = ./ibm-builder.sh; - dirname = "ibm-java2-ppc-50"; - pathname = "/tmp/ibm-java2-sdk-50-linux-ppc.tgz"; - md5 = "6bed4ae0b24d3eea2914f2f6dcc0ceb4"; - libraries = - (if swingSupport then [libX11 libXext] else []); -} // {inherit swingSupport;}) diff --git a/pkgs/development/compilers/jdk/jdk5-oracle-linux.nix b/pkgs/development/compilers/jdk/jdk5-oracle-linux.nix deleted file mode 100644 index 8884585d154..00000000000 --- a/pkgs/development/compilers/jdk/jdk5-oracle-linux.nix +++ /dev/null @@ -1,36 +0,0 @@ -/** - * This Nix expression requires the user to download the Java 5.0 JDK - * distribution to /tmp. Please obtain jdk-1_5_0_22-linux-i586.bin for - * 32-bit systems or jdk-1_5_0_22-linux-amd64.bin for 64-bit systems - * from java.sun.com (look for archived software downloads) - * by hand and place it in /tmp. Blame Oracle, not me. - * - * Note that this is not necessary if someone has already pushed a - * binary. - */ -{stdenv, fetchurl, unzip, requireFile}: - -assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; - -stdenv.mkDerivation rec { - name = "jdk-1_5_0_22"; - dirname = "jdk1.5.0_22"; - builder = ./builder.sh; - src = requireFile { - message = '' - SORRY! - We may not download the needed binary distribution automatically. - You should download ${distfilename} from Sun and add it to store. - For example, "nix-prefetch-url file:///\$PWD/${distfilename}" in the - directory where you saved it is OK. - Blame Sun, not us. - ''; - name = distfilename; - sha256 = if stdenv.system == "x86_64-linux" then - "1h63gigvg8id95igcj8xw7qvxs4p2y9hvx4xbvkwg8bji3ifb0sk" - else "0655n2q1y023zzwbk6gs9vwsnb29jc0m3bg3x3xdw623qgb4k6px"; - }; - distfilename = if stdenv.system == "x86_64-linux" then "${name}-linux-amd64.bin" else "${name}-linux-i586.bin"; - - inherit unzip stdenv; -} diff --git a/pkgs/development/compilers/jdk/jdk6-cygwin.nix b/pkgs/development/compilers/jdk/jdk6-cygwin.nix index 766151dfe6b..31c9c614031 100644 --- a/pkgs/development/compilers/jdk/jdk6-cygwin.nix +++ b/pkgs/development/compilers/jdk/jdk6-cygwin.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { name = "jdk-1.6.0_20"; src = fetchurl { - url = file:///tmp/jdk-6u20-windows-i586.exe ; + url = file:///tmp/jdk-6u20-windows-i586.exe; sha256 = "0w4afz8a9gi1iyhh47gvhiy59dfrzx0fnmywdff3v5cx696w25fh"; }; @@ -43,4 +43,6 @@ stdenv.mkDerivation rec { ./jre/lib/ext/localedata.pack \ ./lib/tools.pack ''; + + meta.license = "unfree"; } diff --git a/pkgs/development/compilers/jdk/jdk6-linux.nix b/pkgs/development/compilers/jdk/jdk6-linux.nix index 224f77a1357..b564d311014 100644 --- a/pkgs/development/compilers/jdk/jdk6-linux.nix +++ b/pkgs/development/compilers/jdk/jdk6-linux.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation { inherit installjdk; buildInputs = [unzip makeWrapper]; - + /** * libXt is only needed on amd64 */ @@ -67,4 +67,6 @@ stdenv.mkDerivation { inherit (xlibs) libX11; mozillaPlugin = if installjdk then "/jre/lib/${architecture}/plugins" else "/lib/${architecture}/plugins"; + + meta.license = "unfree"; } diff --git a/pkgs/development/compilers/julia/default.nix b/pkgs/development/compilers/julia/default.nix index a594e0e6815..c1b607b725b 100644 --- a/pkgs/development/compilers/julia/default.nix +++ b/pkgs/development/compilers/julia/default.nix @@ -1,35 +1,46 @@ -{ stdenv, fetchgit, gfortran, perl, m4, llvm, gmp, pcre, blas, liblapack +{ stdenv, fetchgit, gfortran, perl, m4, llvm, gmp, pcre, zlib , readline, fftwSinglePrec, fftw, libunwind, suitesparse, glpk, fetchurl - , ncurses, libunistring, lighttpd, patchelf + , ncurses, libunistring, lighttpd, patchelf, openblas, liblapack } : let - liblapackShared = liblapack.override{shared=true;}; realGcc = stdenv.gcc.gcc; in stdenv.mkDerivation rec { pname = "julia"; - date = "20120501"; + date = "20120904"; name = "${pname}-git-${date}"; - grisu_ver = "1.1"; + grisu_ver = "1.1.1"; dsfmt_ver = "2.1"; - arpack_ver = "3.1.0"; + openblas_ver = "v0.2.2"; + lapack_ver = "3.4.1"; + arpack_ver = "3.1.2"; clp_ver = "1.14.5"; lighttpd_ver = "1.4.29"; grisu_src = fetchurl { url = "http://double-conversion.googlecode.com/files/double-conversion-${grisu_ver}.tar.gz"; - sha256 = "addee31d11350e4dde2b19c749eda648cb0ab38a68b0dd0d0a45dc49c7346fe7"; + sha256 = "e1cabb73fd69e74f145aea91100cde483aef8b79dc730fcda0a34466730d4d1d"; }; dsfmt_src = fetchurl { url = "http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/dSFMT-src-${dsfmt_ver}.tar.gz"; name = "dsfmt-${dsfmt_ver}.tar.gz"; sha256 = "e9d3e04bc984ec3b14033342f5ebdcd5202d8d8e40128dd737f566945612378f"; }; + openblas_src = fetchurl { + url = "https://github.com/xianyi/OpenBLAS/tarball/${openblas_ver}"; + name = "openblas-${openblas_ver}.tar.gz"; + sha256 = "19ffec70f9678f5c159feadc036ca47720681b782910fbaa95aa3867e7e86d8e"; + }; arpack_src = fetchurl { - url = "http://forge.scilab.org/index.php/p/arpack-ng/downloads/376/get/"; + url = "http://forge.scilab.org/index.php/p/arpack-ng/downloads/497/get/"; name = "arpack-ng_${arpack_ver}.tar.gz"; - sha256 = "65b7856126f06ecbf9ec450d50df92ca9260d4b0d21baf02497554ac230d6feb"; + sha256 = "1wk06bdjgap4hshx0lswzi7vxy2lrdx353y1k7yvm97mpsjvsf4k"; + }; + lapack_src = fetchurl { + url = "http://www.netlib.org/lapack/lapack-${lapack_ver}.tgz"; + name = "lapack-${lapack_ver}.tgz"; + sha256 = "93b910f94f6091a2e71b59809c4db4a14655db527cfc5821ade2e8c8ab75380f"; }; clp_src = fetchurl { url = "http://www.coin-or.org/download/source/Clp/Clp-${clp_ver}.tgz"; @@ -43,16 +54,17 @@ stdenv.mkDerivation rec { src = fetchgit { url = "git://github.com/JuliaLang/julia.git"; - rev = "990ffabb00f0e51d326911888facdbc473fb634d"; - sha256 = "dfcf41b2d7b62dd490bfd6f6fb962713c920de3f00afaee47423bd26eba7e3b2"; + rev = "b842bf4ae4d80f28803ec54f3da412a0248046a9"; + sha256 = "4d67f4f4d35c76ea8981198e42feb1c30a50ac7e1e15b752fa41b26ebadcd828"; }; - buildInputs = [ gfortran perl m4 gmp pcre llvm blas liblapackShared readline + buildInputs = [ gfortran perl m4 gmp pcre llvm readline zlib fftw fftwSinglePrec libunwind suitesparse glpk ncurses libunistring patchelf + openblas liblapack ]; configurePhase = '' - for i in GMP LLVM PCRE BLAS LAPACK READLINE FFTW LIBUNWIND SUITESPARSE GLPK; + for i in GMP LLVM PCRE LAPACK OPENBLAS BLAS READLINE FFTW LIBUNWIND SUITESPARSE GLPK LIGHTTPD ZLIB; do sed -e "s@USE_SYSTEM_$i=0@USE_SYSTEM_$i=1@" -i Make.inc; done @@ -62,52 +74,44 @@ stdenv.mkDerivation rec { cp "$1" "$2/$(basename "$1" | sed -e 's/^[a-z0-9]*-//')" } - for i in "${grisu_src}" "${dsfmt_src}" "${arpack_src}" "${clp_src}" "${lighttpd_src}" ; do + for i in "${grisu_src}" "${dsfmt_src}" "${arpack_src}" "${clp_src}" ; do copy_kill_hash "$i" deps done copy_kill_hash "${dsfmt_src}" deps/random - sed -e '/cd SuiteSparse-SYSTEM/,+1s@find /lib /usr/lib /usr/local/lib@find ${suitesparse}/lib@' -i deps/Makefile - ${if realGcc ==null then "" else - ''export NIX_LDFLAGS="$NIX_LDFLAGS -L${realGcc}/lib -L${realGcc}/lib64 -lpcre -llapack -lm -lfftw3f -lfftw3 -lglpk -lunistring "''} + ''export NIX_LDFLAGS="$NIX_LDFLAGS -L${realGcc}/lib -L${realGcc}/lib64 -lpcre -llapack -lm -lfftw3f -lfftw3 -lglpk -lunistring -lz "''} sed -e 's@ cpp @ gcc -E @g' -i base/Makefile - sed -e '1s@#! */bin/bash@#!${stdenv.shell}@' -i deps/*.sh - export LDFLAGS="-L${suitesparse}/lib" + export GLPK_PREFIX="${glpk}/include" + mkdir -p "$out/lib" sed -e "s@/usr/local/lib@$out/lib@g" -i deps/Makefile sed -e "s@/usr/lib@$out/lib@g" -i deps/Makefile - sed -e '/libumfpack.a/s@find @find ${suitesparse}/lib @' -i deps/Makefile - - export makeFlags="$makeFlags PREFIX=\"$out\" USR=\"$out\"" - - sed -e 's@openblas@blas@' -i base/*.jl - - sed -e '/install -v julia-release-webserver/d' -i Makefile + export makeFlags="$makeFlags PREFIX=$out" export dontPatchELF=1 ''; + preBuild = '' + make -C test/unicode all + make -C extras glpk_h.jl GLPK_PREFIX="$GLPK_PREFIX" + ''; + postInstall = '' - ln -s "$out/share/julia/julia" "$out/bin" + ld -E --whole-archive --shared ${suitesparse}/lib/lib*[a-z].a -o "$out"/lib/libsuitesparse-shared.so + for i in umfpack cholmod amd camd colamd ; do + ln -s "libsuitesparse-shared.so" "$out/lib/lib$i.so" + done + ln -s "${lighttpd}/sbin/lighttpd" "$out/sbin/" + ln -s "${lighttpd}/lib/"* "$out/lib/" - mkdir -p "$out/share/julia/ui/" - cp -r ui/website "$out/share/julia/ui/" - cp deps/lighttpd.conf "$out/share/julia/ui/" - - mkdir -p "$out/share/julia/ui/webserver/" - cp -r ui/webserver/{*.jl,*.h} "$out/share/julia/ui/webserver/" - - echo -e '#!/bin/sh' >> "$out/bin/julia-webserver" - echo -e "cd \"$out/share/julia\"" >> "$out/bin/julia-webserver" - echo -e '${lighttpd}/sbin/lighttpd -D -f ./ui/lighttpd.conf &' >> "$out/bin/julia-webserver" - echo -e "'$out/bin/julia-release-webserver' -p 2001" >> "$out/bin/julia-webserver" - chmod a+x "$out/bin/julia-webserver" + cp -r test examples "$out/lib/julia" + ls -R > "$out/ls-R" ''; meta = { diff --git a/pkgs/development/compilers/mono/default.nix b/pkgs/development/compilers/mono/default.nix index 2f257fccc52..f59bb2cac40 100644 --- a/pkgs/development/compilers/mono/default.nix +++ b/pkgs/development/compilers/mono/default.nix @@ -23,7 +23,8 @@ stdenv.mkDerivation { # The file /nix/store/xxx-mono-2.4.2.1/lib/mscorlib.dll is an invalid CIL image dontStrip = true; - enableParallelBuilding = true; + # Parallel building doesn't work, as shows http://hydra.nixos.org/build/2983601 + enableParallelBuilding = false; preBuild = " makeFlagsArray=(INSTALL=`type -tp install`) diff --git a/pkgs/development/compilers/ocaml/3.12.1.nix b/pkgs/development/compilers/ocaml/3.12.1.nix index 66075d4a966..a70ba649d1f 100644 --- a/pkgs/development/compilers/ocaml/3.12.1.nix +++ b/pkgs/development/compilers/ocaml/3.12.1.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, ncurses, x11 }: let - useX11 = !stdenv.isArm; - useNativeCompilers = !stdenv.isArm; + useX11 = !stdenv.isArm && !stdenv.isMips; + useNativeCompilers = !stdenv.isArm && !stdenv.isMips; inherit (stdenv.lib) optionals optionalString; in @@ -30,6 +30,10 @@ stdenv.mkDerivation rec { ln -sv $out/lib/ocaml/caml $out/include/caml ''; + passthru = { + nativeCompilers = useNativeCompilers; + }; + meta = { homepage = http://caml.inria.fr/ocaml; licenses = [ "QPL" /* compiler */ "LGPLv2" /* library */ ]; diff --git a/pkgs/development/compilers/ocaml/4.00.0.nix b/pkgs/development/compilers/ocaml/4.00.0.nix new file mode 100644 index 00000000000..da065356e85 --- /dev/null +++ b/pkgs/development/compilers/ocaml/4.00.0.nix @@ -0,0 +1,63 @@ +{ stdenv, fetchurl, ncurses, x11 }: + +let + useX11 = !stdenv.isArm && !stdenv.isMips; + useNativeCompilers = !stdenv.isArm && !stdenv.isMips; + inherit (stdenv.lib) optionals optionalString; +in + +stdenv.mkDerivation rec { + + name = "ocaml-4.00.0"; + + src = fetchurl { + url = "http://caml.inria.fr/pub/distrib/ocaml-4.00/${name}.tar.bz2"; + sha256 = "ec886d7bc587ce472fcbdf294feb4b1fa2d8e7ef78ab6a4e66551699435d5cd7"; + }; + + prefixKey = "-prefix "; + configureFlags = ["-no-tk"] ++ optionals useX11 [ "-x11lib" x11 ]; + buildFlags = "world" + optionalString useNativeCompilers " bootstrap world.opt"; + buildInputs = [ncurses] ++ optionals useX11 [ x11 ]; + installTargets = "install" + optionalString useNativeCompilers " installopt"; + preConfigure = '' + CAT=$(type -tp cat) + sed -e "s@/bin/cat@$CAT@" -i config/auto-aux/sharpbang + ''; + postBuild = '' + mkdir -p $out/include + ln -sv $out/lib/ocaml/caml $out/include/caml + ''; + + passthru = { + nativeCompilers = useNativeCompilers; + }; + + meta = { + homepage = http://caml.inria.fr/ocaml; + licenses = [ "QPL" /* compiler */ "LGPLv2" /* library */ ]; + description = "OCaml, the most popular variant of the Caml language"; + + longDescription = + '' + OCaml is the most popular variant of the Caml language. From a + language standpoint, it extends the core Caml language with a + fully-fledged object-oriented layer, as well as a powerful module + system, all connected by a sound, polymorphic type system featuring + type inference. + + The OCaml system is an industrial-strength implementation of this + language, featuring a high-performance native-code compiler (ocamlopt) + for 9 processor architectures (IA32, PowerPC, AMD64, Alpha, Sparc, + Mips, IA64, HPPA, StrongArm), as well as a bytecode compiler (ocamlc) + and an interactive read-eval-print loop (ocaml) for quick development + and portability. The OCaml distribution includes a comprehensive + standard library, a replay debugger (ocamldebug), lexer (ocamllex) and + parser (ocamlyacc) generators, a pre-processor pretty-printer (camlp4) + and a documentation generator (ocamldoc). + ''; + + platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + }; + +} diff --git a/pkgs/development/compilers/openjdk/bootstrap.nix b/pkgs/development/compilers/openjdk/bootstrap.nix new file mode 100644 index 00000000000..2ac2eed117c --- /dev/null +++ b/pkgs/development/compilers/openjdk/bootstrap.nix @@ -0,0 +1,21 @@ +{ runCommand, glibc, fetchurl }: + +let + # !!! These should be on nixos.org + src = if glibc.system == "x86_64-linux" then + fetchurl { + url = http://nixos.org/tarballs/openjdk-bootstrap-x86_64-linux-2012-08-24.tar.xz; + sha256 = "0gla9dxrfq2w1hvgsnn8jg8a60k27im6z43a6iidi0qmwa0wah32"; + } + else if glibc.system == "i686-linux" then + fetchurl { + url = http://nixos.org/tarballs/openjdk-bootstrap-i686-linux-2012-08-24.tar.xz; + sha256 = "184wq212bycwbbq4ix8cc6jwjxkrqw9b01zb86q95kqpa8zy5206"; + } + else throw "No bootstrap for system"; +in + +runCommand "openjdk-bootstrap" {} '' + xz -dc ${src} | sed "s/e*-glibc-[^/]*/$(basename ${glibc})/g" | tar xv + mv openjdk-bootstrap $out +'' diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix index cf85c1706a8..f243baab591 100644 --- a/pkgs/development/compilers/openjdk/default.nix +++ b/pkgs/development/compilers/openjdk/default.nix @@ -21,6 +21,21 @@ , jreOnly ? false }: +let + + /** + * The JRE libraries are in directories that depend on the CPU. + */ + architecture = + if stdenv.system == "i686-linux" then + "i386" + else if stdenv.system == "x86_64-linux" then + "amd64" + else + throw "openjdk requires i686-linux or x86_64 linux"; + +in + stdenv.mkDerivation rec { name = "openj${if jreOnly then "re" else "dk"}-7b127"; @@ -107,6 +122,7 @@ stdenv.mkDerivation rec { "UNIXCOMMAND_PATH=" "BOOTDIR=${jdk}" "DROPS_DIR=$(DROPS_PATH)" + "SKIP_BOOT_CYCLE=false" ]; configurePhase = '' @@ -136,5 +152,7 @@ stdenv.mkDerivation rec { platforms = stdenv.lib.platforms.linux; }; + + passthru = { inherit architecture; }; } diff --git a/pkgs/development/compilers/openjdk/make-bootstrap.nix b/pkgs/development/compilers/openjdk/make-bootstrap.nix new file mode 100644 index 00000000000..090a1479741 --- /dev/null +++ b/pkgs/development/compilers/openjdk/make-bootstrap.nix @@ -0,0 +1,26 @@ +{ runCommand, openjdk, nukeReferences }: + +let arch = openjdk.architecture; in + +runCommand "${openjdk.name}-bootstrap.tar.xz" {} '' + mkdir -p openjdk-bootstrap/bin + mkdir -p openjdk-bootstrap/lib + mkdir -p openjdk-bootstrap/jre/lib/{security,ext,${arch}/{jli,server,client,headless}} + cp ${openjdk}/bin/{idlj,ja{va{,c,p,h},r},rmic} openjdk-bootstrap/bin + cp ${openjdk}/lib/tools.jar openjdk-bootstrap/lib + cp ${openjdk}/jre/lib/{meta-index,{charsets,jce,jsse,rt,resources}.jar,currency.data} openjdk-bootstrap/jre/lib + cp ${openjdk}/jre/lib/security/java.security openjdk-bootstrap/jre/lib/security + cp ${openjdk}/jre/lib/ext/{meta-index,sunjce_provider.jar} openjdk-bootstrap/jre/lib/ext + cp ${openjdk}/jre/lib/${arch}/{jvm.cfg,lib{awt,java,verify,zip,nio,net}.so} openjdk-bootstrap/jre/lib/${arch} + cp ${openjdk}/jre/lib/${arch}/jli/libjli.so openjdk-bootstrap/jre/lib/${arch}/jli + cp ${openjdk}/jre/lib/${arch}/server/libjvm.so openjdk-bootstrap/jre/lib/${arch}/server + cp ${openjdk}/jre/lib/${arch}/client/libjvm.so openjdk-bootstrap/jre/lib/${arch}/client || + rmdir openjdk-bootstrap/jre/lib/${arch}/client + cp ${openjdk}/jre/lib/${arch}/headless/libmawt.so openjdk-bootstrap/jre/lib/${arch}/headless + cp -a ${openjdk}/include openjdk-bootstrap + + chmod -R +w openjdk-bootstrap + find openjdk-bootstrap -print0 | xargs -0 ${nukeReferences}/bin/nuke-refs + + tar cv openjdk-bootstrap | xz > $out +'' diff --git a/pkgs/development/compilers/polyml/default.nix b/pkgs/development/compilers/polyml/default.nix index 9a3d0a7deb4..dfdc50cd827 100644 --- a/pkgs/development/compilers/polyml/default.nix +++ b/pkgs/development/compilers/polyml/default.nix @@ -1,16 +1,15 @@ {stdenv, fetchurl}: let - pname = "polyml"; - version = "5.4"; + version = "5.4.1"; in stdenv.mkDerivation { - name = "${pname}-${version}"; + name = "polyml-${version}"; src = fetchurl { - url = "mirror://sourceforge/${pname}/${pname}.${version}.tar.gz"; - sha256 = "1ykbm4zk260dkdr8jl7mjaqxy98h65fq0z82k44b1fp5q8zy5d34"; + url = "mirror://sourceforge/polyml/polyml.${version}.tar.gz"; + sha256 = "514d1d07be487b783d4dfa29dbd550b3396640579ce135a9eb5a61f08e7f9cac"; }; meta = { @@ -19,7 +18,7 @@ stdenv.mkDerivation { Poly/ML is a full implementation of Standard ML. ''; homepage = http://www.polyml.org/; - license = "LGPL"; + license = stdenv.lib.licenses.lgpl21; platforms = with stdenv.lib.platforms; linux; maintainers = [ #Add your name here! stdenv.lib.maintainers.z77z diff --git a/pkgs/development/compilers/sbcl/src-for-default.nix b/pkgs/development/compilers/sbcl/src-for-default.nix index 66e389947a0..d56520d2902 100644 --- a/pkgs/development/compilers/sbcl/src-for-default.nix +++ b/pkgs/development/compilers/sbcl/src-for-default.nix @@ -1,9 +1,9 @@ rec { - version="1.0.56"; - name="sbcl-1.0.56"; - hash="0cq5hyzv3nnva0y1y6zjyd7rfdwwpxswnvmbfmqvhihz72ivyl1w"; - url="http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.56/sbcl-1.0.56-source.tar.bz2"; - advertisedUrl="http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.56/sbcl-1.0.56-source.tar.bz2"; + version="1.0.58"; + name="sbcl-1.0.58"; + hash="0ifr96hy5ax5c5iv7igwgkwcqb3pwrc4ism957pkfb5yy39p4yc1"; + url="http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.58/sbcl-1.0.58-source.tar.bz2"; + advertisedUrl="http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.58/sbcl-1.0.58-source.tar.bz2"; } diff --git a/pkgs/development/compilers/scala/default.nix b/pkgs/development/compilers/scala/default.nix index 340076cc137..a78ee06f652 100644 --- a/pkgs/development/compilers/scala/default.nix +++ b/pkgs/development/compilers/scala/default.nix @@ -12,12 +12,10 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out - rm bin/*.bat + rm "bin/"*.bat mv * $out ''; - phases = "unpackPhase installPhase"; - meta = { description = "Scala is a general purpose programming language"; longDescription = '' @@ -25,7 +23,7 @@ stdenv.mkDerivation rec { common programming patterns in a concise, elegant, and type-safe way. It smoothly integrates features of object-oriented and functional languages, enabling Java and other programmers to be more productive. - Code sizes are typically reduced by a factor of two to three when + Code sizes are typically reduced by a factor of two to three when compared to an equivalent Java application. ''; homepage = http://www.scala-lang.org/; diff --git a/pkgs/development/compilers/urweb/default.nix b/pkgs/development/compilers/urweb/default.nix index 7dbbe375283..7c0ddde6612 100644 --- a/pkgs/development/compilers/urweb/default.nix +++ b/pkgs/development/compilers/urweb/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "urweb"; - version = "20120110"; + version = "20120807"; name = "${pname}-${version}"; src = fetchurl { url = "http://www.impredicative.com/ur/${name}.tgz"; - sha256 = "1f67nj2akji9dh3n2hwmcrrwd61zlrnb0xh841fpb3n20ycjzg6j"; + sha256 = "15g1cz108dkzlp433cg56x76f20y6zcs9sbgxgdniyfakmn4ld6l"; }; buildInputs = [ stdenv.gcc file openssl mlton mysql postgresql sqlite ]; @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.impredicative.com/ur/; - license = "bsd"; + license = stdenv.lib.licenses.bsd3; platforms = [ "i686-linux" "x86_64-linux" ]; }; } diff --git a/pkgs/development/eclipse/ecj/default.nix b/pkgs/development/eclipse/ecj/default.nix index 53343f00ca5..8d083126e4c 100644 --- a/pkgs/development/eclipse/ecj/default.nix +++ b/pkgs/development/eclipse/ecj/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, unzip, ant, gcj }: let - version = "3.6.1"; - date = "201009090800"; + version = "3.7.2"; + date = "201202080800"; isGCJ = stdenv.lib.strings.substring 0 3 gcj.name == "gcj"; javaExec = if isGCJ then "gij" else "java"; javaFlags = if isGCJ then "--cp" else "-cp"; @@ -11,8 +11,8 @@ in name = "ecj-${version}"; src = fetchurl { - url = "http://eclipse.ialto.org/eclipse/downloads/drops/R-${version}-${date}/ecjsrc-${version}.zip"; - sha256 = "0xfsig2pzd9wy524wp11s7pc7cj81s28g1485995b44d9qbi17h8"; + url = "http://eclipse.ialto.org/eclipse/downloads/drops/R-${version}-${date}/ecjsrc-${version}.jar"; + sha256 = "0swyysbyfmv068x8q1c5jqpwk5zb4xahg17aypx5rwb660f8fpbm"; }; buildInputs = [ unzip ant gcj ]; diff --git a/pkgs/development/interpreters/cython/default.nix b/pkgs/development/interpreters/cython/default.nix new file mode 100644 index 00000000000..42dafcb7f2e --- /dev/null +++ b/pkgs/development/interpreters/cython/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, python, pkgconfig }: + +stdenv.mkDerivation { + name = "cython-0.16"; + + src = fetchurl { + url = http://www.cython.org/release/Cython-0.16.tar.gz; + sha256 = "1yz6jwv25xx5mbr2nm4l7mi65gvpm63dzi3vrw73p51wbpy525lp"; + }; + + buildPhase = "python setup.py build --build-base $out"; + + installPhase = "python setup.py install --prefix=$out"; + + buildInputs = [ python pkgconfig ]; + + meta = { + description = "An interpreter to help writing C extensions for Python"; + }; +} diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix index ea895fb1186..cc49ab87af8 100644 --- a/pkgs/development/interpreters/guile/default.nix +++ b/pkgs/development/interpreters/guile/default.nix @@ -7,11 +7,11 @@ else stdenv.mkDerivation) (rec { - name = "guile-2.0.5"; + name = "guile-2.0.6"; src = fetchurl { url = "mirror://gnu/guile/${name}.tar.xz"; - sha256 = "1lycm10x316jzlv1nyag7x9gisn4d3dz8jcmbi6lbdn0z6a9skc2"; + sha256 = "000ng5qsq3cl1k35jvzvhwxj92wx4q87745n2fppkd4irh58vv5l"; }; buildNativeInputs = [ makeWrapper gawk pkgconfig ]; @@ -81,10 +81,31 @@ // +(stdenv.lib.optionalAttrs stdenv.isSunOS { + # TODO: Move me above. + configureFlags = + [ + # Make sure the right is found, and not the incompatible + # /usr/include/mp.h from OpenSolaris. See + # + # for details. + "--with-libgmp-prefix=${gmp}" + + # Same for these (?). + "--with-libreadline-prefix=${readline}" + "--with-libunistring-prefix=${libunistring}" + + # See below. + "--without-threads" + ]; +}) + +// + (if stdenv.isFreeBSD then { - # XXX: Thread support is currently broken on FreeBSD (namely the - # `SCM_I_IS_THREAD' assertion in `scm_spawn_thread' is hit.) + # XXX: Thread support is currently broken on FreeBSD and Solaris (namely + # the `SCM_I_IS_THREAD' assertion in `scm_spawn_thread' is hit.) configureFlags = [ "--without-threads" ]; } else {})) diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix index dbbb0324d14..3ffdc415f88 100644 --- a/pkgs/development/interpreters/octave/default.nix +++ b/pkgs/development/interpreters/octave/default.nix @@ -3,10 +3,10 @@ libX11, graphicsmagick, pcre, liblapack, texLive, pkgconfig, mesa, fltk, fftw, fftwSinglePrec, zlib, curl, qrupdate }: stdenv.mkDerivation rec { - name = "octave-3.6.1"; + name = "octave-3.6.2"; src = fetchurl { url = "mirror://gnu/octave/${name}.tar.bz2"; - sha256 = "1xmd9rqpwzn6z808i3brw1w9lh083vpjg046cj4gg3qdazkkw1zq"; + sha256 = "1bn48ldhx585iyrylnz59b6mb3wlpvmz2i3ri8q75s5ys29rpdhb"; }; buildInputs = [ gfortran readline ncurses perl flex texinfo qhull libX11 @@ -15,7 +15,9 @@ stdenv.mkDerivation rec { doCheck = true; - enableParallelBuilding = true; + /* The build failed with a missing libranlib.la in hydra, + but worked on my computer. I think they have concurrency problems */ + enableParallelBuilding = false; configureFlags = [ "--enable-readline" "--enable-dl" ]; diff --git a/pkgs/development/interpreters/php/5.3.nix b/pkgs/development/interpreters/php/5.3.nix index d071070f9a6..b4f00ab1f7d 100644 --- a/pkgs/development/interpreters/php/5.3.nix +++ b/pkgs/development/interpreters/php/5.3.nix @@ -8,7 +8,7 @@ in composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in { - version = "5.3.13"; + version = "5.3.15"; name = "php-${version}"; @@ -149,15 +149,12 @@ composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in { installPhase = '' unset installPhase; installPhase; - cp php.ini-${ if builtins.lessThan (builtins.compareVersions version "5.3") 0 - then "recommended" /* < PHP 5.3 */ - else "production" /* >= PHP 5.3 */ - } $iniFile + cp php.ini-production $iniFile ''; src = args.fetchurl { url = "http://nl.php.net/get/php-${version}.tar.bz2/from/this/mirror"; - sha256 = "16yr678bgks6hlhmmmi5s9ivhcx1f1bhvxkk3zrlkr3bn4sp46pg"; + sha256 = "1vzij845n2akh2lkpacgdc5r0f7nw6pk9l9vi1h8l8k4krjjbdzr"; name = "php-${version}.tar.bz2"; }; diff --git a/pkgs/development/interpreters/pyrex/0.9.5.nix b/pkgs/development/interpreters/pyrex/0.9.5.nix index 5ba57dbc1ea..3f6a3c1bfcb 100644 --- a/pkgs/development/interpreters/pyrex/0.9.5.nix +++ b/pkgs/development/interpreters/pyrex/0.9.5.nix @@ -1,26 +1,19 @@ -{ stdenv, fetchurl, builderDefs, python }: +{ stdenv, fetchurl, pythonPackages }: -let +let version = "0.9.5.1.1"; in - localDefs = builderDefs.passthru.function { +pythonPackages.buildPythonPackage rec { + name = "pyrex-${version}"; - src = fetchurl { - url = http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/oldtar/Pyrex-0.9.5.1.1.tar.gz; - sha256 = "0lxxvn4mjfb83swcbqb5908q4iy53w4ip5i0f9angm2va1jyhd3z"; - }; + src = fetchurl { + url = "http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/oldtar/Pyrex-${version}.tar.gz"; + sha256 = "0lxxvn4mjfb83swcbqb5908q4iy53w4ip5i0f9angm2va1jyhd3z"; + }; - buildInputs = [python]; + doCheck = false; - }; - -in with localDefs; - -stdenv.mkDerivation rec { - name = "pyrex-0.9.5.1.1"; - builder = writeScript (name + "-builder") - (textClosure localDefs [installPythonPackage doForceShare]); meta = { - description = "Python package compiler or something like that"; - inherit src; + homepage = http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/; + description = "A language for writing Python extension modules"; }; } diff --git a/pkgs/development/interpreters/pyrex/0.9.6.nix b/pkgs/development/interpreters/pyrex/0.9.6.nix index cd233415615..44e014322ff 100644 --- a/pkgs/development/interpreters/pyrex/0.9.6.nix +++ b/pkgs/development/interpreters/pyrex/0.9.6.nix @@ -1,26 +1,19 @@ -{ stdenv, fetchurl, builderDefs, python }: +{ stdenv, fetchurl, pythonPackages }: -let +let version = "0.9.6.4"; in - localDefs = builderDefs.passthru.function { - - src = fetchurl { - url = http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/oldtar/Pyrex-0.9.6.4.tar.gz; - sha256 = "18pd9f8al3l6i27cc0ddhgg7hxf28lnfs75x4a8jzscydxgiq5a8"; - }; - - buildInputs = [python]; +pythonPackages.buildPythonPackage rec { + name = "pyrex-${version}"; + src = fetchurl { + url = "http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/oldtar/Pyrex-${version}.tar.gz"; + sha256 = "18pd9f8al3l6i27cc0ddhgg7hxf28lnfs75x4a8jzscydxgiq5a8"; }; -in with localDefs; - -stdenv.mkDerivation rec { - name = "pyrex-0.9.6.4"; - builder = writeScript (name + "-builder") - (textClosure localDefs [installPythonPackage doForceShare]); + doCheck = false; + meta = { - description = "Python package compiler or something like that"; - inherit src; + homepage = http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/; + description = "A language for writing Python extension modules"; }; } diff --git a/pkgs/development/interpreters/ruby/generated.nix b/pkgs/development/interpreters/ruby/generated.nix index a2a6273da60..bc50a08f29a 100644 --- a/pkgs/development/interpreters/ruby/generated.nix +++ b/pkgs/development/interpreters/ruby/generated.nix @@ -3,68 +3,69 @@ g: # Get dependencies from patched gems { aliases = { - ZenTest = g.ZenTest_4_8_0; - actionmailer = g.actionmailer_3_2_3; - actionpack = g.actionpack_3_2_3; - activemodel = g.activemodel_3_2_3; - activerecord = g.activerecord_3_2_3; - activeresource = g.activeresource_3_2_3; - activesupport = g.activesupport_3_2_3; + ZenTest = g.ZenTest_4_8_1; + actionmailer = g.actionmailer_3_2_6; + actionpack = g.actionpack_3_2_6; + activemodel = g.activemodel_3_2_6; + activerecord = g.activerecord_3_2_6; + activeresource = g.activeresource_3_2_6; + activesupport = g.activesupport_3_2_6; addressable = g.addressable_2_2_8; arel = g.arel_3_0_2; - atoulme_Antwrap = g.atoulme_Antwrap_0_7_1; + atoulme_Antwrap = g.atoulme_Antwrap_0_7_2; autotest_rails = g.autotest_rails_4_1_2; builder = g.builder_3_0_0; - buildr = g.buildr_1_4_6; - bundler = g.bundler_1_1_3; - childprocess = g.childprocess_0_3_2; + buildr = g.buildr_1_4_7; + bundler = g.bundler_1_1_4; + childprocess = g.childprocess_0_3_3; diff_lcs = g.diff_lcs_1_1_3; erubis = g.erubis_2_7_0; + fakes3 = g.fakes3_0_1_5; ffi = g.ffi_1_0_11; - highline = g.highline_1_5_1; + highline = g.highline_1_6_2; hike = g.hike_1_2_1; hoe = g.hoe_2_3_3; i18n = g.i18n_0_6_0; - journey = g.journey_1_0_3; - json = g.json_1_7_0; - json_pure = g.json_pure_1_7_0; + journey = g.journey_1_0_4; + json = g.json_1_7_3; + json_pure = g.json_pure_1_7_3; libwebsocket = g.libwebsocket_0_1_3; mail = g.mail_2_4_4; - mime_types = g.mime_types_1_18; + mime_types = g.mime_types_1_19; minitar = g.minitar_0_5_3; - multi_json = g.multi_json_1_3_4; - net_sftp = g.net_sftp_2_0_4; - net_ssh = g.net_ssh_2_3_0; + multi_json = g.multi_json_1_3_6; + net_sftp = g.net_sftp_2_0_5; + net_ssh = g.net_ssh_2_5_2; nix = g.nix_0_1_1; polyglot = g.polyglot_0_3_3; rack = g.rack_1_4_1; rack_cache = g.rack_cache_1_2; rack_ssl = g.rack_ssl_1_3_2; rack_test = g.rack_test_0_6_1; - rails = g.rails_3_2_3; - railties = g.railties_3_2_3; + rails = g.rails_3_2_6; + railties = g.railties_3_2_6; rake = g.rake_0_9_2_2; rb_fsevent = g.rb_fsevent_0_9_1; rdoc = g.rdoc_3_12; rjb = g.rjb_1_4_0; - rspec = g.rspec_2_1_0; - rspec_core = g.rspec_core_2_1_0; - rspec_expectations = g.rspec_expectations_2_1_0; - rspec_mocks = g.rspec_mocks_2_1_0; + rspec = g.rspec_2_9_0; + rspec_core = g.rspec_core_2_9_0; + rspec_expectations = g.rspec_expectations_2_9_1; + rspec_mocks = g.rspec_mocks_2_9_0; rubyforge = g.rubyforge_2_0_4; - rubyzip = g.rubyzip_0_9_8; - sass = g.sass_3_1_17; - selenium_webdriver = g.selenium_webdriver_2_21_2; + rubyzip = g.rubyzip_0_9_9; + sass = g.sass_3_1_20; + selenium_webdriver = g.selenium_webdriver_2_24_0; sprockets = g.sprockets_2_1_3; - thor = g.thor_0_14_6; + thor = g.thor_0_15_4; tilt = g.tilt_1_3_3; treetop = g.treetop_1_4_10; tzinfo = g.tzinfo_0_3_33; xml_simple = g.xml_simple_1_0_12; }; - gem_nix_args = [ ''autotest-rails'' ''buildr'' ''nix'' ''rails'' ''rake'' ''rb-fsevent'' ''sass'' ''selenium-webdriver'' ]; + gem_nix_args = [ ''autotest-rails'' ''buildr'' ''fakes3'' ''nix'' ''rails'' ''rake'' ''rb-fsevent'' ''sass'' ''selenium-webdriver'' ]; gems = { - ZenTest_4_8_0 = { + ZenTest_4_8_1 = { basename = ''ZenTest''; meta = { description = ''ZenTest provides 4 different tools: zentest, unit_diff, autotest, and multiruby''; @@ -91,75 +92,75 @@ multiruby runs anything you want on multiple versions of ruby. Great for compatibility checking! Use multiruby_setup to manage your installed versions.''; }; - name = ''ZenTest-4.8.0''; + name = ''ZenTest-4.8.1''; requiredGems = [ ]; - sha256 = ''1z999prd8imx8wnb8jv3i19xmzrwd72b05zhk875mbg5q64nbpnz''; + sha256 = ''0jp86czz16b0wamxvzs8p7pxwagj68h2zch9yjmjk7b069xrsg3v''; }; - actionmailer_3_2_3 = { + actionmailer_3_2_6 = { basename = ''actionmailer''; meta = { description = ''Email composition, delivery, and receiving framework (part of Rails).''; homepage = ''http://www.rubyonrails.org''; longDescription = ''Email on Rails. Compose, deliver, receive, and test emails using the familiar controller/view pattern. First-class support for multipart email and attachments.''; }; - name = ''actionmailer-3.2.3''; + name = ''actionmailer-3.2.6''; requiredGems = [ g.mail_2_4_4 ]; - sha256 = ''09zzg09q6321l4gdyk9w7400di7rqvrhh427s666frlh1a91gdj4''; + sha256 = ''1h9035i9rnh98pc4z073cpcjjkwcswjigg1a3a6ll0s9lb6dnk54''; }; - actionpack_3_2_3 = { + actionpack_3_2_6 = { basename = ''actionpack''; meta = { description = ''Web-flow and rendering framework putting the VC in MVC (part of Rails).''; homepage = ''http://www.rubyonrails.org''; longDescription = ''Web apps on Rails. Simple, battle-tested conventions for building and testing MVC web applications. Works with any Rack-compatible server.''; }; - name = ''actionpack-3.2.3''; - requiredGems = [ g.activemodel_3_2_3 g.rack_cache_1_2 g.rack_test_0_6_1 g.journey_1_0_3 g.sprockets_2_1_3 g.erubis_2_7_0 ]; - sha256 = ''0wg42jikmsy5bj8wp3kp21ggj1x6g0abbk1i39rlpfvsgj7fwx8v''; + name = ''actionpack-3.2.6''; + requiredGems = [ g.activemodel_3_2_6 g.rack_cache_1_2 g.rack_test_0_6_1 g.journey_1_0_4 g.sprockets_2_1_3 g.erubis_2_7_0 ]; + sha256 = ''1qwy7p353sp3x3crinfsx873vfrc84bfy61hz95qhy8anq03ay34''; }; - activemodel_3_2_3 = { + activemodel_3_2_6 = { basename = ''activemodel''; meta = { description = ''A toolkit for building modeling frameworks (part of Rails).''; homepage = ''http://www.rubyonrails.org''; longDescription = ''A toolkit for building modeling frameworks like Active Record and Active Resource. Rich support for attributes, callbacks, validations, observers, serialization, internationalization, and testing.''; }; - name = ''activemodel-3.2.3''; - requiredGems = [ g.builder_3_0_0 ]; - sha256 = ''1n287g8nbm0bkvz0qh7pqw1racpzvfjzmgil9fn38p4k7dl3akg3''; + name = ''activemodel-3.2.6''; + requiredGems = [ ]; + sha256 = ''18bvwpfxr6kp66b62n17qgn7bb02va6bvckips36cxrkznafsk6j''; }; - activerecord_3_2_3 = { + activerecord_3_2_6 = { basename = ''activerecord''; meta = { description = ''Object-relational mapper framework (part of Rails).''; homepage = ''http://www.rubyonrails.org''; longDescription = ''Databases on Rails. Build a persistent domain model by mapping database tables to Ruby classes. Strong conventions for associations, validations, aggregations, migrations, and testing come baked-in.''; }; - name = ''activerecord-3.2.3''; + name = ''activerecord-3.2.6''; requiredGems = [ g.arel_3_0_2 g.tzinfo_0_3_33 ]; - sha256 = ''0ms5q7c13d1pmzgspnwh58h9y5bzdfsjzkrkxqrrjxp0212ixcxn''; + sha256 = ''1xc901m3a85j28bn2f96fh9c5y4wq4xivympm32xj4zr2ib20c2m''; }; - activeresource_3_2_3 = { + activeresource_3_2_6 = { basename = ''activeresource''; meta = { description = ''REST modeling framework (part of Rails).''; homepage = ''http://www.rubyonrails.org''; longDescription = ''REST on Rails. Wrap your RESTful web app with Ruby classes and work with them like Active Record models.''; }; - name = ''activeresource-3.2.3''; + name = ''activeresource-3.2.6''; requiredGems = [ ]; - sha256 = ''1hdsr4fs355lv3ncfjv8h2s4p61rhsbz2yk21ms3n19qwblbvnwa''; + sha256 = ''1lyv64rccgrdfhzccxj9qm5dnjy212x4q1nc21mf2xf2nc4zi33a''; }; - activesupport_3_2_3 = { + activesupport_3_2_6 = { basename = ''activesupport''; meta = { description = ''A toolkit of support libraries and Ruby core extensions extracted from the Rails framework.''; homepage = ''http://www.rubyonrails.org''; longDescription = ''A toolkit of support libraries and Ruby core extensions extracted from the Rails framework. Rich support for multibyte strings, internationalization, time zones, and testing.''; }; - name = ''activesupport-3.2.3''; - requiredGems = [ g.i18n_0_6_0 g.multi_json_1_3_4 ]; - sha256 = ''05656xcknixlkpjj5xrzk4bbniywmjn9blj0nsrpglplcf5ivh4g''; + name = ''activesupport-3.2.6''; + requiredGems = [ g.i18n_0_6_0 g.multi_json_1_3_6 ]; + sha256 = ''00jlixc7pkifikdgkjmgxypx8rizj3jizhjcpi4v9hd72yw8m7j2''; }; addressable_2_2_8 = { basename = ''addressable''; @@ -193,7 +194,7 @@ database compatibility and query generation.''; requiredGems = [ ]; sha256 = ''158bvrhammpblky9z9dgimjr55bdypfx6w5s1dm4vyj42h49qpkx''; }; - atoulme_Antwrap_0_7_1 = { + atoulme_Antwrap_0_7_2 = { basename = ''atoulme_Antwrap''; meta = { description = ''A Ruby module that wraps the Apache Ant build tool. Antwrap can be used to invoke Ant Tasks from a Ruby or a JRuby script.''; @@ -211,9 +212,9 @@ database compatibility and query generation.''; Ant (http://ant.apache.org/) tasks in a Java project. If you are tired of fighting with Ant or Maven XML files in your Java project, take some time to check out Buildr!''; }; - name = ''atoulme-Antwrap-0.7.1''; - requiredGems = [ g.rjb_1_4_0 ]; - sha256 = ''0r9jy2asyma8h0878nhjfbi00qvb4yapc8glngvmkkj21zbx2mfy''; + name = ''atoulme-Antwrap-0.7.2''; + requiredGems = [ ]; + sha256 = ''0r9l3cn0gjck5q00djas5h43pr64pjvafhz6f7zhki4qqkwbb6j3''; }; autotest_rails_4_1_2 = { basename = ''autotest_rails''; @@ -224,7 +225,7 @@ database compatibility and query generation.''; rails support and extra plugins for migrations and fixtures.''; }; name = ''autotest-rails-4.1.2''; - requiredGems = [ g.ZenTest_4_8_0 ]; + requiredGems = [ g.ZenTest_4_8_1 ]; sha256 = ''1wkb5jayb39yx0i8ly7sibygf9f9c3w24jg2z1qgm135zlb070v4''; }; builder_2_1_2 = { @@ -254,7 +255,7 @@ simple to do. Currently the following builder objects are supported: requiredGems = [ ]; sha256 = ''13k12jii9z1hma4xxk2dl74wsx985idl3cs9svvla8p0bmgf3lzv''; }; - buildr_1_4_6 = { + buildr_1_4_7 = { basename = ''buildr''; meta = { description = ''Build like you code''; @@ -266,42 +267,31 @@ to do, and it takes care of the rest. But also something we can easily extend for those one-off tasks, with a language that's a joy to use. ''; }; - name = ''buildr-1.4.6''; - requiredGems = [ g.rake_0_8_7 g.builder_2_1_2 g.net_ssh_2_0_23 g.net_sftp_2_0_4 g.rubyzip_0_9_4 g.highline_1_5_1 g.json_pure_1_4_3 g.rubyforge_2_0_3 g.hoe_2_3_3 g.rjb_1_3_3 g.atoulme_Antwrap_0_7_1 g.diff_lcs_1_1_2 g.rspec_expectations_2_1_0 g.rspec_mocks_2_1_0 g.rspec_core_2_1_0 g.rspec_2_1_0 g.xml_simple_1_0_12 g.minitar_0_5_3 ]; - sha256 = ''11qwqrdnmzzi4zhgajfq1f1ckvd4kpfm9gyqrfjfalphs4gi0vxz''; + name = ''buildr-1.4.7''; + requiredGems = [ g.rake_0_9_2_2 g.builder_2_1_2 g.net_ssh_2_3_0 g.net_sftp_2_0_5 g.rubyzip_0_9_4 g.highline_1_6_2 g.json_pure_1_4_3 g.rubyforge_2_0_3 g.hoe_2_3_3 g.rjb_1_4_0 g.atoulme_Antwrap_0_7_2 g.diff_lcs_1_1_3 g.rspec_expectations_2_9_0 g.rspec_mocks_2_9_0 g.rspec_core_2_9_0 g.rspec_2_9_0 g.xml_simple_1_0_12 g.minitar_0_5_3 ]; + sha256 = ''0ddb71xgdjxvkf485c16kvip8i26wy4l171pjbw04qmy3cank42h''; }; - bundler_1_1_3 = { + bundler_1_1_4 = { basename = ''bundler''; meta = { description = ''The best way to manage your application's dependencies''; homepage = ''http://gembundler.com''; longDescription = ''Bundler manages an application's dependencies through its entire life, across many machines, systematically and repeatably''; }; - name = ''bundler-1.1.3''; + name = ''bundler-1.1.4''; requiredGems = [ ]; - sha256 = ''df5ce52b6229bae5cf2eabae71858ea7e735fa0e479b4d00cff1ee18c5f6e800''; + sha256 = ''13pj4kk01xrdmdvgz1mvvhnbp1vi40gq50n8wdk3lpqp5za26gr0''; }; - childprocess_0_3_2 = { + childprocess_0_3_3 = { basename = ''childprocess''; meta = { description = ''This gem aims at being a simple and reliable solution for controlling external programs running in the background on any Ruby / OS combination.''; homepage = ''http://github.com/jarib/childprocess''; longDescription = ''This gem aims at being a simple and reliable solution for controlling external programs running in the background on any Ruby / OS combination.''; }; - name = ''childprocess-0.3.2''; + name = ''childprocess-0.3.3''; requiredGems = [ g.ffi_1_0_11 ]; - sha256 = ''006j501yik87rlgkng2nqn13awnlgagk9p93bfsiccvc4fn73m3q''; - }; - diff_lcs_1_1_2 = { - basename = ''diff_lcs''; - meta = { - description = ''Provides a list of changes that represent the difference between two sequenced collections.''; - homepage = ''http://rubyforge.org/projects/ruwiki/''; - longDescription = ''Diff::LCS is a port of Algorithm::Diff that uses the McIlroy-Hunt longest common subsequence (LCS) algorithm to compute intelligent differences between two sequenced enumerable containers. The implementation is based on Mario I. Wolczko's Smalltalk version (1.2, 1993) and Ned Konz's Perl version (Algorithm::Diff).''; - }; - name = ''diff-lcs-1.1.2''; - requiredGems = [ ]; - sha256 = ''1i5bfxh77whaasajhzd2qkm5zwy7ryb7pfc96m1fv9afwn6cg3yp''; + sha256 = ''0yqlbxnc427lnh1xw71qyzkic1pdpmacqxp8zw0gvx7yzkw3fjr0''; }; diff_lcs_1_1_3 = { basename = ''diff_lcs''; @@ -351,6 +341,16 @@ is the MIT license.''; requiredGems = [ ]; sha256 = ''1fj827xqjs91yqsydf0zmfyw9p4l2jz5yikg3mppz6d7fi8kyrb3''; }; + fakes3_0_1_5 = { + basename = ''fakes3''; + meta = { + description = ''FakeS3 is a server that simulates S3 commands so you can test your S3 functionality in your projects''; + longDescription = ''Use FakeS3 to test basic S3 functionality without actually connecting to S3''; + }; + name = ''fakes3-0.1.5''; + requiredGems = [ g.thor_0_15_4 g.builder_3_0_0 ]; + sha256 = ''1na5wrbarla6s414svqmr5spbpv6vmcgpswal444x4clcpmadhib''; + }; ffi_1_0_11 = { basename = ''ffi''; meta = { @@ -366,16 +366,20 @@ using Ruby-FFI here[http://wiki.github.com/ffi/ffi/why-use-ffi].''; requiredGems = [ ]; sha256 = ''177v6bwslyb7n961nw11i8x9j43k796s11bs98kynl58n0a3n99b''; }; - highline_1_5_1 = { + highline_1_6_2 = { basename = ''highline''; meta = { description = ''HighLine is a high-level command-line IO library.''; homepage = ''http://highline.rubyforge.org''; - longDescription = ''A high-level IO library that provides validation, type conversion, and more for command-line interfaces. HighLine also includes a complete menu system that can crank out anything from simple list selection to complete shells with just minutes of work.''; + longDescription = ''A high-level IO library that provides validation, type conversion, and more for +command-line interfaces. HighLine also includes a complete menu system that can +crank out anything from simple list selection to complete shells with just +minutes of work. +''; }; - name = ''highline-1.5.1''; + name = ''highline-1.6.2''; requiredGems = [ ]; - sha256 = ''0sawb011sc1i5glr80a4iflr0vvn3s5c97a4jmrhj3palv4df19i''; + sha256 = ''0azmahb70f1nlg6lq5wljbzcijhfb9lz8skwb4k2977kdml07mcn''; }; hike_1_2_1 = { basename = ''hike''; @@ -415,7 +419,7 @@ Plug-ins Provided: See class rdoc for help. Hint: ri Hoe''; }; name = ''hoe-2.3.3''; - requiredGems = [ g.rubyforge_2_0_4 g.rake_0_9_2_2 ]; + requiredGems = [ g.rubyforge_2_0_4 ]; sha256 = ''06jlnbhimrn6znimaaxm7kh2269lapkbmnp3wssrjmw06ms7lq9m''; }; i18n_0_6_0 = { @@ -429,27 +433,27 @@ See class rdoc for help. Hint: ri Hoe''; requiredGems = [ ]; sha256 = ''1pgmfhmh2wv409g7kla30mkp8jpslvp25vcmmim1figl87wpn3j0''; }; - journey_1_0_3 = { + journey_1_0_4 = { basename = ''journey''; meta = { description = ''Journey is a router''; homepage = ''http://github.com/rails/journey''; longDescription = ''Journey is a router. It routes requests.''; }; - name = ''journey-1.0.3''; + name = ''journey-1.0.4''; requiredGems = [ ]; - sha256 = ''15bxq7dqhk88n7cjvmx0ipizc22mzf5mnb58r1nq2sq5mcpag6gb''; + sha256 = ''03y1xidg1rx1yjz8xb50083vfwcsfkgs4zmizc040y1h4mhvhm3l''; }; - json_1_7_0 = { + json_1_7_3 = { basename = ''json''; meta = { description = ''JSON Implementation for Ruby''; homepage = ''http://flori.github.com/json''; longDescription = ''This is a JSON implementation as a Ruby extension in C.''; }; - name = ''json-1.7.0''; + name = ''json-1.7.3''; requiredGems = [ ]; - sha256 = ''5affdd32dfc4a21f3d076d12e223a5da3778d0d027a6b033f556ba394c6ca6de''; + sha256 = ''1n969j5k0zb7dqfbnjhqm5hnxpsbi05rhsp5ww3cph7d5z6ycw0h''; }; json_pure_1_4_3 = { basename = ''json_pure''; @@ -462,16 +466,16 @@ See class rdoc for help. Hint: ri Hoe''; requiredGems = [ ]; sha256 = ''1xw357gkmk6712c94lhpsrq8j9v91mgc2nxlr1m6n20yl6sz2g9r''; }; - json_pure_1_7_0 = { + json_pure_1_7_3 = { basename = ''json_pure''; meta = { description = ''JSON Implementation for Ruby''; homepage = ''http://flori.github.com/json''; longDescription = ''This is a JSON implementation in pure Ruby.''; }; - name = ''json_pure-1.7.0''; + name = ''json_pure-1.7.3''; requiredGems = [ ]; - sha256 = ''1c661piay7i4zvjl2v8w01x69v17ip5gxwqkfzclqf3zznym28pp''; + sha256 = ''0m316halw0l1gd2lx811qhyfs9a98dfgxign8zij0a1wn9wsh2ci''; }; libwebsocket_0_1_3 = { basename = ''libwebsocket''; @@ -492,28 +496,28 @@ See class rdoc for help. Hint: ri Hoe''; longDescription = ''A really Ruby Mail handler.''; }; name = ''mail-2.4.4''; - requiredGems = [ g.mime_types_1_18 g.treetop_1_4_10 ]; + requiredGems = [ g.mime_types_1_19 g.treetop_1_4_10 ]; sha256 = ''0idylz5pnlz34mrxm7gs9jbll2c0k0y9dq2qarhxk30gwyvjaxi3''; }; - mime_types_1_18 = { + mime_types_1_19 = { basename = ''mime_types''; meta = { description = ''This library allows for the identification of a file's likely MIME content type''; homepage = ''http://mime-types.rubyforge.org/''; longDescription = ''This library allows for the identification of a file's likely MIME content -type. This is release 1.17.2. The identification of MIME content type is based -on a file's filename extensions. +type. This is release 1.19 with new MIME types. The identification of MIME +content type is based on a file's filename extensions. -MIME::Types for Ruby originally based on and synchronized with MIME::Types for -Perl by Mark Overmeer, copyright 2001 - 2009. As of version 1.15, the data +MIME::Types for Ruby was originally based on and synchronized with MIME::Types +for Perl by Mark Overmeer, copyright 2001 - 2009. As of version 1.15, the data format for the MIME::Type list has changed and the synchronization will no longer happen. :include: Licence.rdoc''; }; - name = ''mime-types-1.18''; + name = ''mime-types-1.19''; requiredGems = [ ]; - sha256 = ''00j7vragd5kdj235mskicn3nbg7hrdc6xjvc9bw9vqmal8x4707q''; + sha256 = ''1b44lrzk9v6i0jyajkx106qjyg8ns7siw1k42hmmwqj574ffsn26''; }; minitar_0_5_3 = { basename = ''minitar''; @@ -526,38 +530,27 @@ longer happen. requiredGems = [ ]; sha256 = ''035vs1knnnjsb8arfp8vx75warvwcdpiljjwv38lqljai9v8fq53''; }; - multi_json_1_3_4 = { + multi_json_1_3_6 = { basename = ''multi_json''; meta = { description = ''A gem to provide swappable JSON backends.''; homepage = ''http://github.com/intridea/multi_json''; longDescription = ''A gem to provide easy switching between different JSON backends, including Oj, Yajl, the JSON gem (with C-extensions), the pure-Ruby JSON gem, and OkJson.''; }; - name = ''multi_json-1.3.4''; + name = ''multi_json-1.3.6''; requiredGems = [ ]; - sha256 = ''1w6zaswd6v30vjs4v8vzh638mlaybzwh15k74vmfr0jkb63amga0''; + sha256 = ''0q2zjfvd2ibds9g9nzf2p1b47fc1wqliwfywv5pw85w15lmy91yr''; }; - net_sftp_2_0_4 = { + net_sftp_2_0_5 = { basename = ''net_sftp''; meta = { description = ''A pure Ruby implementation of the SFTP client protocol''; homepage = ''http://net-ssh.rubyforge.org/sftp''; longDescription = ''A pure Ruby implementation of the SFTP client protocol''; }; - name = ''net-sftp-2.0.4''; - requiredGems = [ g.net_ssh_2_3_0 ]; - sha256 = ''1f0ml1z7kjnd79avn42fmys8j0w2995j5lk30ak5n40bq805yvky''; - }; - net_ssh_2_0_23 = { - basename = ''net_ssh''; - meta = { - description = ''Net::SSH: a pure-Ruby implementation of the SSH2 client protocol.''; - homepage = ''http://github.com/net-ssh/net-ssh''; - longDescription = ''Net::SSH: a pure-Ruby implementation of the SSH2 client protocol.''; - }; - name = ''net-ssh-2.0.23''; - requiredGems = [ ]; - sha256 = ''1fllf6mgwc213m5mn266qwhl65zc84wl8rq9m3lvbggw9mh5ynrr''; + name = ''net-sftp-2.0.5''; + requiredGems = [ g.net_ssh_2_5_2 ]; + sha256 = ''0lqk735wspm8rbiyxpbil8ikrqcyg00ss1df7fny0761c3as6m0v''; }; net_ssh_2_3_0 = { basename = ''net_ssh''; @@ -570,6 +563,17 @@ longer happen. requiredGems = [ ]; sha256 = ''1q1fznl4nk2963czpzfby4m9jw9rs37k1rzgbjad5r1n7r6dv0sv''; }; + net_ssh_2_5_2 = { + basename = ''net_ssh''; + meta = { + description = ''Net::SSH: a pure-Ruby implementation of the SSH2 client protocol.''; + homepage = ''http://github.com/net-ssh/net-ssh''; + longDescription = ''Net::SSH: a pure-Ruby implementation of the SSH2 client protocol. It allows you to write programs that invoke and interact with processes on remote servers, via SSH2.''; + }; + name = ''net-ssh-2.5.2''; + requiredGems = [ ]; + sha256 = ''0kalahmwz9ypglrgg29wlvr4wx381pqwmx9fq3pk600v3j7j018l''; + }; nix_0_1_1 = { basename = ''nix''; meta = { @@ -650,38 +654,27 @@ request helpers feature.''; requiredGems = [ ]; sha256 = ''0hq5q8fjhbb7szzrj7k0l21z025c4qsxqzd5qmgivikhymw10ws0''; }; - rails_3_2_3 = { + rails_3_2_6 = { basename = ''rails''; meta = { description = ''Full-stack web application framework.''; homepage = ''http://www.rubyonrails.org''; longDescription = ''Ruby on Rails is a full-stack web framework optimized for programmer happiness and sustainable productivity. It encourages beautiful code by favoring convention over configuration.''; }; - name = ''rails-3.2.3''; - requiredGems = [ g.activesupport_3_2_3 g.actionpack_3_2_3 g.activerecord_3_2_3 g.activeresource_3_2_3 g.actionmailer_3_2_3 g.railties_3_2_3 g.bundler_1_1_3 ]; - sha256 = ''08kwzxw3y4qfy10x1h8g699h1bcp5dls2h440zdgywq45lrybmmq''; + name = ''rails-3.2.6''; + requiredGems = [ g.activesupport_3_2_6 g.actionpack_3_2_6 g.activerecord_3_2_6 g.activeresource_3_2_6 g.actionmailer_3_2_6 g.railties_3_2_6 g.bundler_1_1_4 ]; + sha256 = ''184ys6yfdclv59x0wk7dxx6ss60bv5vsi89nf8n85sh4mn19sf2m''; }; - railties_3_2_3 = { + railties_3_2_6 = { basename = ''railties''; meta = { description = ''Tools for creating, working with, and running Rails applications.''; homepage = ''http://www.rubyonrails.org''; longDescription = ''Rails internals: application bootup, plugins, generators, and rake tasks.''; }; - name = ''railties-3.2.3''; - requiredGems = [ g.thor_0_14_6 g.rack_ssl_1_3_2 g.rdoc_3_12 ]; - sha256 = ''8715141b57dd5ad02dda101ea2812ece5e48bf6848d7586eb6c32f1d68ed7599''; - }; - rake_0_8_7 = { - basename = ''rake''; - meta = { - description = ''Ruby based make-like utility.''; - homepage = ''http://rake.rubyforge.org''; - longDescription = ''Rake is a Make-like program implemented in Ruby. Tasks and dependencies are specified in standard Ruby syntax.''; - }; - name = ''rake-0.8.7''; - requiredGems = [ ]; - sha256 = ''03z1zm7xwl2r9v945ambwbd9sn2smbi34xldmac7qjcmsvd7pcqh''; + name = ''railties-3.2.6''; + requiredGems = [ g.rack_ssl_1_3_2 g.rdoc_3_12 ]; + sha256 = ''1qyb4kcg2ld86qp411njr6cxfhv2ddw3jghk2rbr8d5f1ci7gfdh''; }; rake_0_9_2_2 = { basename = ''rake''; @@ -703,7 +696,7 @@ request helpers feature.''; }; name = ''rb-fsevent-0.9.1''; requiredGems = [ ]; - sha256 = ''d06bb8a10fe89e66a2e017152d9c40d5f728ad2561f8ddd305f56fedfe566f0b''; + sha256 = ''02vgavzfsvzm0p9xvy314nnjixym82f2s58pw2i6d7p81yhvhsyh''; }; rdoc_3_12 = { basename = ''rdoc''; @@ -717,20 +710,8 @@ documentation. See RDoc for a description of RDoc's markup and basic use.''; }; name = ''rdoc-3.12''; - requiredGems = [ g.json_1_7_0 ]; - sha256 = ''77b6deba13ca090fb4608c218ec5d5c05d78e841cb0b53cb31f91fb56686a431''; - }; - rjb_1_3_3 = { - basename = ''rjb''; - meta = { - description = ''Ruby Java bridge''; - homepage = ''http://rjb.rubyforge.org/''; - longDescription = ''RJB is a bridge program that connect between Ruby and Java with Java Native Interface. -''; - }; - name = ''rjb-1.3.3''; - requiredGems = [ ]; - sha256 = ''0jhj1y84yzdr11li784m255jvc191vs8d3zck21rfqv4z4zpifz6''; + requiredGems = [ g.json_1_7_3 ]; + sha256 = ''0cd4hrkba7zr675m62yb87l7hpf0sp2qw8ccc2s0y2fa2fxdxdkp''; }; rjb_1_4_0 = { basename = ''rjb''; @@ -744,49 +725,60 @@ See RDoc for a description of RDoc's markup and basic use.''; requiredGems = [ ]; sha256 = ''03ildf1k04a430mqdfggld4wjvca3xd0d4qn0dwcfa2zxs3vnbz3''; }; - rspec_2_1_0 = { + rspec_2_9_0 = { basename = ''rspec''; meta = { - description = ''rspec-2.1.0''; - homepage = ''http://github.com/rspec/rspec''; - longDescription = ''Meta-gem that depends on the other rspec gems''; + description = ''rspec-2.9.0''; + homepage = ''http://github.com/rspec''; + longDescription = ''BDD for Ruby''; }; - name = ''rspec-2.1.0''; - requiredGems = [ ]; - sha256 = ''16h7s8wr969wiig4qahr03ln144pz39jindlc3z11d064zvzhiza''; + name = ''rspec-2.9.0''; + requiredGems = [ g.rspec_expectations_2_9_1 ]; + sha256 = ''02r1cg82xia5vls4zq2dchmgdig8rpky8rivsqbckczr5k9w0hwv''; }; - rspec_core_2_1_0 = { + rspec_core_2_9_0 = { basename = ''rspec_core''; meta = { - description = ''rspec-core-2.1.0''; + description = ''rspec-core-2.9.0''; homepage = ''http://github.com/rspec/rspec-core''; - longDescription = ''RSpec runner and example groups''; + longDescription = ''BDD for Ruby. RSpec runner and example groups.''; }; - name = ''rspec-core-2.1.0''; + name = ''rspec-core-2.9.0''; requiredGems = [ ]; - sha256 = ''1fs9c8dafg7v948wzxjhhzf0djr1rjva7lymah32rlj3x5xm9zmh''; + sha256 = ''17wc7mqrwl0zzrx3gywf4w931vfdig1spyvl46fyqakf36shyknd''; }; - rspec_expectations_2_1_0 = { + rspec_expectations_2_9_0 = { basename = ''rspec_expectations''; meta = { - description = ''rspec-expectations-2.1.0''; + description = ''rspec-expectations-2.9.0''; homepage = ''http://github.com/rspec/rspec-expectations''; longDescription = ''rspec expectations (should[_not] and matchers)''; }; - name = ''rspec-expectations-2.1.0''; - requiredGems = [ g.diff_lcs_1_1_3 ]; - sha256 = ''0p7gs3zsj70fz30209961fzdgia1qyrpg54v0ywhqmvc5kl0q8lc''; + name = ''rspec-expectations-2.9.0''; + requiredGems = [ ]; + sha256 = ''0pdws2zdi1h7mx0dqhkx6l5sqvrnpkrvqsnxvpmxk413db7li34x''; }; - rspec_mocks_2_1_0 = { + rspec_expectations_2_9_1 = { + basename = ''rspec_expectations''; + meta = { + description = ''rspec-expectations-2.9.1''; + homepage = ''http://github.com/rspec/rspec-expectations''; + longDescription = ''rspec expectations (should[_not] and matchers)''; + }; + name = ''rspec-expectations-2.9.1''; + requiredGems = [ ]; + sha256 = ''1vb7axdg76naml7i6zd45ry4gszs274xfqk1w617z0719mc557gc''; + }; + rspec_mocks_2_9_0 = { basename = ''rspec_mocks''; meta = { - description = ''rspec-mocks-2.1.0''; + description = ''rspec-mocks-2.9.0''; homepage = ''http://github.com/rspec/rspec-mocks''; longDescription = ''RSpec's 'test double' framework, with support for stubbing and mocking''; }; - name = ''rspec-mocks-2.1.0''; + name = ''rspec-mocks-2.9.0''; requiredGems = [ ]; - sha256 = ''1qhznpj0wq08z31i1rcv99dwx2abl4rlx2338ly0dcql54s8mma4''; + sha256 = ''10mp152j5l0r3mqqhxq35m3slamzdzwsm9qnf6chh0l3zx5dwifg''; }; rubyforge_2_0_3 = { basename = ''rubyforge''; @@ -803,7 +795,7 @@ See RDoc for a description of RDoc's markup and basic use.''; * For all rubyforge upgrades, run 'rubyforge config' to ensure you have latest.''; }; name = ''rubyforge-2.0.3''; - requiredGems = [ g.json_pure_1_7_0 ]; + requiredGems = [ g.json_pure_1_7_3 ]; sha256 = ''1ck9hkad55dy25819v4gd1nmnpvcrb3i4np3hc03h1j6q8qpxg5p''; }; rubyforge_2_0_4 = { @@ -834,17 +826,17 @@ See RDoc for a description of RDoc's markup and basic use.''; requiredGems = [ ]; sha256 = ''1lc67ssqyz49rm1jms5sdvy6x41h070razxlmvj4j5q6w3qixx41''; }; - rubyzip_0_9_8 = { + rubyzip_0_9_9 = { basename = ''rubyzip''; meta = { description = ''rubyzip is a ruby module for reading and writing zip files''; homepage = ''http://github.com/aussiegeek/rubyzip''; }; - name = ''rubyzip-0.9.8''; + name = ''rubyzip-0.9.9''; requiredGems = [ ]; - sha256 = ''0nq7dcs3fhidfnvy241ypp05hj4hvw8srp70v52b9amjhsmbgbfd''; + sha256 = ''1khf6d903agnwd8965f5f8b353rzmfvygxp53z1199rqzw8h46q2''; }; - sass_3_1_17 = { + sass_3_1_20 = { basename = ''sass''; meta = { description = ''A powerful but elegant CSS compiler that makes CSS fun again.''; @@ -855,20 +847,20 @@ See RDoc for a description of RDoc's markup and basic use.''; command line tool or a web-framework plugin. ''; }; - name = ''sass-3.1.17''; + name = ''sass-3.1.20''; requiredGems = [ ]; - sha256 = ''09ykjz5kam03cp6hbzmnch8g2ls3lhvnx1373bbpkvk6jckd26x7''; + sha256 = ''1aw2n5vg82d7ajx9wpyfrx6v1ddxhk73j77dkwjgsmlgci5lab8a''; }; - selenium_webdriver_2_21_2 = { + selenium_webdriver_2_24_0 = { basename = ''selenium_webdriver''; meta = { description = ''The next generation developer focused tool for automated testing of webapps''; homepage = ''http://selenium.googlecode.com''; longDescription = ''WebDriver is a tool for writing automated tests of websites. It aims to mimic the behaviour of a real user, and as such interacts with the HTML of the application.''; }; - name = ''selenium-webdriver-2.21.2''; - requiredGems = [ g.rubyzip_0_9_8 g.childprocess_0_3_2 g.libwebsocket_0_1_3 ]; - sha256 = ''07f291d7c1828ba22b2e50947199d766a53fff9ad0016e479b47b35bc5cc1161''; + name = ''selenium-webdriver-2.24.0''; + requiredGems = [ g.rubyzip_0_9_9 g.childprocess_0_3_3 g.libwebsocket_0_1_3 ]; + sha256 = ''0iricx2gglza44s92jhk7w44g2pbvg23jr5s0g3nggq7dc5mh48f''; }; sprockets_2_1_3 = { basename = ''sprockets''; @@ -881,16 +873,16 @@ See RDoc for a description of RDoc's markup and basic use.''; requiredGems = [ g.hike_1_2_1 g.tilt_1_3_3 ]; sha256 = ''05q6qpskabl8v0vx1mwlzv5fhf48r9f4zvc7v3xdsygm2hbs3vzh''; }; - thor_0_14_6 = { + thor_0_15_4 = { basename = ''thor''; meta = { description = ''A scripting framework that replaces rake, sake and rubigen''; homepage = ''http://github.com/wycats/thor''; longDescription = ''A scripting framework that replaces rake, sake and rubigen''; }; - name = ''thor-0.14.6''; + name = ''thor-0.15.4''; requiredGems = [ ]; - sha256 = ''c7c5abd6b7dfb331efb8740276724773cece66e1fe6b83216589bb87c67e15a3''; + sha256 = ''1q4y34p4v0ipr6z5wcnc6n1mwfysrgjcibc1ls7rbdfzx4sdcic8''; }; tilt_1_3_3 = { basename = ''tilt''; diff --git a/pkgs/development/interpreters/ruby/ruby-19.nix b/pkgs/development/interpreters/ruby/ruby-19.nix index c5c12831c0a..b954d7e6bf0 100644 --- a/pkgs/development/interpreters/ruby/ruby-19.nix +++ b/pkgs/development/interpreters/ruby/ruby-19.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "ftp://ftp.ruby-lang.org/pub/ruby/1.9/${name}.tar.bz2"; - sha256 = "09jmxz3lqsi5097233hc1wjnzg6z5f4y7kmlkqhskdaj6125jyn6"; + sha256 = "1ymq5lhp3fz0j3cs65521aihcnivbfrn76in900ccxd0msgfmld9"; }; # Have `configure' avoid `/usr/bin/nroff' in non-chroot builds. @@ -31,6 +31,8 @@ stdenv.mkDerivation rec { ++ (op opensslSupport openssl) ++ (op gdbmSupport gdbm) ++ (op yamlSupport libyaml); + + enableParallelBuilding = true; configureFlags = ["--enable-shared" "--enable-pthread"]; @@ -48,7 +50,7 @@ stdenv.mkDerivation rec { passthru = rec { majorVersion = "1.9"; minorVersion = "3"; - patchLevel = "125"; + patchLevel = "194"; libPath = "lib/ruby/${majorVersion}"; gemPath = "lib/ruby/gems/${majorVersion}"; }; diff --git a/pkgs/development/interpreters/tcl/default.nix b/pkgs/development/interpreters/tcl/default.nix index 060aa3b5a6b..48755065b99 100644 --- a/pkgs/development/interpreters/tcl/default.nix +++ b/pkgs/development/interpreters/tcl/default.nix @@ -18,6 +18,7 @@ stdenv.mkDerivation { meta = { description = "The Tcl scription language"; homepage = http://www.tcl.tk/; + license = stdenv.lib.licenses.tcltk; }; passthru = { diff --git a/pkgs/development/libraries/apr-util/default.nix b/pkgs/development/libraries/apr-util/default.nix index ce6337b3b6a..ad02f9b84cc 100644 --- a/pkgs/development/libraries/apr-util/default.nix +++ b/pkgs/development/libraries/apr-util/default.nix @@ -1,29 +1,33 @@ { stdenv, fetchurl, apr, expat -, bdbSupport ? false, db4 ? null -, ldapSupport ? !stdenv.isDarwin, openldap +, sslSupport ? true, openssl +, bdbSupport ? false, db4 +, ldapSupport ? true, openldap }: +assert sslSupport -> openssl != null; assert bdbSupport -> db4 != null; +assert ldapSupport -> openldap != null; stdenv.mkDerivation rec { name = "apr-util-1.4.1"; - + src = fetchurl { url = "mirror://apache/apr/${name}.tar.bz2"; md5 = "52b31b33fb1aa16e65ddaefc76e41151"; }; - + configureFlags = '' --with-apr=${apr} --with-expat=${expat} - ${if bdbSupport then "--with-berkeley-db=${db4}" else ""} - ${if ldapSupport then "--with-ldap" else ""} + --with-crypto + ${stdenv.lib.optionalString sslSupport "--with-openssl=${openssl}"} + ${stdenv.lib.optionalString bdbSupport "--with-berkeley-db=${db4}"} + ${stdenv.lib.optionalString ldapSupport "--with-ldap"} ''; propagatedBuildInputs = stdenv.lib.optional ldapSupport openldap; - + passthru = { - inherit bdbSupport; - inherit ldapSupport; + inherit sslSupport bdbSupport ldapSupport; }; meta = { @@ -31,4 +35,3 @@ stdenv.mkDerivation rec { description = "A companion library to APR, the Apache Portable Runtime"; }; } - diff --git a/pkgs/development/libraries/apr/default.nix b/pkgs/development/libraries/apr/default.nix index 8c3d5c03496..07a565596bb 100644 --- a/pkgs/development/libraries/apr/default.nix +++ b/pkgs/development/libraries/apr/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { # Including the Windows headers breaks unistd.h. # Based on ftp://sourceware.org/pub/cygwin/release/libapr1/libapr1-1.3.8-2-src.tar.bz2 ++ stdenv.lib.optional (stdenv.system == "i686-cygwin") "ac_cv_header_windows_h=no"; - + meta = { homepage = http://apr.apache.org/; description = "The Apache Portable Runtime library"; diff --git a/pkgs/development/libraries/audio/lilv/default.nix b/pkgs/development/libraries/audio/lilv/default.nix new file mode 100644 index 00000000000..a02a6ebabac --- /dev/null +++ b/pkgs/development/libraries/audio/lilv/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, lv2, pkgconfig, python, serd, sord, sratom }: + +stdenv.mkDerivation rec { + name = "lilv-${version}"; + version = "0.14.2"; + + src = fetchurl { + url = "http://download.drobilla.net/${name}.tar.bz2"; + sha256 = "0g9sg5f8xkkvsad0c6rh4j1k2b2hwsh83yg66f4qznxh43np7zlx"; + }; + + buildInputs = [ lv2 pkgconfig python serd sord sratom ]; + + configurePhase = "python waf configure --prefix=$out"; + + buildPhase = "python waf"; + + installPhase = "python waf install"; + + meta = with stdenv.lib; { + homepage = http://drobilla.net/software/lilv; + description = "A C library to make the use of LV2 plugins"; + license = licenses.mit; + maintainers = [ maintainers.goibhniu ]; + + }; +} diff --git a/pkgs/development/libraries/audio/lv2/default.nix b/pkgs/development/libraries/audio/lv2/default.nix new file mode 100644 index 00000000000..136a825eef9 --- /dev/null +++ b/pkgs/development/libraries/audio/lv2/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, gtk, libsndfile, pkgconfig, python }: + +stdenv.mkDerivation rec { + name = "lv2-${version}"; + version = "1.0.0"; + + src = fetchurl { + url = "http://lv2plug.in/spec/${name}.tar.bz2"; + sha256 = "0lfp7679wwqd49k4mjxwqslpfx5fz2q7akxqayg400zqn70whzl5"; + }; + + buildInputs = [ gtk libsndfile pkgconfig python ]; + + configurePhase = "python waf configure --prefix=$out"; + + buildPhase = "python waf"; + + installPhase = "python waf install"; + + meta = with stdenv.lib; { + homepage = http://lv2plug.in; + description = "A plugin standard for audio systems"; + license = licenses.mit; + maintainers = [ maintainers.goibhniu ]; + + }; +} diff --git a/pkgs/development/libraries/audio/sratom/default.nix b/pkgs/development/libraries/audio/sratom/default.nix new file mode 100644 index 00000000000..b23b58a3f82 --- /dev/null +++ b/pkgs/development/libraries/audio/sratom/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, lv2, pkgconfig, python, serd, sord }: + +stdenv.mkDerivation rec { + name = "sratom-${version}"; + version = "0.2.0"; + + src = fetchurl { + url = "http://download.drobilla.net/${name}.tar.bz2"; + sha256 = "12wi0ycjnn6mlddcp476wzr6k2bb4ig1489gg8h1k7v0w7d6ry1a"; + }; + + buildInputs = [ lv2 pkgconfig python serd sord ]; + + configurePhase = "python waf configure --prefix=$out"; + + buildPhase = "python waf"; + + installPhase = "python waf install"; + + meta = with stdenv.lib; { + homepage = http://drobilla.net/software/sratom; + description = "A library for serialising LV2 atoms to/from RDF"; + license = licenses.mit; + maintainers = [ maintainers.goibhniu ]; + + }; +} diff --git a/pkgs/development/libraries/audio/suil/default.nix b/pkgs/development/libraries/audio/suil/default.nix new file mode 100644 index 00000000000..a7300f541c4 --- /dev/null +++ b/pkgs/development/libraries/audio/suil/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, lv2, pkgconfig, python, serd, sord, sratom }: + +stdenv.mkDerivation rec { + name = "suil-${version}"; + version = "0.6.2"; + + src = fetchurl { + url = "http://download.drobilla.net/${name}.tar.bz2"; + sha256 = "1rqi16zqnaf30gr2gwb8wbhg8a2l3m5fllf7rabldmgj4b4jlyzp"; + }; + + buildInputs = [ lv2 pkgconfig python serd sord sratom ]; + + configurePhase = "python waf configure --prefix=$out"; + + buildPhase = "python waf"; + + installPhase = "python waf install"; + + meta = with stdenv.lib; { + homepage = http://drobilla.net/software/suil; + description = "A lightweight C library for loading and wrapping LV2 plugin UIs"; + license = licenses.mit; + maintainers = [ maintainers.goibhniu ]; + + }; +} diff --git a/pkgs/development/libraries/babl/0_0_22.nix b/pkgs/development/libraries/babl/0_0_22.nix new file mode 100644 index 00000000000..2464a09f51a --- /dev/null +++ b/pkgs/development/libraries/babl/0_0_22.nix @@ -0,0 +1,16 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation { + name = "babl-0.0.22"; + + src = fetchurl { + url = ftp://ftp.gtk.org/pub/babl/0.0/babl-0.0.22.tar.bz2; + sha256 = "0v8gbf9si4sd06199f8lfmrsbvi6i0hxphd34kyvsj6g2kkkg10s"; + }; + + meta = { + description = "Image pixel format conversion library"; + homepage = http://gegl.org/babl/; + license = "GPL3"; + }; +} diff --git a/pkgs/development/libraries/boost/1.44.nix b/pkgs/development/libraries/boost/1.44.nix index 2b516be2cbf..ad09adc8606 100644 --- a/pkgs/development/libraries/boost/1.44.nix +++ b/pkgs/development/libraries/boost/1.44.nix @@ -6,6 +6,7 @@ , enableShared ? true , enableStatic ? false , enablePIC ? false +, taggedLayout ? false }: let @@ -23,7 +24,7 @@ let stdenv.lib.optional enableStatic "static"); # To avoid library name collisions - finalLayout = if ((enableRelease && enableDebug) || + finalLayout = if (taggedLayout || (enableRelease && enableDebug) || (enableSingleThreaded && enableMultiThreaded) || (enableShared && enableStatic)) then "tagged" else "system"; @@ -63,12 +64,12 @@ stdenv.mkDerivation { # Patch to get rid of following error, experienced by some packages like encfs, bitcoin: # terminate called after throwing an instance of 'std::runtime_error' # what(): locale::facet::_S_create_c_locale name not valid - (fetchurl { + (fetchurl { url = https://svn.boost.org/trac/boost/raw-attachment/ticket/4688/boost_filesystem.patch ; - sha256 = "15k91ihzs6190pnryh4cl0b3c2pjpl9d790mr14x16zq52y7px2d"; + sha256 = "15k91ihzs6190pnryh4cl0b3c2pjpl9d790mr14x16zq52y7px2d"; }) ]; - + crossAttrs = rec { buildInputs = [ expat.hostDrv zlib.hostDrv bzip2.hostDrv ]; # all buildInputs set previously fell into propagatedBuildInputs, as usual, so we have to diff --git a/pkgs/development/libraries/boost/1.50.nix b/pkgs/development/libraries/boost/1.50.nix index 69d6a27c0e5..3d6c6010a20 100644 --- a/pkgs/development/libraries/boost/1.50.nix +++ b/pkgs/development/libraries/boost/1.50.nix @@ -7,6 +7,7 @@ , enableStatic ? false , enablePIC ? false , enableExceptions ? false +, taggedLayout ? ((enableRelease && enableDebug) || (enableSingleThreaded && enableMultiThreaded) || (enableShared && enableStatic)) }: let @@ -24,10 +25,7 @@ let stdenv.lib.optional enableStatic "static"); # To avoid library name collisions - finalLayout = if ((enableRelease && enableDebug) || - (enableSingleThreaded && enableMultiThreaded) || - (enableShared && enableStatic)) then - "tagged" else "system"; + layout = if taggedLayout then "tagged" else "system"; cflags = if (enablePIC && enableExceptions) then "cflags=-fPIC -fexceptions cxxflags=-fPIC linkflags=-fPIC" @@ -63,7 +61,7 @@ stdenv.mkDerivation { configureScript = "./bootstrap.sh"; configureFlags = "--with-icu=${icu} --with-python=${python}/bin/python"; - buildPhase = "./b2 -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat}/include -sEXPAT_LIBPATH=${expat}/lib --layout=${finalLayout} variant=${variant} threading=${threading} link=${link} ${cflags} install"; + buildPhase = "./b2 -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat}/include -sEXPAT_LIBPATH=${expat}/lib --layout=${layout} variant=${variant} threading=${threading} link=${link} ${cflags} install"; installPhase = ":"; @@ -82,7 +80,7 @@ stdenv.mkDerivation { cat << EOF > user-config.jam using gcc : cross : $crossConfig-g++ ; EOF - ./b2 -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat.hostDrv}/include -sEXPAT_LIBPATH=${expat.hostDrv}/lib --layout=${finalLayout} --user-config=user-config.jam toolset=gcc-cross variant=${variant} threading=${threading} link=${link} ${cflags} --without-python install + ./b2 -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat.hostDrv}/include -sEXPAT_LIBPATH=${expat.hostDrv}/lib --layout=${layout} --user-config=user-config.jam toolset=gcc-cross variant=${variant} threading=${threading} link=${link} ${cflags} --without-python install ''; }; } diff --git a/pkgs/development/libraries/boost/1.51.nix b/pkgs/development/libraries/boost/1.51.nix new file mode 100644 index 00000000000..8b040dd8647 --- /dev/null +++ b/pkgs/development/libraries/boost/1.51.nix @@ -0,0 +1,86 @@ +{ stdenv, fetchurl, icu, expat, zlib, bzip2, python +, enableRelease ? true +, enableDebug ? false +, enableSingleThreaded ? false +, enableMultiThreaded ? true +, enableShared ? true +, enableStatic ? false +, enablePIC ? false +, enableExceptions ? false +, taggedLayout ? ((enableRelease && enableDebug) || (enableSingleThreaded && enableMultiThreaded) || (enableShared && enableStatic)) +}: + +let + + variant = stdenv.lib.concatStringsSep "," + (stdenv.lib.optional enableRelease "release" ++ + stdenv.lib.optional enableDebug "debug"); + + threading = stdenv.lib.concatStringsSep "," + (stdenv.lib.optional enableSingleThreaded "single" ++ + stdenv.lib.optional enableMultiThreaded "multi"); + + link = stdenv.lib.concatStringsSep "," + (stdenv.lib.optional enableShared "shared" ++ + stdenv.lib.optional enableStatic "static"); + + # To avoid library name collisions + layout = if taggedLayout then "tagged" else "system"; + + cflags = if (enablePIC && enableExceptions) then + "cflags=-fPIC -fexceptions cxxflags=-fPIC linkflags=-fPIC" + else if (enablePIC) then + "cflags=-fPIC cxxflags=-fPIC linkflags=-fPIC" + else if (enableExceptions) then + "cflags=-fexceptions" + else + ""; +in + +stdenv.mkDerivation { + name = "boost-1.51.0"; + + meta = { + homepage = "http://boost.org/"; + description = "Boost C++ Library Collection"; + license = "boost-license"; + + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.simons ]; + }; + + src = fetchurl { + url = "mirror://sourceforge/boost/boost_1_51_0.tar.bz2"; + sha256 = "fb2d2335a29ee7fe040a197292bfce982af84a645c81688a915c84c925b69696"; + }; + + enableParallelBuilding = true; + + buildInputs = [icu expat zlib bzip2 python]; + + configureScript = "./bootstrap.sh"; + configureFlags = "--with-icu=${icu} --with-python=${python}/bin/python"; + + buildPhase = "./b2 -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat}/include -sEXPAT_LIBPATH=${expat}/lib --layout=${layout} variant=${variant} threading=${threading} link=${link} ${cflags} install"; + + installPhase = ":"; + + crossAttrs = rec { + buildInputs = [ expat.hostDrv zlib.hostDrv bzip2.hostDrv ]; + # all buildInputs set previously fell into propagatedBuildInputs, as usual, so we have to + # override them. + propagatedBuildInputs = buildInputs; + # We want to substitute the contents of configureFlags, removing thus the + # usual --build and --host added on cross building. + preConfigure = '' + export configureFlags="--prefix=$out --without-icu" + ''; + buildPhase = '' + set -x + cat << EOF > user-config.jam + using gcc : cross : $crossConfig-g++ ; + EOF + ./b2 -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat.hostDrv}/include -sEXPAT_LIBPATH=${expat.hostDrv}/lib --layout=${layout} --user-config=user-config.jam toolset=gcc-cross variant=${variant} threading=${threading} link=${link} ${cflags} --without-python install + ''; + }; +} diff --git a/pkgs/development/libraries/bwidget/default.nix b/pkgs/development/libraries/bwidget/default.nix index 693e0587a0b..31dc885bc43 100644 --- a/pkgs/development/libraries/bwidget/default.nix +++ b/pkgs/development/libraries/bwidget/default.nix @@ -12,9 +12,19 @@ stdenv.mkDerivation rec { dontBuild = true; installPhase = '' - ensureDir "$out/tcltk" - cp -R *.tcl lang images "$out/tcltk/" + ensureDir "$out/lib/${passthru.libPrefix}" + cp -R *.tcl lang images "$out/lib/${passthru.libPrefix}" ''; - buildInputs = [tcl]; + passthru = { + libPrefix = "bwidget${version}"; + }; + + buildInputs = [ tcl ]; + + meta = { + homepage = "http://tcl.activestate.com/software/tcllib/"; + description = "The BWidget toolkit is a high-level widget set for Tcl/Tk."; + license = stdenv.lib.licenses.tcltk; + }; } diff --git a/pkgs/development/libraries/ccrtp/1.8.nix b/pkgs/development/libraries/ccrtp/1.8.nix index 26e7050a60d..78bf7a678ac 100644 --- a/pkgs/development/libraries/ccrtp/1.8.nix +++ b/pkgs/development/libraries/ccrtp/1.8.nix @@ -10,7 +10,9 @@ stdenv.mkDerivation { buildInputs = [ openssl pkgconfig libgcrypt commoncpp2 ]; - meta = { + patches = [ ./gcc-4.6-fix.patch ]; + + meta = { description = "GNU ccRTP is an implementation of RTP, the real-time transport protocol from the IETF"; homepage = "http://www.gnu.org/software/ccrtp/"; license = "GPLv2"; diff --git a/pkgs/development/libraries/ccrtp/gcc-4.6-fix.patch b/pkgs/development/libraries/ccrtp/gcc-4.6-fix.patch new file mode 100644 index 00000000000..49d07a89e52 --- /dev/null +++ b/pkgs/development/libraries/ccrtp/gcc-4.6-fix.patch @@ -0,0 +1,20 @@ +diff -ubr ccrtp-1.8.0-orig/src/ccrtp/sources.h ccrtp-1.8.0/src/ccrtp/sources.h +--- ccrtp-1.8.0-orig/src/ccrtp/sources.h 2010-04-18 20:51:49.000000000 +0200 ++++ ccrtp-1.8.0/src/ccrtp/sources.h 2012-07-07 11:42:50.961179016 +0200 +@@ -45,6 +45,7 @@ + #define CCXX_RTP_SOURCES_H_ + + #include ++#include + #include + + #ifdef CCXX_NAMESPACES +@@ -406,7 +407,7 @@ + public: + typedef std::forward_iterator_tag iterator_category; + typedef Participant value_type; +- typedef ptrdiff_t difference_type; ++ typedef std::ptrdiff_t difference_type; + typedef const Participant* pointer; + typedef const Participant& reference; + diff --git a/pkgs/development/libraries/celt/0.5.1.nix b/pkgs/development/libraries/celt/0.5.1.nix new file mode 100644 index 00000000000..0f42e7cd040 --- /dev/null +++ b/pkgs/development/libraries/celt/0.5.1.nix @@ -0,0 +1,46 @@ +x@{builderDefsPackage + , ...}: +builderDefsPackage +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ + []; + + buildInputs = map (n: builtins.getAttr n x) + (builtins.attrNames (builtins.removeAttrs x helperArgNames)); + sourceInfo = rec { + baseName="celt"; + version="0.5.1.3"; + name="${baseName}-${version}"; + url="http://downloads.xiph.org/releases/${baseName}/${name}.tar.gz"; + hash="0bkam9z5vnrxpbxkkh9kw6yzjka9di56h11iijikdd1f71l5nbpw"; + }; +in +rec { + src = a.fetchurl { + url = sourceInfo.url; + sha256 = sourceInfo.hash; + }; + + inherit (sourceInfo) name version; + inherit buildInputs; + + /* doConfigure should be removed if not needed */ + phaseNames = ["doConfigure" "doMakeInstall"]; + + meta = { + description = "CELT - low-delay audio codec"; + maintainers = with a.lib.maintainers; + [ + raskin + ]; + platforms = with a.lib.platforms; + linux; + license = "free"; + }; + passthru = { + updateInfo = { + downloadPage = "http://www.celt-codec.org/downloads/"; + }; + }; +}) x diff --git a/pkgs/development/libraries/clucene-core/2.x.nix b/pkgs/development/libraries/clucene-core/2.x.nix new file mode 100644 index 00000000000..72460184df2 --- /dev/null +++ b/pkgs/development/libraries/clucene-core/2.x.nix @@ -0,0 +1,27 @@ +{stdenv, fetchurl, cmake, boost, zlib}: + +stdenv.mkDerivation rec { + name = "clucene-core-2.3.3.4"; + + src = fetchurl { + url = "mirror://sourceforge/clucene/${name}.tar.gz"; + sha256 = "1arffdwivig88kkx685pldr784njm0249k0rb1f1plwavlrw9zfx"; + }; + + buildNativeInputs = [ cmake ]; + + buildInputs = [ boost zlib ]; + + cmakeFlags = [ "-DBUILD_CONTRIBS=ON" "-DBUILD_CONTRIBS_LIB=ON" ]; + + patches = # From debian + [ ./Fix-pkgconfig-file-by-adding-clucene-shared-library.patch + ./Fixing_ZLIB_configuration_in_shared_CMakeLists.patch + ./Install-contribs-lib.patch + ]; + + meta = { + description = "CLucene is a port of the very popular Java Lucene text search engine API. Core package, 2.x branch."; + homepage = http://clucene.sourceforge.net; + }; +} diff --git a/pkgs/development/libraries/clucene-core/Fix-pkgconfig-file-by-adding-clucene-shared-library.patch b/pkgs/development/libraries/clucene-core/Fix-pkgconfig-file-by-adding-clucene-shared-library.patch new file mode 100644 index 00000000000..80e49a8e712 --- /dev/null +++ b/pkgs/development/libraries/clucene-core/Fix-pkgconfig-file-by-adding-clucene-shared-library.patch @@ -0,0 +1,19 @@ +From 7be4a19b76d98260cf95040a47935f854a4ba7a4 Mon Sep 17 00:00:00 2001 +From: Valentin Rusu +Date: Sat, 17 Dec 2011 13:47:58 +0100 +Subject: [PATCH] Fix .pc file by adding clucene-shared library + +--- + src/core/libclucene-core.pc.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/src/core/libclucene-core.pc.cmake ++++ b/src/core/libclucene-core.pc.cmake +@@ -6,6 +6,6 @@ includedir=${prefix}/include:${prefix}/i + Name: libclucene + Description: CLucene - a C++ search engine, ported from the popular Apache Lucene + Version: @CLUCENE_VERSION_MAJOR@.@CLUCENE_VERSION_MINOR@.@CLUCENE_VERSION_REVISION@.@CLUCENE_VERSION_PATCH@ +-Libs: -L${prefix}/@LIB_DESTINATION@/ -lclucene-core ++Libs: -L${prefix}/@LIB_DESTINATION@/ -lclucene-core -lclucene-shared + Cflags: -I${prefix}/include -I${prefix}/include/CLucene/ext + ~ diff --git a/pkgs/development/libraries/clucene-core/Fixing_ZLIB_configuration_in_shared_CMakeLists.patch b/pkgs/development/libraries/clucene-core/Fixing_ZLIB_configuration_in_shared_CMakeLists.patch new file mode 100644 index 00000000000..f5f44a7fa2c --- /dev/null +++ b/pkgs/development/libraries/clucene-core/Fixing_ZLIB_configuration_in_shared_CMakeLists.patch @@ -0,0 +1,20 @@ +From 772481ca94071ddfe65102a451926e4f9aeb4d2c Mon Sep 17 00:00:00 2001 +From: Veit Jahns +Date: Thu, 26 May 2011 13:35:28 +0200 +Subject: [PATCH] Fixing ZLIB configuration in shared's CMakeLists + +--- + src/shared/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/src/shared/CMakeLists.txt ++++ b/src/shared/CMakeLists.txt +@@ -42,7 +42,7 @@ INCLUDE (CheckAtomicFunctions) + find_package(ZLIB) + IF ( ZLIB_FOUND ) + SET ( EXTRA_LIBS ${EXTRA_LIBS} ${ZLIB_LIBRARY} ) +-ELSEIF ( ZLIB_FOUND ) ++ELSE ( ZLIB_FOUND ) + MESSAGE( "ZLIB not found, using local: ${clucene-ext_SOURCE_DIR}/zlib" ) + SET(ZLIB_INCLUDE_DIR ${clucene-ext_SOURCE_DIR}/zlib ) + SET(ZLIB_LIBRARY ${clucene-ext_BINARY_DIR}) diff --git a/pkgs/development/libraries/clucene-core/Install-contribs-lib.patch b/pkgs/development/libraries/clucene-core/Install-contribs-lib.patch new file mode 100644 index 00000000000..899411fe02b --- /dev/null +++ b/pkgs/development/libraries/clucene-core/Install-contribs-lib.patch @@ -0,0 +1,49 @@ +Description: contribs-lib is not built and installed even with config +Author: Vitaliy Filippov +Bug: https://sourceforge.net/tracker/index.php?func=detail&aid=3392466&group_id=80013&atid=558446 + +--- + CMakeLists.txt | 2 +- + src/contribs-lib/CMakeLists.txt | 17 +++++++++++++++++ + 2 files changed, 18 insertions(+), 1 deletion(-) + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -163,7 +163,7 @@ IF ( BUILD_CONTRIBS ) + SET(BUILD_CONTRIBS_LIB 1) + ENDIF ( BUILD_CONTRIBS ) + IF ( BUILD_CONTRIBS_LIB ) +- ADD_SUBDIRECTORY (src/contribs-lib EXCLUDE_FROM_ALL) ++ ADD_SUBDIRECTORY (src/contribs-lib) + ENDIF ( BUILD_CONTRIBS_LIB ) + + +--- a/src/contribs-lib/CMakeLists.txt ++++ b/src/contribs-lib/CMakeLists.txt +@@ -106,9 +106,26 @@ add_library(clucene-contribs-lib SHARED + ) + TARGET_LINK_LIBRARIES(clucene-contribs-lib ${clucene_contrib_extra_libs}) + ++#install public headers. ++FOREACH(file ${HEADERS}) ++ get_filename_component(apath ${file} PATH) ++ get_filename_component(aname ${file} NAME) ++ file(RELATIVE_PATH relpath ${CMAKE_SOURCE_DIR}/src/contribs-lib ${apath}) ++ IF ( NOT aname MATCHES "^_.*" ) ++ install(FILES ${file} ++ DESTINATION include/${relpath} ++ COMPONENT development) ++ ENDIF ( NOT aname MATCHES "^_.*" ) ++ENDFOREACH(file) ++ + #set properties on the libraries + SET_TARGET_PROPERTIES(clucene-contribs-lib PROPERTIES + VERSION ${CLUCENE_VERSION} + SOVERSION ${CLUCENE_SOVERSION} + COMPILE_DEFINITIONS_DEBUG _DEBUG + ) ++ ++#and install library ++install(TARGETS clucene-contribs-lib ++ DESTINATION ${LIB_DESTINATION} ++ COMPONENT runtime ) diff --git a/pkgs/development/libraries/cyrus-sasl/cyrus-sasl-2.1.22-bad-elif.patch b/pkgs/development/libraries/cyrus-sasl/cyrus-sasl-2.1.22-bad-elif.patch deleted file mode 100644 index 33550c428d2..00000000000 --- a/pkgs/development/libraries/cyrus-sasl/cyrus-sasl-2.1.22-bad-elif.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -up cyrus-sasl-2.1.22/plugins/digestmd5.c.elif cyrus-sasl-2.1.22/plugins/digestmd5.c ---- cyrus-sasl-2.1.22/plugins/digestmd5.c.elif 2009-01-23 09:40:31.000000000 +0100 -+++ cyrus-sasl-2.1.22/plugins/digestmd5.c 2009-02-06 15:20:15.000000000 +0100 -@@ -2743,7 +2743,7 @@ static sasl_server_plug_t digestmd5_serv - "DIGEST-MD5", /* mech_name */ - #ifdef WITH_RC4 - 128, /* max_ssf */ --#elif WITH_DES -+#elif defined(WITH_DES) - 112, - #else - 1, -@@ -4071,7 +4071,7 @@ static sasl_client_plug_t digestmd5_clie - "DIGEST-MD5", - #ifdef WITH_RC4 /* mech_name */ - 128, /* max ssf */ --#elif WITH_DES -+#elif defined(WITH_DES) - 112, - #else - 1, diff --git a/pkgs/development/libraries/cyrus-sasl/default.nix b/pkgs/development/libraries/cyrus-sasl/default.nix index 0da4d5da3e7..a03f753a114 100644 --- a/pkgs/development/libraries/cyrus-sasl/default.nix +++ b/pkgs/development/libraries/cyrus-sasl/default.nix @@ -1,16 +1,27 @@ -{ stdenv, fetchurl, openssl, db4, gettext, automake} : +{ stdenv, fetchurl, openssl, db4, gettext }: -stdenv.mkDerivation { - name = "cyrus-sasl-2.1.23"; +stdenv.mkDerivation rec { + name = "cyrus-sasl-2.1.25"; src = fetchurl { - url = ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-2.1.23.tar.gz; - sha256 = "0dmi41hfy015pzks8n93qsshgvi0az7pv81nls4nxayb810crvr0"; + url = "ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/${name}.tar.gz"; + sha256 = "418c16e6240a4f9b637cbe3d62937b9675627bad27c622191d47de8686fe24fe"; }; - preConfigure='' - configureFlags="--with-openssl=${openssl} --with-plugindir=$out/lib/sasl2 --with-configdir=$out/lib/sasl2 --enable-login" - cp ${automake}/share/automake*/config.{sub,guess} config - ''; + buildInputs = [ openssl db4 gettext ]; - patches = [ ./cyrus-sasl-2.1.22-bad-elif.patch ]; + + # Set this variable at build-time to make sure $out can be evaluated. + preConfigure = '' + configureFlagsArray=( --with-plugindir=$out/lib/sasl2 + --with-configdir=$out/lib/sasl2 + --enable-login + ) + ''; + + meta = { + homepage = "http://cyrusimap.web.cmu.edu/"; + description = "library for adding authentication support to connection-based protocols"; + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.simons ]; + }; } diff --git a/pkgs/development/libraries/dxflib/default.nix b/pkgs/development/libraries/dxflib/default.nix new file mode 100644 index 00000000000..f9c58857731 --- /dev/null +++ b/pkgs/development/libraries/dxflib/default.nix @@ -0,0 +1,17 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation rec { + version = "2.5.0.0-1"; + name = "dxflib-${version}"; + src = fetchurl { + url = "http://www.qcad.org/archives/dxflib/${name}.src.tar.gz"; + sha256 = "20ad9991eec6b0f7a3cc7c500c044481a32110cdc01b65efa7b20d5ff9caefa9"; + }; + + meta = { + maintainers = with stdenv.lib.maintainers; [raskin]; + platforms = stdenv.lib.platforms.linux; + description = ''DXF file format library''; + }; +} + diff --git a/pkgs/development/libraries/ffmpeg/default.nix b/pkgs/development/libraries/ffmpeg/default.nix index a29940b4f2f..3b5e28a2ee7 100644 --- a/pkgs/development/libraries/ffmpeg/default.nix +++ b/pkgs/development/libraries/ffmpeg/default.nix @@ -8,6 +8,7 @@ , xvidSupport ? true, xvidcore ? null , vdpauSupport ? true, libvdpau ? null , faacSupport ? false, faac ? null +, dc1394Support ? false, libdc1394 ? null }: assert speexSupport -> speex != null; @@ -34,7 +35,6 @@ stdenv.mkDerivation rec { "--enable-gpl" "--enable-postproc" "--enable-swscale" - "--disable-ffserver" "--disable-ffplay" "--enable-shared" "--enable-runtime-cpudetect" @@ -47,7 +47,8 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional x264Support "--enable-libx264" ++ stdenv.lib.optional xvidSupport "--enable-libxvid" ++ stdenv.lib.optional vdpauSupport "--enable-vdpau" - ++ stdenv.lib.optional faacSupport "--enable-libfaac --enable-nonfree"; + ++ stdenv.lib.optional faacSupport "--enable-libfaac --enable-nonfree" + ++ stdenv.lib.optional dc1394Support "--enable-libdc1394"; buildInputs = [ pkgconfig lame yasm zlib bzip2 ] ++ stdenv.lib.optional mp3Support lame @@ -58,7 +59,8 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional x264Support x264 ++ stdenv.lib.optional xvidSupport xvidcore ++ stdenv.lib.optional vdpauSupport libvdpau - ++ stdenv.lib.optional faacSupport faac; + ++ stdenv.lib.optional faacSupport faac + ++ stdenv.lib.optional dc1394Support libdc1394; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/fftw/default.nix b/pkgs/development/libraries/fftw/default.nix index 845ec772010..6b4fbe7df6c 100644 --- a/pkgs/development/libraries/fftw/default.nix +++ b/pkgs/development/libraries/fftw/default.nix @@ -1,15 +1,19 @@ -{fetchurl, stdenv, builderDefs, stringsWithDeps, singlePrecision ? false}: -let localDefs = builderDefs.passthru.function { +{fetchurl, stdenv, builderDefs, stringsWithDeps, singlePrecision ? false, pthreads ? false}: +let + version = "3.3.2"; + localDefs = builderDefs.passthru.function { src = fetchurl { - url = ftp://ftp.fftw.org/pub/fftw/fftw-3.2.2.tar.gz; - sha256 = "13vnglardq413q2518zi4a8pam3znydrz28m9w09kss9xrjsx9va"; + url = "ftp://ftp.fftw.org/pub/fftw/fftw-${version}.tar.gz"; + sha256 = "b1236a780ca6e66fc5f8eda6ef0665d680e8253d9f01d7bf211b714a50032d01"; }; buildInputs = []; - configureFlags = ["--enable-shared" "--enable-openmp"] + configureFlags = ["--enable-shared"] # some distros seem to be shipping both versions within the same package? # why does --enable-float still result in ..3f.so instead of ..3.so? ++ (if singlePrecision then [ "--enable-single" ] else [ ]) + ++ (stdenv.lib.optional (!pthreads) "--enable-openmp") + ++ (stdenv.lib.optional pthreads "--enable-threads") # I think all i686 has sse ++ (if (stdenv.isi686 || stdenv.isx86_64) && singlePrecision then [ "--enable-sse" ] else [ ]) # I think all x86_64 has sse2 @@ -18,8 +22,8 @@ let localDefs = builderDefs.passthru.function { }; in with localDefs; stdenv.mkDerivation { - name = "fftw-3.2.2" + ( if singlePrecision then "-single" else "-double" ); - builder = writeScript "fftw-3.2.1-builder" + name = "fftw-3.3.2" + ( if singlePrecision then "-single" else "-double" ); + builder = writeScript "fftw-3.3.2-builder" (textClosure localDefs [doConfigure doMakeInstall doForceShare]); meta = { description = "Fastest Fourier Transform in the West library"; diff --git a/pkgs/development/libraries/fltk/default.nix b/pkgs/development/libraries/fltk/default.nix index bb835bb9c29..d51419f3754 100644 --- a/pkgs/development/libraries/fltk/default.nix +++ b/pkgs/development/libraries/fltk/default.nix @@ -4,11 +4,11 @@ let inherit (composableDerivation) edf; in composableDerivation.composableDerivation {} rec { - name = "fltk-2.0.x-alpha-r8550"; + name = "fltk-2.0.x-alpha-r9296"; src = fetchurl { url = "ftp://ftp.easysw.com/pub/fltk/snapshots/${name}.tar.bz2"; - sha256 = "0y9fazsv61j8dkg9aiinnw4nd68h7zxmvapmygrl4rq5ywqygng7"; + sha256 = "0353ngb7gpyklc9mdz8629big2na3c73akfwhis8fhqp7jkbs9ih"; }; propagatedBuildInputs = [ x11 inputproto libXi freeglut ]; diff --git a/pkgs/development/libraries/gegl/0_0_22.nix b/pkgs/development/libraries/gegl/0_0_22.nix new file mode 100644 index 00000000000..150ba1ac961 --- /dev/null +++ b/pkgs/development/libraries/gegl/0_0_22.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, pkgconfig, glib, babl_0_0_22, libpng12, cairo, libjpeg +, librsvg, pango, gtk }: + +stdenv.mkDerivation { + name = "gegl-0.0.22"; + + src = fetchurl { + url = ftp://ftp.gimp.org/pub/gegl/0.0/gegl-0.0.22.tar.bz2; + sha256 = "0nx6r9amzhw5d2ghlw3z8qnry18rwz1ymvl2cm31b8p49z436wl5"; + }; + + configureFlags = "--disable-docs"; # needs fonts otherwise don't know how to pass them + + buildInputs = [ pkgconfig glib babl_0_0_22 libpng12 cairo libjpeg librsvg pango gtk ]; + + meta = { + description = "Graph-based image processing framework"; + homepage = http://www.gegl.org; + license = "GPL3"; + }; +} diff --git a/pkgs/development/libraries/glib/2.30.x.nix b/pkgs/development/libraries/glib/2.30.x.nix index 092fa7f27e0..72baf0154d9 100644 --- a/pkgs/development/libraries/glib/2.30.x.nix +++ b/pkgs/development/libraries/glib/2.30.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gettext, perl, libiconv, zlib, libffi +{ stdenv, fetchurl, pkgconfig, gettext, perl, libiconvOrNull, zlib, libffi , python, pcre }: # TODO: @@ -20,7 +20,11 @@ stdenv.mkDerivation rec { }; # configure script looks for d-bus but it is only needed for tests - buildInputs = [ pcre ] ++ stdenv.lib.optional (!stdenv.isLinux) libiconv; + buildInputs = [ pcre ] + ++ (if libiconvOrNull != null + then [ libiconvOrNull ] + else []); + buildNativeInputs = [ perl pkgconfig gettext python ]; propagatedBuildInputs = [ zlib libffi ]; diff --git a/pkgs/development/libraries/gmp/5.0.5.nix b/pkgs/development/libraries/gmp/5.0.5.nix index 3fb62585051..98ebe5fcc25 100644 --- a/pkgs/development/libraries/gmp/5.0.5.nix +++ b/pkgs/development/libraries/gmp/5.0.5.nix @@ -13,8 +13,10 @@ stdenv.mkDerivation rec { buildNativeInputs = [ m4 ]; configureFlags = - # Build a "fat binary", with routines for several sub-architectures (x86). - [ "--enable-fat" ] + # Build a "fat binary", with routines for several sub-architectures + # (x86), except on Solaris where some tests crash with "Memory fault". + # See , for instance. + (stdenv.lib.optional (!stdenv.isSunOS) "--enable-fat") ++ (if cxx then [ "--enable-cxx" ] else [ "--disable-cxx" ]); doCheck = true; diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix index 4bd0dfdc529..93f5dab537e 100644 --- a/pkgs/development/libraries/gnutls/default.nix +++ b/pkgs/development/libraries/gnutls/default.nix @@ -1,17 +1,18 @@ { fetchurl, stdenv, zlib, lzo, libtasn1, nettle -, guileBindings, guile, perl, psmisc }: +, guileBindings, guile, perl, gmp }: assert guileBindings -> guile != null; -stdenv.mkDerivation rec { +stdenv.mkDerivation (rec { - name = "gnutls-3.0.18"; + name = "gnutls-3.0.22"; src = fetchurl { url = "mirror://gnu/gnutls/${name}.tar.xz"; - sha256 = "1ynqnj1j6rrzplk2i64dik34829r0y7lwk4qlvjx993q3mj7z863"; + sha256 = "1pp90fm27qi5cd0pq18xcmnl79xcbfwxc54bg1xi1wv0vryqdpcr"; }; + # FIXME: Turn into a Nix list. configurePhase = '' ./configure --prefix="$out" \ --disable-dependency-tracking --enable-fast-install \ @@ -19,6 +20,11 @@ stdenv.mkDerivation rec { --with-lzo --with-libtasn1-prefix="${libtasn1}" \ ${if guileBindings then "--enable-guile --with-guile-site-dir=\"$out/share/guile/site\"" + else ""}${if stdenv.isSunOS + # TODO: Use `--with-libnettle-prefix' on all platforms + # Note: GMP is a dependency of Nettle, whose public headers include + # GMP headers, hence the hack. + then " --with-libnettle-prefix=${nettle} CPPFLAGS=-I${gmp}/include" else ""} ''; @@ -29,13 +35,9 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ nettle libtasn1 ]; - # XXX: Disable tests on non-Linux because of the `mini-loss-time' hack - # below, which is Linux-specific. - doCheck = stdenv.isLinux; - - postCheck = - # Kill a process that's left behind. - stdenv.lib.optionalString doCheck "${psmisc}/bin/killall mini-loss-time"; + # XXX: Gnulib's `test-select' fails on FreeBSD: + # http://hydra.nixos.org/build/2962084/nixlog/1/raw . + doCheck = (!stdenv.isFreeBSD); meta = { description = "The GNU Transport Layer Security Library"; @@ -60,3 +62,10 @@ stdenv.mkDerivation rec { maintainers = [ stdenv.lib.maintainers.ludo ]; }; } + +// + +(stdenv.lib.optionalAttrs stdenv.isFreeBSD { + # FreeBSD doesn't have , and Gnulib's `alloca' module isn't used. + patches = [ ./guile-gnulib-includes.patch ]; +})) diff --git a/pkgs/development/libraries/gnutls/guile-gnulib-includes.patch b/pkgs/development/libraries/gnutls/guile-gnulib-includes.patch new file mode 100644 index 00000000000..1624d1f7ab9 --- /dev/null +++ b/pkgs/development/libraries/gnutls/guile-gnulib-includes.patch @@ -0,0 +1,17 @@ +commit 699ae6ef085c699dd5f3fb460b0f8a2408cc2860 +Author: Simon Josefsson +Date: Thu Aug 9 15:24:11 2012 +0200 + + Add gnulib -I's to guile-snarf command. + +--- gnutls-3.0.22/guile/src/Makefile.in 2012-08-04 20:52:39.000000000 +0200 ++++ gnutls-3.0.22/guile/src/Makefile.in 2012-08-11 21:55:20.000000000 +0200 +@@ -1564,7 +1564,7 @@ AM_CPPFLAGS = \ + # `$(GUILE_CFLAGS)' may contain a series of `-I' switches so it must be + # included here, even though we'd really want `$(GUILE_CPPFLAGS)'. + snarfcppopts = $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ +- $(CFLAGS) $(AM_CFLAGS) $(GUILE_CFLAGS) ++ $(CFLAGS) $(guile_gnutls_v_2_la_CFLAGS) + + all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-am diff --git a/pkgs/development/libraries/haskell/Agda/default.nix b/pkgs/development/libraries/haskell/Agda/default.nix index c72177e2108..b598accffc6 100644 --- a/pkgs/development/libraries/haskell/Agda/default.nix +++ b/pkgs/development/libraries/haskell/Agda/default.nix @@ -13,9 +13,7 @@ cabal.mkDerivation (self: { QuickCheck syb xhtml zlib ]; buildTools = [ alex happy ]; - patchPhase = '' - sed -i -e 's|mtl == 2.0.\*|mtl|' Agda.cabal - ''; + jailbreak = true; meta = { homepage = "http://wiki.portal.chalmers.se/agda/"; description = "A dependently typed functional programming language and proof assistant"; diff --git a/pkgs/development/libraries/haskell/AspectAG/default.nix b/pkgs/development/libraries/haskell/AspectAG/default.nix index 3b2df825a73..6cbd760b4ac 100644 --- a/pkgs/development/libraries/haskell/AspectAG/default.nix +++ b/pkgs/development/libraries/haskell/AspectAG/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "AspectAG"; - version = "0.3.4.1"; - sha256 = "12iaf27crynwnnd7qm1zvvaj6zw6i6c05mb4dsq55dnhph2l356g"; + version = "0.3.6.1"; + sha256 = "01pglvf38v5ii2w03kdlgngxbb3ih0j5bsilv5qwc9vrh2iwirhf"; buildDepends = [ HList mtl ]; meta = { homepage = "http://www.cs.uu.nl/wiki/bin/view/Center/AspectAG"; diff --git a/pkgs/development/libraries/haskell/Chart/default.nix b/pkgs/development/libraries/haskell/Chart/default.nix index 4c4584bf9a2..a59e4ca7f42 100644 --- a/pkgs/development/libraries/haskell/Chart/default.nix +++ b/pkgs/development/libraries/haskell/Chart/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "Chart"; - version = "0.15"; - sha256 = "1357gqn2ifalknl85n2z9ysf195dnaxm175rp0kmmzbf4vik9gc4"; + version = "0.16"; + sha256 = "1mb8hgxj0i5s7l061pfn49m5f6qdwvmgy6ni7jmg85vpy6b7jra3"; buildDepends = [ cairo colour dataAccessor dataAccessorTemplate mtl time ]; diff --git a/pkgs/development/libraries/haskell/CouchDB/default.nix b/pkgs/development/libraries/haskell/CouchDB/default.nix index 3642d402615..705a0a5fdea 100644 --- a/pkgs/development/libraries/haskell/CouchDB/default.nix +++ b/pkgs/development/libraries/haskell/CouchDB/default.nix @@ -1,10 +1,10 @@ -{ cabal, HTTP, json, mtl, network }: +{ cabal, HTTP, json, mtl, network, utf8String }: cabal.mkDerivation (self: { pname = "CouchDB"; - version = "0.10.1"; - sha256 = "1ny62ab0sjrkh7mpxj0ahqrv7c8dh0n5s1g8xl0mq3yiwlrjdsim"; - buildDepends = [ HTTP json mtl network ]; + version = "1.2"; + sha256 = "0a9g0iblfyqppcy1ni3ac8f3yv5km95bfblhwqlsk6khydi5ka98"; + buildDepends = [ HTTP json mtl network utf8String ]; meta = { homepage = "http://github.com/arjunguha/haskell-couchdb/"; description = "CouchDB interface"; diff --git a/pkgs/development/libraries/haskell/Graphalyze/default.nix b/pkgs/development/libraries/haskell/Graphalyze/default.nix index d0258fd2698..90bcb9f8605 100644 --- a/pkgs/development/libraries/haskell/Graphalyze/default.nix +++ b/pkgs/development/libraries/haskell/Graphalyze/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "Graphalyze"; - version = "0.13.0.0"; - sha256 = "1xh6xg2rw43cbi83rmpb0c2yib9cfj0pwg66nx5x5a0al2c9pdsr"; + version = "0.13.0.1"; + sha256 = "1yk7iglsspbj0kxh5rhjkc6q65vz07vpygiig07w86g2s6gad8am"; buildDepends = [ bktrees fgl filepath graphviz pandoc random text time ]; diff --git a/pkgs/development/libraries/haskell/HStringTemplate/default.nix b/pkgs/development/libraries/haskell/HStringTemplate/default.nix index 0048a9c470d..6754c15f3f4 100644 --- a/pkgs/development/libraries/haskell/HStringTemplate/default.nix +++ b/pkgs/development/libraries/haskell/HStringTemplate/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "HStringTemplate"; - version = "0.6.8"; - sha256 = "1fybvb3v2b786n1hfzcvyanj3yfm5j8z4fm48vaskcggawh6rlkr"; + version = "0.6.9"; + sha256 = "0xa665q5gya51vjkg1i6f6qk67jx28xcbxs5v1d9yr1f8djh5d9v"; buildDepends = [ deepseq filepath mtl parsec syb sybWithClass text time utf8String ]; diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.4.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.4.nix new file mode 100644 index 00000000000..6f7b57ba64c --- /dev/null +++ b/pkgs/development/libraries/haskell/HTTP/4000.2.4.nix @@ -0,0 +1,15 @@ +{ cabal, mtl, network, parsec }: + +cabal.mkDerivation (self: { + pname = "HTTP"; + version = "4000.2.4"; + sha256 = "1riqz69mnzl2xnbkk8s798xkizvcly3hcpigshbhpa57q016labi"; + buildDepends = [ mtl network parsec ]; + meta = { + homepage = "https://github.com/haskell/HTTP"; + description = "A library for client-side HTTP"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/HUnit/1.2.5.1.nix b/pkgs/development/libraries/haskell/HUnit/1.2.5.1.nix new file mode 100644 index 00000000000..06ac5fa1bbf --- /dev/null +++ b/pkgs/development/libraries/haskell/HUnit/1.2.5.1.nix @@ -0,0 +1,15 @@ +{ cabal, deepseq }: + +cabal.mkDerivation (self: { + pname = "HUnit"; + version = "1.2.5.1"; + sha256 = "0wa4yqgfyrfxzhdyd04xvzi4qaswbg0rrbywz8sxzkp71v91a35w"; + buildDepends = [ deepseq ]; + meta = { + homepage = "http://hunit.sourceforge.net/"; + description = "A unit testing framework for Haskell"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/Hipmunk/default.nix b/pkgs/development/libraries/haskell/Hipmunk/default.nix index d6c3b5ffc23..fee71449142 100644 --- a/pkgs/development/libraries/haskell/Hipmunk/default.nix +++ b/pkgs/development/libraries/haskell/Hipmunk/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "Hipmunk"; - version = "5.2.0.8"; - sha256 = "0xsckndxmzbp32fqb8i90k21rz0xjj3smxjijw742l637p3mv5zw"; + version = "5.2.0.10"; + sha256 = "0kq6dlx1g7dra7nsfmrc13yvnl7wh00fadmgln9v2vyf0ww82x95"; buildDepends = [ StateVar transformers ]; meta = { homepage = "http://patch-tag.com/r/felipe/hipmunk/home"; diff --git a/pkgs/development/libraries/haskell/HsOpenSSL/default.nix b/pkgs/development/libraries/haskell/HsOpenSSL/default.nix index 20213051694..9eefaaef84a 100644 --- a/pkgs/development/libraries/haskell/HsOpenSSL/default.nix +++ b/pkgs/development/libraries/haskell/HsOpenSSL/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "HsOpenSSL"; - version = "0.10.3.1"; - sha256 = "0dilmaibx18mfg4c8g96c1svhynhkrq4i5zzv3wg0a550g3xc0py"; + version = "0.10.3.3"; + sha256 = "04d2nd2hcbglw8blwhi3d32vazdxnvs9s52788qyllgm7gmay6a5"; buildDepends = [ network time ]; extraLibraries = [ openssl ]; meta = { diff --git a/pkgs/development/libraries/haskell/IOSpec/default.nix b/pkgs/development/libraries/haskell/IOSpec/default.nix new file mode 100644 index 00000000000..84b5f6fe610 --- /dev/null +++ b/pkgs/development/libraries/haskell/IOSpec/default.nix @@ -0,0 +1,14 @@ +{ cabal, mtl, QuickCheck, Stream }: + +cabal.mkDerivation (self: { + pname = "IOSpec"; + version = "0.2.5"; + sha256 = "0r6vqg39h6vzwlb33cvk72k4mh6jd8rpdcnkqsfxdqmsk7h8x84j"; + buildDepends = [ mtl QuickCheck Stream ]; + meta = { + description = "A pure specification of the IO monad"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/JuicyPixels/default.nix b/pkgs/development/libraries/haskell/JuicyPixels/default.nix new file mode 100644 index 00000000000..a99f8295c60 --- /dev/null +++ b/pkgs/development/libraries/haskell/JuicyPixels/default.nix @@ -0,0 +1,19 @@ +{ cabal, cereal, deepseq, mtl, primitive, transformers, vector +, zlib +}: + +cabal.mkDerivation (self: { + pname = "JuicyPixels"; + version = "1.3"; + sha256 = "07wljfag4ylw16wdi7znjb61pfihdik5d7p4h2lmz6xirm4mjzrm"; + buildDepends = [ + cereal deepseq mtl primitive transformers vector zlib + ]; + meta = { + homepage = "https://github.com/Twinside/Juicy.Pixels"; + description = "Picture loading/serialization (in png, jpeg and bitmap)"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/ListLike/default.nix b/pkgs/development/libraries/haskell/ListLike/default.nix index f0b1ccd8bc0..58595edf744 100644 --- a/pkgs/development/libraries/haskell/ListLike/default.nix +++ b/pkgs/development/libraries/haskell/ListLike/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "ListLike"; - version = "3.1.5"; - sha256 = "0hxpjmj5qdyb55wda2bgd3crkg9q6dklhj2kff7qz6wkx5fdbvjs"; + version = "3.1.6"; + sha256 = "0ij6yb80dv841zn23lp6251avzmljzmy4j25r7w6h55y32y7gq46"; isLibrary = true; isExecutable = true; meta = { diff --git a/pkgs/development/libraries/haskell/MonadCatchIO-mtl/default.nix b/pkgs/development/libraries/haskell/MonadCatchIO-mtl/default.nix index 10b28522a50..9b044f6dbab 100644 --- a/pkgs/development/libraries/haskell/MonadCatchIO-mtl/default.nix +++ b/pkgs/development/libraries/haskell/MonadCatchIO-mtl/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "MonadCatchIO-mtl"; - version = "0.3.0.4"; - sha256 = "0wzdrfplwa4v9miv88rg3jvf7l6gphc29lpdp5qjm5873y57jxm7"; + version = "0.3.0.5"; + sha256 = "01c2xif4aly2lmg2qkri791ignq3r2qg4xbc8m06cdm6gh5a2dqp"; buildDepends = [ extensibleExceptions mtl ]; meta = { homepage = "http://darcsden.com/jcpetruzza/MonadCatchIO-mtl"; diff --git a/pkgs/development/libraries/haskell/MonadRandom/default.nix b/pkgs/development/libraries/haskell/MonadRandom/default.nix index da343a527ce..d8c492f23b6 100644 --- a/pkgs/development/libraries/haskell/MonadRandom/default.nix +++ b/pkgs/development/libraries/haskell/MonadRandom/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "MonadRandom"; - version = "0.1.7"; - sha256 = "0y4fsb3j0babq388rw3y1kbxbjz6plfgbg4g1y27hdf7jf5c8x33"; + version = "0.1.8"; + sha256 = "1zin7qyv86gza60q6a6r8az2dwxm80wh23idvmjapgbjn2kfvfim"; buildDepends = [ mtl random ]; meta = { description = "Random-number generation monad"; diff --git a/pkgs/development/libraries/haskell/RepLib/default.nix b/pkgs/development/libraries/haskell/RepLib/default.nix index 1bc52184474..15cba0c0b28 100644 --- a/pkgs/development/libraries/haskell/RepLib/default.nix +++ b/pkgs/development/libraries/haskell/RepLib/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "RepLib"; - version = "0.5.3"; - sha256 = "1kpd4qli6fclrr3i21kmdwbpa0la7ssi9pgagzclr3yj2ca2hsgw"; + version = "0.5.3.1"; + sha256 = "0lc1ma6h5wdfl4crnvg1vyvlx4xvps4l2nwb9dl6nyspmpjad807"; buildDepends = [ mtl typeEquality ]; meta = { homepage = "http://code.google.com/p/replib/"; diff --git a/pkgs/development/libraries/haskell/SHA/default.nix b/pkgs/development/libraries/haskell/SHA/default.nix index d1eff38c0d7..956b1a8f8a3 100644 --- a/pkgs/development/libraries/haskell/SHA/default.nix +++ b/pkgs/development/libraries/haskell/SHA/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "SHA"; - version = "1.5.0.1"; - sha256 = "1nyj50hyka2fnk9nnidygl8d52xgvmj9m8aywjzbzdaxxrmdab8g"; + version = "1.5.1"; + sha256 = "009c0nabva0c4aq4yhqdmdqmrrjmg8scpy7yz65bbhqnfwnjvdks"; isLibrary = true; isExecutable = true; buildDepends = [ binary ]; diff --git a/pkgs/development/libraries/haskell/Shellac/Shellac-haskeline.nix b/pkgs/development/libraries/haskell/Shellac/Shellac-haskeline.nix deleted file mode 100644 index 9f75a09ee69..00000000000 --- a/pkgs/development/libraries/haskell/Shellac/Shellac-haskeline.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ cabal, haskeline, mtl, Shellac }: - -cabal.mkDerivation (self: { - pname = "Shellac-haskeline"; - version = "0.2.0.1"; - sha256 = "1xvs2ni83yyf7rx3ikmn2bkx20fyj03d03crqyyfw28mikhgv5br"; - buildDepends = [ haskeline mtl Shellac ]; - patchPhase = '' - sed -i -e 's|mtl>=1.1 && < 2.1|mtl|' Shellac-haskeline.cabal - ''; - meta = { - description = "Haskeline backend module for Shellac"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/Shellac/Shellac-readline.nix b/pkgs/development/libraries/haskell/Shellac/Shellac-readline.nix deleted file mode 100644 index a39ddf3383e..00000000000 --- a/pkgs/development/libraries/haskell/Shellac/Shellac-readline.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ cabal, readline, Shellac }: - -cabal.mkDerivation (self: { - pname = "Shellac-readline"; - version = "0.9"; - sha256 = "3edffecf2225c199f0a4df55e3685f7deee47755ae7f8d03f5da7fac3c2ab878"; - buildDepends = [ readline Shellac ]; - meta = { - description = "Readline backend module for Shellac"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/Vec/default.nix b/pkgs/development/libraries/haskell/Vec/default.nix index 77cc9e37a9d..85fdcfd0b4a 100644 --- a/pkgs/development/libraries/haskell/Vec/default.nix +++ b/pkgs/development/libraries/haskell/Vec/default.nix @@ -2,10 +2,10 @@ cabal.mkDerivation (self: { pname = "Vec"; - version = "0.9.9"; - sha256 = "1ms6w8003aplcndqglw2gxj0ji4m3jki9ndj5gni24w8dqiy5x47"; + version = "1.0.1"; + sha256 = "1v0v0ph881vynx8q8xwmn9da6qrd16g83q5i132nxys3ynl5s76m"; meta = { - homepage = "http://graphics.cs.ucdavis.edu/~sdillard/Vec"; + homepage = "http://github.net/sedillard/Vec"; description = "Fixed-length lists and low-dimensional linear algebra"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; diff --git a/pkgs/development/libraries/haskell/X11/1.6.0.nix b/pkgs/development/libraries/haskell/X11/1.6.0.1.nix similarity index 69% rename from pkgs/development/libraries/haskell/X11/1.6.0.nix rename to pkgs/development/libraries/haskell/X11/1.6.0.1.nix index 6292f7eab5c..4a558d483a3 100644 --- a/pkgs/development/libraries/haskell/X11/1.6.0.nix +++ b/pkgs/development/libraries/haskell/X11/1.6.0.1.nix @@ -1,11 +1,9 @@ -{ cabal, libX11, libXext, libXinerama, libXrandr, libXrender, syb -}: +{ cabal, libX11, libXext, libXinerama, libXrandr, libXrender }: cabal.mkDerivation (self: { pname = "X11"; - version = "1.6.0"; - sha256 = "0jjnr4490mkdrmq3lvv7hha7rc9vbwsxlwsvcv56q6zgjx4zwf8j"; - buildDepends = [ syb ]; + version = "1.6.0.1"; + sha256 = "0crbprh4m48l4yvbamgvvzrmm1d94lgbyqv1xsd37r4a3xh7qakz"; extraLibraries = [ libX11 libXext libXinerama libXrandr libXrender ]; diff --git a/pkgs/development/libraries/haskell/abstract-deque/default.nix b/pkgs/development/libraries/haskell/abstract-deque/default.nix index 90d6f4c274e..a6219a4b2a0 100644 --- a/pkgs/development/libraries/haskell/abstract-deque/default.nix +++ b/pkgs/development/libraries/haskell/abstract-deque/default.nix @@ -1,11 +1,12 @@ -{ cabal, HUnit, IORefCAS }: +{ cabal, HUnit }: cabal.mkDerivation (self: { pname = "abstract-deque"; - version = "0.1.5"; - sha256 = "1zp19kq3m72nx7rr00yyq8iwia4abg4x9kw4d5s5k0srp5f9fn3q"; - buildDepends = [ HUnit IORefCAS ]; + version = "0.1.6"; + sha256 = "13s8xbr31sqj8n3bh4xp82fqw5d5g1a27fpfqw69jfmr5xc9s1za"; + buildDepends = [ HUnit ]; meta = { + homepage = "https://github.com/rrnewton/haskell-lockfree-queue/wiki"; description = "Abstract, parameterized interface to mutable Deques"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; diff --git a/pkgs/development/libraries/haskell/accelerate-cuda/default.nix b/pkgs/development/libraries/haskell/accelerate-cuda/default.nix index aae77de6c6c..3772320b0c2 100644 --- a/pkgs/development/libraries/haskell/accelerate-cuda/default.nix +++ b/pkgs/development/libraries/haskell/accelerate-cuda/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "accelerate-cuda"; - version = "0.12.1.0"; - sha256 = "1y6viivizv4frdh3xk5wqhs7wwnhqyjr9wid1y1d5l42mz41vp84"; + version = "0.12.1.1"; + sha256 = "1kj9i6djjb46ad3dnzk72mf33r8h1mjxljs7x5rf2d658hqk5yfv"; buildDepends = [ accelerate binary blazeBuilder cryptohash cuda fclabels filepath hashable hashtables languageCQuote mainlandPretty mtl srcloc diff --git a/pkgs/development/libraries/haskell/accelerate-examples/default.nix b/pkgs/development/libraries/haskell/accelerate-examples/default.nix index f1f7aefb736..f88824c21fe 100644 --- a/pkgs/development/libraries/haskell/accelerate-examples/default.nix +++ b/pkgs/development/libraries/haskell/accelerate-examples/default.nix @@ -22,7 +22,7 @@ cabal.mkDerivation (self: { homepage = "http://www.cse.unsw.edu.au/~chak/project/accelerate/"; description = "Examples using the Accelerate library"; license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; + platforms = self.stdenv.lib.platforms.none; maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/active/default.nix b/pkgs/development/libraries/haskell/active/default.nix new file mode 100644 index 00000000000..5c563ad9cd7 --- /dev/null +++ b/pkgs/development/libraries/haskell/active/default.nix @@ -0,0 +1,13 @@ +{ cabal, newtype, semigroupoids, semigroups, vectorSpace }: + +cabal.mkDerivation (self: { + pname = "active"; + version = "0.1.0.2"; + sha256 = "1iymh3sd21ba7ijwv5afphn5vhmwchk6725hbcsdwk2d2x2gd674"; + buildDepends = [ newtype semigroupoids semigroups vectorSpace ]; + meta = { + description = "Abstractions for animation"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/arrows/default.nix b/pkgs/development/libraries/haskell/arrows/default.nix index baebfbce0f6..149f5f951e5 100644 --- a/pkgs/development/libraries/haskell/arrows/default.nix +++ b/pkgs/development/libraries/haskell/arrows/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "arrows"; - version = "0.4.4.0"; - sha256 = "1dcvv1vscyggwqmlm6j2sc29zy0wmhn6w4g617gbxxb1j28bm6a9"; + version = "0.4.4.1"; + sha256 = "1qpbpwsc3frjdngwjv3r58nfa0ik88cqh24ls47svigsz3c4n42v"; buildDepends = [ Stream ]; meta = { homepage = "http://www.haskell.org/arrows/"; diff --git a/pkgs/development/libraries/haskell/asn1-data/default.nix b/pkgs/development/libraries/haskell/asn1-data/default.nix index 60e795f6e2e..a90e8e769e2 100644 --- a/pkgs/development/libraries/haskell/asn1-data/default.nix +++ b/pkgs/development/libraries/haskell/asn1-data/default.nix @@ -1,17 +1,15 @@ -{ cabal, attoparsec, attoparsecEnumerator, enumerator, mtl, text }: +{ cabal, cereal, mtl, text }: cabal.mkDerivation (self: { pname = "asn1-data"; - version = "0.6.1.3"; - sha256 = "0vly55dpqrm9vb8ayp72na1nf2rr5ini3d81qqvxflmjgpksrgwq"; + version = "0.7.1"; + sha256 = "10s7mxygw6w8a8mx090msvbl8pji8m68lsxxyr5bp7p887naia7r"; isLibrary = true; isExecutable = true; - buildDepends = [ - attoparsec attoparsecEnumerator enumerator mtl text - ]; + buildDepends = [ cereal mtl text ]; meta = { homepage = "http://github.com/vincenthz/hs-asn1-data"; - description = "ASN1 data reader and writer in RAW, BER, DER and CER forms"; + description = "ASN1 data reader and writer in RAW, BER and DER forms"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.andres ]; diff --git a/pkgs/development/libraries/haskell/async/default.nix b/pkgs/development/libraries/haskell/async/default.nix index 15cef9b35f1..a0da6384e95 100644 --- a/pkgs/development/libraries/haskell/async/default.nix +++ b/pkgs/development/libraries/haskell/async/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "async"; - version = "2.0.0.0"; - sha256 = "03aqgfgpar53k7bzb3s988a4fg0pzy7jmjv299wz2hxl7vr6fzkr"; + version = "2.0.1.3"; + sha256 = "1rbjr6xw5sp8npw17fxg0942kikssv2hyci2sy26r0na98483mkh"; buildDepends = [ stm ]; meta = { homepage = "https://github.com/simonmar/async"; diff --git a/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix b/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix index d59ebcaf267..e887b2d539c 100644 --- a/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix +++ b/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix @@ -2,12 +2,12 @@ cabal.mkDerivation (self: { pname = "attoparsec-conduit"; - version = "0.4.0.1"; - sha256 = "1r01xaaw439qpbfnanv2yfw9fz6id8cy17yqdm6x6vk35hmv59kc"; + version = "0.5.0.1"; + sha256 = "1qrg524gr9ajdxaqd9gmxpj45d7ga21q27ykr76kjdwxfpqaq6n8"; buildDepends = [ attoparsec conduit text transformers ]; meta = { homepage = "http://github.com/snoyberg/conduit"; - description = "Turn attoparsec parsers into sinks"; + description = "Consume attoparsec parsers via conduit"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.andres ]; diff --git a/pkgs/development/libraries/haskell/attoparsec/enumerator.nix b/pkgs/development/libraries/haskell/attoparsec/enumerator.nix index ee4b42a49bd..d52687d8080 100644 --- a/pkgs/development/libraries/haskell/attoparsec/enumerator.nix +++ b/pkgs/development/libraries/haskell/attoparsec/enumerator.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "attoparsec-enumerator"; - version = "0.3"; - sha256 = "1sfqcr1mvny9gf0zzggwvs2b20knxrbb208rzaa86ay0b5b5jw5v"; + version = "0.3.1"; + sha256 = "10h6i23vhcishp599s4lbp0c46wcba99w6iv4ickdr1avrm9z2m7"; buildDepends = [ attoparsec enumerator text ]; meta = { homepage = "https://john-millikin.com/software/attoparsec-enumerator/"; diff --git a/pkgs/development/libraries/haskell/authenticate/default.nix b/pkgs/development/libraries/haskell/authenticate/default.nix index 679e9d39e02..27edc1e9a9c 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.2.1.1"; - sha256 = "0kfzsi8za87lgr52b9n6m9fby95d4hm21z7dbaqjv5whr90nwy54"; + version = "1.3.1.1"; + sha256 = "120n7z22x4y4ngxqxsi65zn992f1lksaawcd7rmjvf8m0fysbb4n"; buildDepends = [ aeson attoparsec blazeBuilder blazeBuilderConduit caseInsensitive conduit httpConduit httpTypes monadControl network resourcet diff --git a/pkgs/development/libraries/haskell/base-unicode-symbols/default.nix b/pkgs/development/libraries/haskell/base-unicode-symbols/default.nix index 020bce0a82c..3eccd0a4ffa 100644 --- a/pkgs/development/libraries/haskell/base-unicode-symbols/default.nix +++ b/pkgs/development/libraries/haskell/base-unicode-symbols/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "base-unicode-symbols"; - version = "0.2.2.3"; - sha256 = "0803ncdydkxivn4kcjfn9v0lm43xg47y5iws7lajhhyg6v4zq08j"; + version = "0.2.2.4"; + sha256 = "1afc5pchd3vw33bmjbjygkd0l5zh7glbsx4bfyxfscpc1x1l3y52"; meta = { homepage = "http://haskell.org/haskellwiki/Unicode-symbols"; description = "Unicode alternatives for common functions and operators"; diff --git a/pkgs/development/libraries/haskell/base64-bytestring/default.nix b/pkgs/development/libraries/haskell/base64-bytestring/default.nix index 5fd552d6272..bc3eca3050d 100644 --- a/pkgs/development/libraries/haskell/base64-bytestring/default.nix +++ b/pkgs/development/libraries/haskell/base64-bytestring/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "base64-bytestring"; - version = "0.1.2.0"; - sha256 = "039naasb3z8q42zl067paylxb9i1m1pkp4w6b5yqsc38sbmikv1z"; + version = "1.0.0.0"; + sha256 = "0z0r0lrpka3qrq45ajzyxsjc2as7zp6bq7z7sd56rwiziw7vp7vm"; meta = { homepage = "https://github.com/bos/base64-bytestring"; description = "Fast base64 encoding and deconding for ByteStrings"; diff --git a/pkgs/development/libraries/haskell/benchpress/default.nix b/pkgs/development/libraries/haskell/benchpress/default.nix index 8be4478ce63..c80f04f966d 100644 --- a/pkgs/development/libraries/haskell/benchpress/default.nix +++ b/pkgs/development/libraries/haskell/benchpress/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "benchpress"; - version = "0.2.2.4"; - sha256 = "0cabjx0gkbk5blqkm9pmnz8kmi3573367365gny4r3m431iwxgnf"; + version = "0.2.2.6"; + sha256 = "19ygaf2g4yqkfbc6bw6fmf9jsymbj1iallzvl0zw3vjx860rchfg"; buildDepends = [ mtl time ]; meta = { homepage = "http://github.com/tibbe/benchpress"; diff --git a/pkgs/development/libraries/haskell/binary/default.nix b/pkgs/development/libraries/haskell/binary/default.nix index 01a9483c554..a8fefba0274 100644 --- a/pkgs/development/libraries/haskell/binary/default.nix +++ b/pkgs/development/libraries/haskell/binary/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "binary"; - version = "0.5.1.0"; - sha256 = "18si0f021447b1kqshar224zyh02gc65z7v82waxcn4igss7gm1a"; + version = "0.5.1.1"; + sha256 = "0s62a92a2wwp8hdmkc6j6i9lh5mi6z1yd26fbhsbbm8bxah64pcl"; meta = { homepage = "http://code.haskell.org/binary/"; description = "Binary serialisation for Haskell values using lazy ByteStrings"; diff --git a/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix b/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix index 127ac09edf5..14d4498f585 100644 --- a/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix +++ b/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "blaze-builder-conduit"; - version = "0.4.0.2"; - sha256 = "0wblkvh1v7275n1i66xmm3kg57i21s8m2sfwfnjarwbcjqbgrjih"; + version = "0.5.0.1"; + sha256 = "1avbgrgqzryqv717714s0418lknm0lqzkis3hia00qhy762amlcn"; buildDepends = [ blazeBuilder conduit text transformers ]; meta = { homepage = "http://github.com/snoyberg/conduit"; diff --git a/pkgs/development/libraries/haskell/blaze-builder-enumerator/default.nix b/pkgs/development/libraries/haskell/blaze-builder-enumerator/default.nix index a953d9f4525..00176d215ba 100644 --- a/pkgs/development/libraries/haskell/blaze-builder-enumerator/default.nix +++ b/pkgs/development/libraries/haskell/blaze-builder-enumerator/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "blaze-builder-enumerator"; - version = "0.2.0.4"; - sha256 = "1zwp9hcjsmy5p5i436ajvl86zl1z4pzcfp6c57sj8vfr08rrrkq9"; + version = "0.2.0.5"; + sha256 = "0bbbv9wwzw9ss3d02mszdzxzhg6pcrnpwir9bvby7xkmfqpyffaa"; buildDepends = [ blazeBuilder enumerator transformers ]; meta = { homepage = "https://github.com/meiersi/blaze-builder-enumerator"; diff --git a/pkgs/development/libraries/haskell/blaze-html/default.nix b/pkgs/development/libraries/haskell/blaze-html/default.nix index c8b2eb06a32..c2505aeb72f 100644 --- a/pkgs/development/libraries/haskell/blaze-html/default.nix +++ b/pkgs/development/libraries/haskell/blaze-html/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "blaze-html"; - version = "0.5.0.0"; - sha256 = "0cfvdf50jbm6w277jf69ac57nbkgkn2ifcp6r2amd3qdbmdgqkwj"; + version = "0.5.1.0"; + sha256 = "1f256z68pbm1h6wsk33p94byxwfp01i4pbdrch32jdi1q35cmqxh"; buildDepends = [ blazeBuilder blazeMarkup text ]; meta = { homepage = "http://jaspervdj.be/blaze"; diff --git a/pkgs/development/libraries/haskell/blaze-textual/default.nix b/pkgs/development/libraries/haskell/blaze-textual/default.nix index f673f708707..65f39c8cc08 100644 --- a/pkgs/development/libraries/haskell/blaze-textual/default.nix +++ b/pkgs/development/libraries/haskell/blaze-textual/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "blaze-textual"; - version = "0.2.0.6"; - sha256 = "1699fj9zig6ids9bdjn5v0gqhnyx5dkzi542gkx1gs8943c94737"; + version = "0.2.0.8"; + sha256 = "0zzqh53ywzz8ss58glp3i8is8gry5yqzvdjw4xh95fbbzcz4cgc7"; buildDepends = [ blazeBuilder text time vector ]; meta = { homepage = "http://github.com/bos/blaze-textual"; diff --git a/pkgs/development/libraries/haskell/brainfuck/default.nix b/pkgs/development/libraries/haskell/brainfuck/default.nix new file mode 100644 index 00000000000..a406d1fa500 --- /dev/null +++ b/pkgs/development/libraries/haskell/brainfuck/default.nix @@ -0,0 +1,16 @@ +{ cabal, mtl }: + +cabal.mkDerivation (self: { + pname = "brainfuck"; + version = "0.1"; + sha256 = "0lsw62g4ir8idjjadsdf46p8mqd88mysn0b499bk3x5l5js858z3"; + isLibrary = true; + isExecutable = true; + buildDepends = [ mtl ]; + meta = { + description = "Brainfuck interpreter"; + license = "GPL"; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/case-insensitive/default.nix b/pkgs/development/libraries/haskell/case-insensitive/default.nix index 4187716f026..7f53773f1ab 100644 --- a/pkgs/development/libraries/haskell/case-insensitive/default.nix +++ b/pkgs/development/libraries/haskell/case-insensitive/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "case-insensitive"; - version = "0.4.0.1"; - sha256 = "15wcpzmj1ppl27p8hph9y8nxkjkd4yrvamxi3gk0ahfnb47chaq7"; + version = "0.4.0.3"; + sha256 = "1lpfxfwfxiimvh5nxqrnjqj2687dp7rmv9wkrpmw2zm5wkxwcmzf"; buildDepends = [ hashable text ]; meta = { homepage = "https://github.com/basvandijk/case-insensitive"; diff --git a/pkgs/development/libraries/haskell/certificate/default.nix b/pkgs/development/libraries/haskell/certificate/default.nix index 89410dbcb00..d79f6faa3ef 100644 --- a/pkgs/development/libraries/haskell/certificate/default.nix +++ b/pkgs/development/libraries/haskell/certificate/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "certificate"; - version = "1.2.3"; - sha256 = "0xn46327a50vj70d26gc4z2rn4l6qk77j7mkdwg1j2yh6mcn0n7a"; + version = "1.2.6"; + sha256 = "1li65r4zbff7r7p533p5xw2z3rd0xnlb2bbwqdldrnswy4mvlakx"; isLibrary = true; isExecutable = true; buildDepends = [ asn1Data cryptoPubkeyTypes mtl pem time ]; diff --git a/pkgs/development/libraries/haskell/cipher-aes/default.nix b/pkgs/development/libraries/haskell/cipher-aes/default.nix new file mode 100644 index 00000000000..e89fc1d6faf --- /dev/null +++ b/pkgs/development/libraries/haskell/cipher-aes/default.nix @@ -0,0 +1,15 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "cipher-aes"; + version = "0.1.1"; + sha256 = "0pyiqsdvvq0qhlin17rijqjq0sc0i9nl9rdwbql01fr4pw46cwwg"; + isLibrary = true; + isExecutable = true; + meta = { + homepage = "http://github.com/vincenthz/hs-cipher-aes"; + description = "Fast AES cipher implementation with advanced mode of operations"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/clientsession/default.nix b/pkgs/development/libraries/haskell/clientsession/default.nix index 08e81eaa98f..03d3896e853 100644 --- a/pkgs/development/libraries/haskell/clientsession/default.nix +++ b/pkgs/development/libraries/haskell/clientsession/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "clientsession"; - version = "0.7.5"; - sha256 = "1q2zlq06s0d476ywvb1fkxw34aagcaiqw7jrrmr3lj89q3ylhivr"; + version = "0.8.0.1"; + sha256 = "0r6j15wkyp4akhaxvimjxlwdka7cbm3c3nfk5bvkqan1nrip5rxv"; buildDepends = [ base64Bytestring cereal cprngAes cryptoApi cryptocipher entropy skein tagged diff --git a/pkgs/development/libraries/haskell/cmdargs/default.nix b/pkgs/development/libraries/haskell/cmdargs/default.nix index 55c50cb99fb..0719bf5a03c 100644 --- a/pkgs/development/libraries/haskell/cmdargs/default.nix +++ b/pkgs/development/libraries/haskell/cmdargs/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "cmdargs"; - version = "0.9.5"; - sha256 = "0ihanswhq5d29d9ll5q4grkbaq64dwfsayws7y4xa387d5s9p3iv"; + version = "0.10"; + sha256 = "1xx4cks3hr2ldb0hd5hnc53dpns2zm4gc1dw25gs1vc977kga3hz"; isLibrary = true; isExecutable = true; buildDepends = [ filepath transformers ]; diff --git a/pkgs/development/libraries/haskell/comonad-transformers/default.nix b/pkgs/development/libraries/haskell/comonad-transformers/default.nix new file mode 100644 index 00000000000..bc378235b91 --- /dev/null +++ b/pkgs/development/libraries/haskell/comonad-transformers/default.nix @@ -0,0 +1,19 @@ +{ cabal, comonad, contravariant, distributive, semigroupoids +, semigroups, transformers +}: + +cabal.mkDerivation (self: { + pname = "comonad-transformers"; + version = "3.0"; + sha256 = "1bjix61rdzmqcd1irh6p91jwy4sz1617sj4zic07p7ng9h7fsz24"; + buildDepends = [ + comonad contravariant distributive semigroupoids semigroups + transformers + ]; + meta = { + homepage = "http://github.com/ekmett/comonad-transformers/"; + description = "Comonad transformers"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/comonad/default.nix b/pkgs/development/libraries/haskell/comonad/default.nix new file mode 100644 index 00000000000..3394de01206 --- /dev/null +++ b/pkgs/development/libraries/haskell/comonad/default.nix @@ -0,0 +1,14 @@ +{ cabal, semigroups, transformers }: + +cabal.mkDerivation (self: { + pname = "comonad"; + version = "3.0.0.2"; + sha256 = "01q71b446mdbdj81qjrxjl5bshbg4bjih5zpw9fd4y5431bclfhi"; + buildDepends = [ semigroups transformers ]; + meta = { + homepage = "http://github.com/ekmett/comonad/"; + description = "Haskell 98 compatible comonads"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/conduit/default.nix b/pkgs/development/libraries/haskell/conduit/default.nix index 9c2b377aa8a..c383c46f30b 100644 --- a/pkgs/development/libraries/haskell/conduit/default.nix +++ b/pkgs/development/libraries/haskell/conduit/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "conduit"; - version = "0.4.2"; - sha256 = "1v8s80g8gyxb139dzqbbh4qv6ax08g5smrvx2zc5sd2773wwqwz0"; + version = "0.5.2.4"; + sha256 = "17959j5frfbl5af4pmxhfb4swrjckk4fh5wmd5bwsbs824glb97a"; buildDepends = [ liftedBase monadControl resourcet text transformers transformersBase void diff --git a/pkgs/development/libraries/haskell/configurator/default.nix b/pkgs/development/libraries/haskell/configurator/default.nix new file mode 100644 index 00000000000..3618f598055 --- /dev/null +++ b/pkgs/development/libraries/haskell/configurator/default.nix @@ -0,0 +1,18 @@ +{ cabal, attoparsec, hashable, text, unixCompat +, unorderedContainers +}: + +cabal.mkDerivation (self: { + pname = "configurator"; + version = "0.2.0.1"; + sha256 = "02w6f5q2xkpc3kgqz6a58g7yr0q4xd8ck1b6lr64ahvqwsjbxy6p"; + buildDepends = [ + attoparsec hashable text unixCompat unorderedContainers + ]; + meta = { + homepage = "http://github.com/bos/configurator"; + description = "Configuration management"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/contravariant/default.nix b/pkgs/development/libraries/haskell/contravariant/default.nix new file mode 100644 index 00000000000..526b9e1f997 --- /dev/null +++ b/pkgs/development/libraries/haskell/contravariant/default.nix @@ -0,0 +1,14 @@ +{ cabal, transformers }: + +cabal.mkDerivation (self: { + pname = "contravariant"; + version = "0.2.0.2"; + sha256 = "0142s1c914zbfnvysvcc9s3bv8qs6wimnqcmxca1gxaxqvyfkf3p"; + buildDepends = [ transformers ]; + meta = { + homepage = "http://github.com/ekmett/contravariant/"; + description = "Haskell 98 contravariant functors"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/cookie/default.nix b/pkgs/development/libraries/haskell/cookie/default.nix index 1b958b3240e..b7dae5d4a9b 100644 --- a/pkgs/development/libraries/haskell/cookie/default.nix +++ b/pkgs/development/libraries/haskell/cookie/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "cookie"; - version = "0.4.0"; - sha256 = "1vkz6nys26i0yprb8jkv8iyq9xqnxb0wv07f7s7c448vx4gfln98"; + version = "0.4.0.1"; + sha256 = "01k5gq9kwbrivkhr1sj8aw4cgf2c1xgwwajqvd435r0g99fpx5kk"; buildDepends = [ blazeBuilder dataDefault text time ]; meta = { homepage = "http://github.com/snoyberg/cookie"; diff --git a/pkgs/development/libraries/haskell/cprng-aes/default.nix b/pkgs/development/libraries/haskell/cprng-aes/default.nix index 881d4519a53..1feb21a8b63 100644 --- a/pkgs/development/libraries/haskell/cprng-aes/default.nix +++ b/pkgs/development/libraries/haskell/cprng-aes/default.nix @@ -1,10 +1,14 @@ -{ cabal, cereal, cryptoApi, cryptocipher, entropy, random }: +{ cabal, cereal, cipherAes, cryptoApi, cryptocipher, entropy +, random +}: cabal.mkDerivation (self: { pname = "cprng-aes"; - version = "0.2.3"; - sha256 = "1xyphzb3afvw7kpgq3b0c86b45rp5a8s870gag1lp7h686lhfnn3"; - buildDepends = [ cereal cryptoApi cryptocipher entropy random ]; + version = "0.2.4"; + sha256 = "0rk14yj76p5a1h6jlz4q2fgijjid430lwcr57zkkda8mdibqqs5j"; + buildDepends = [ + cereal cipherAes cryptoApi cryptocipher entropy random + ]; meta = { homepage = "http://github.com/vincenthz/hs-cprng-aes"; description = "Crypto Pseudo Random Number Generator using AES in counter mode"; diff --git a/pkgs/development/libraries/haskell/criterion/default.nix b/pkgs/development/libraries/haskell/criterion/default.nix index a687a592baa..54b6b20dc83 100644 --- a/pkgs/development/libraries/haskell/criterion/default.nix +++ b/pkgs/development/libraries/haskell/criterion/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "criterion"; - version = "0.6.0.1"; - sha256 = "0k6ip41w5h1z8gl67a8vsb6c3md5nc4yh1vd6dysp9fqgn0vky0a"; + version = "0.6.1.1"; + sha256 = "1w5yqcgnx2ij3hmvmz5g4ynj6n8wa3yyk1kfbbwxyh9j5kc2xwiw"; buildDepends = [ aeson deepseq filepath hastache mtl mwcRandom parsec statistics time transformers vector vectorAlgorithms diff --git a/pkgs/development/libraries/haskell/crypto-conduit/default.nix b/pkgs/development/libraries/haskell/crypto-conduit/default.nix index 747cbbf2864..539fa3b192f 100644 --- a/pkgs/development/libraries/haskell/crypto-conduit/default.nix +++ b/pkgs/development/libraries/haskell/crypto-conduit/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "crypto-conduit"; - version = "0.3.2"; - sha256 = "09f6l60wcblp15hx3hppskjsyah9bh6jwqqr4dvl6j03011gx4id"; + version = "0.4.0.1"; + sha256 = "1afkn9kp5y1qsgd2l2q85d2bh0wbvn07x0ddi72sr8g7daw8zrs8"; buildDepends = [ cereal conduit cryptoApi transformers ]; meta = { homepage = "https://github.com/meteficha/crypto-conduit"; diff --git a/pkgs/development/libraries/haskell/cuda/default.nix b/pkgs/development/libraries/haskell/cuda/default.nix index 5c0614bc0b4..3baa02d2674 100644 --- a/pkgs/development/libraries/haskell/cuda/default.nix +++ b/pkgs/development/libraries/haskell/cuda/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "cuda"; - version = "0.4.1.0"; - sha256 = "1drr95d4v3khidxr6na5vyq28bv5rqk2n676q0bydc4rqwhb1z6w"; + version = "0.4.1.1"; + sha256 = "05hhlnfyr30r1frsc15px38ijd1qvs125yjxvsi6q1kmmkq1w6y9"; buildDepends = [ extensibleExceptions ]; buildTools = [ c2hs ]; extraLibraries = [ cudatoolkit nvidia_x11 self.stdenv.gcc ]; @@ -37,7 +37,7 @@ cabal.mkDerivation (self: { meta = { description = "FFI binding to the CUDA interface for programming NVIDIA GPUs"; license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; + platforms = self.stdenv.lib.platforms.none; maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/data-default/default.nix b/pkgs/development/libraries/haskell/data-default/default.nix index 41728d393f8..893f2121f0a 100644 --- a/pkgs/development/libraries/haskell/data-default/default.nix +++ b/pkgs/development/libraries/haskell/data-default/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "data-default"; - version = "0.4.0"; - sha256 = "1pil8dxbk0zl2zw1xj9h2bpwpdriwfd7aj48kh0xpw9yazg3m802"; + version = "0.5.0"; + sha256 = "1wv8wjd9j40s7h19aph5pqph7rby5ma1nlagqywn9q0634iq9n2a"; buildDepends = [ dlist ]; meta = { description = "A class for types with a default value"; diff --git a/pkgs/development/libraries/haskell/data-inttrie/default.nix b/pkgs/development/libraries/haskell/data-inttrie/default.nix new file mode 100644 index 00000000000..926d465065d --- /dev/null +++ b/pkgs/development/libraries/haskell/data-inttrie/default.nix @@ -0,0 +1,14 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "data-inttrie"; + version = "0.0.7"; + sha256 = "19d586p2pj38pirrkip9z6yxrdbpiqsbnczmnyvd8slndilqz0ip"; + meta = { + homepage = "http://github.com/luqui/data-inttrie"; + description = "A lazy, infinite trie of integers"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/data-lens-template/default.nix b/pkgs/development/libraries/haskell/data-lens-template/default.nix new file mode 100644 index 00000000000..fc058b92e54 --- /dev/null +++ b/pkgs/development/libraries/haskell/data-lens-template/default.nix @@ -0,0 +1,14 @@ +{ cabal, dataLens }: + +cabal.mkDerivation (self: { + pname = "data-lens-template"; + version = "2.1.5"; + sha256 = "09i9lby5jd2kcg0l7y4hkga7jxixcpqw4dc7h1kngqdz92a1ydxc"; + buildDepends = [ dataLens ]; + meta = { + homepage = "http://github.com/ekmett/data-lens-template/"; + description = "Utilities for Data.Lens"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/data-lens/default.nix b/pkgs/development/libraries/haskell/data-lens/default.nix new file mode 100644 index 00000000000..e4cff67f376 --- /dev/null +++ b/pkgs/development/libraries/haskell/data-lens/default.nix @@ -0,0 +1,17 @@ +{ cabal, comonad, comonadTransformers, semigroupoids, transformers +}: + +cabal.mkDerivation (self: { + pname = "data-lens"; + version = "2.10.2"; + sha256 = "1mv4lh5rhmq09d89ci07kj9anv7ckrlqh9x3xr4jq9idf7sf54b5"; + buildDepends = [ + comonad comonadTransformers semigroupoids transformers + ]; + meta = { + homepage = "http://github.com/roconnor/data-lens/"; + description = "Haskell 98 Lenses"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/data-memocombinators/default.nix b/pkgs/development/libraries/haskell/data-memocombinators/default.nix new file mode 100644 index 00000000000..25f063c20ac --- /dev/null +++ b/pkgs/development/libraries/haskell/data-memocombinators/default.nix @@ -0,0 +1,15 @@ +{ cabal, dataInttrie }: + +cabal.mkDerivation (self: { + pname = "data-memocombinators"; + version = "0.4.3"; + sha256 = "0mzvjgccm23y7mfaz9iwdy64amf69d7i8yq9fc9mjx1nyzxdrgsc"; + buildDepends = [ dataInttrie ]; + meta = { + homepage = "http://github.com/luqui/data-memocombinators"; + description = "Combinators for building memo tables"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/date-cache/default.nix b/pkgs/development/libraries/haskell/date-cache/default.nix new file mode 100644 index 00000000000..a460dcbdafc --- /dev/null +++ b/pkgs/development/libraries/haskell/date-cache/default.nix @@ -0,0 +1,12 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "date-cache"; + version = "0.3.0"; + sha256 = "0grhcbd0rhdn0cf1fz82x8pv8cmxfhndlcwyrax4mnnr3pql9kmb"; + meta = { + description = "Date cacher"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/deepseq/1.3.0.0.nix b/pkgs/development/libraries/haskell/deepseq/1.3.0.1.nix similarity index 76% rename from pkgs/development/libraries/haskell/deepseq/1.3.0.0.nix rename to pkgs/development/libraries/haskell/deepseq/1.3.0.1.nix index 2470dcdf89f..78f9273e46a 100644 --- a/pkgs/development/libraries/haskell/deepseq/1.3.0.0.nix +++ b/pkgs/development/libraries/haskell/deepseq/1.3.0.1.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "deepseq"; - version = "1.3.0.0"; - sha256 = "0z2k1rda67nmhv62irjfd642iarj1i9m55l6p47j4cysrszhvqgy"; + version = "1.3.0.1"; + sha256 = "068zka6rwprbzpx7yisi1ajsxdly23zaf2vjklx1wp66yypx54lp"; meta = { description = "Deep evaluation of data structures"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/derive/default.nix b/pkgs/development/libraries/haskell/derive/default.nix index c05f7fd0231..906c51fc072 100644 --- a/pkgs/development/libraries/haskell/derive/default.nix +++ b/pkgs/development/libraries/haskell/derive/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "derive"; - version = "2.5.9"; - sha256 = "1rws401dpdck7c9jxfv9h46r06vn730lw1fsxvvidnf3hlr0yyk5"; + version = "2.5.11"; + sha256 = "0934k49kpp32wffpvpk2sia7frd9ik56k6ghy6d6j31cabxf9m8r"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/diagrams/cairo.nix b/pkgs/development/libraries/haskell/diagrams/cairo.nix new file mode 100644 index 00000000000..f23be1ebfb1 --- /dev/null +++ b/pkgs/development/libraries/haskell/diagrams/cairo.nix @@ -0,0 +1,19 @@ +{ cabal, cairo, cmdargs, diagramsCore, diagramsLib, filepath, gtk +, mtl, split +}: + +cabal.mkDerivation (self: { + pname = "diagrams-cairo"; + version = "0.5.0.2"; + sha256 = "1wwk65c2cx7rkhmai5spms791fjhl3snwhj0w9399q8pgj6g4lj8"; + buildDepends = [ + cairo cmdargs diagramsCore diagramsLib filepath gtk mtl split + ]; + jailbreak = true; + meta = { + homepage = "http://projects.haskell.org/diagrams"; + description = "Cairo backend for diagrams drawing EDSL"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/diagrams/core.nix b/pkgs/development/libraries/haskell/diagrams/core.nix new file mode 100644 index 00000000000..365e2737131 --- /dev/null +++ b/pkgs/development/libraries/haskell/diagrams/core.nix @@ -0,0 +1,18 @@ +{ cabal, MemoTrie, newtype, semigroups, vectorSpace +, vectorSpacePoints +}: + +cabal.mkDerivation (self: { + pname = "diagrams-core"; + version = "0.5.0.1"; + sha256 = "073fk9cxm1kh92alr51dgwps9wxc5w3470axc6q7w91sk5cskpxy"; + buildDepends = [ + MemoTrie newtype semigroups vectorSpace vectorSpacePoints + ]; + meta = { + homepage = "http://projects.haskell.org/diagrams"; + description = "Core libraries for diagrams EDSL"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/diagrams/diagrams.nix b/pkgs/development/libraries/haskell/diagrams/diagrams.nix new file mode 100644 index 00000000000..21c3a7a28f6 --- /dev/null +++ b/pkgs/development/libraries/haskell/diagrams/diagrams.nix @@ -0,0 +1,15 @@ +{ cabal, diagramsCairo, diagramsCore, diagramsLib }: + +cabal.mkDerivation (self: { + pname = "diagrams"; + version = "0.5"; + sha256 = "163h2fg3gpmsfm57gjyja2rxh9pl6s3xnzlidfdy201zbk1mzdg5"; + buildDepends = [ diagramsCairo diagramsCore diagramsLib ]; + noHaddock = true; + meta = { + homepage = "http://projects.haskell.org/diagrams"; + description = "Embedded domain-specific language for declarative vector graphics"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/diagrams/lib.nix b/pkgs/development/libraries/haskell/diagrams/lib.nix new file mode 100644 index 00000000000..d5c386c1e1f --- /dev/null +++ b/pkgs/development/libraries/haskell/diagrams/lib.nix @@ -0,0 +1,19 @@ +{ cabal, active, colour, dataDefault, diagramsCore, newtype +, NumInstances, semigroups, vectorSpace +}: + +cabal.mkDerivation (self: { + pname = "diagrams-lib"; + version = "0.5.0.1"; + sha256 = "0spfsllr2z064cxkdqcij02f0ikxxmll2dqj7rfikp4738wj21dy"; + buildDepends = [ + active colour dataDefault diagramsCore newtype NumInstances + semigroups vectorSpace + ]; + meta = { + homepage = "http://projects.haskell.org/diagrams"; + description = "Embedded domain-specific language for declarative graphics"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix b/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix new file mode 100644 index 00000000000..acc75a3552a --- /dev/null +++ b/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix @@ -0,0 +1,14 @@ +{ cabal, digestiveFunctors, heist, text, xmlhtml }: + +cabal.mkDerivation (self: { + pname = "digestive-functors-heist"; + version = "0.5.0.0"; + sha256 = "1cqzpnr53mailnmjgkbqk4f4hrjd84h6682mr8x7qg5v27zvcdbn"; + buildDepends = [ digestiveFunctors heist text xmlhtml ]; + meta = { + homepage = "http://github.com/jaspervdj/digestive-functors"; + description = "Heist frontend for the digestive-functors library"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/digestive-functors-snap/default.nix b/pkgs/development/libraries/haskell/digestive-functors-snap/default.nix new file mode 100644 index 00000000000..3d5725e603f --- /dev/null +++ b/pkgs/development/libraries/haskell/digestive-functors-snap/default.nix @@ -0,0 +1,14 @@ +{ cabal, digestiveFunctors, filepath, mtl, snapCore, text }: + +cabal.mkDerivation (self: { + pname = "digestive-functors-snap"; + version = "0.5.0.0"; + sha256 = "01lbd42rsryzqzra8ax22iw6c9fyv5az8q7dkdi6yyfxdq976l0x"; + buildDepends = [ digestiveFunctors filepath mtl snapCore text ]; + meta = { + homepage = "http://github.com/jaspervdj/digestive-functors"; + description = "Snap backend for the digestive-functors library"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/digestive-functors/default.nix b/pkgs/development/libraries/haskell/digestive-functors/default.nix new file mode 100644 index 00000000000..d6d4710f306 --- /dev/null +++ b/pkgs/development/libraries/haskell/digestive-functors/default.nix @@ -0,0 +1,14 @@ +{ cabal, mtl, text }: + +cabal.mkDerivation (self: { + pname = "digestive-functors"; + version = "0.5.0.2"; + sha256 = "1phakcljl6ri2p9lfzjnn001jw0inyxa5zd7lp2k9lhq1yq0byb0"; + buildDepends = [ mtl text ]; + meta = { + homepage = "http://github.com/jaspervdj/digestive-functors"; + description = "A practical formlet library"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/directory-tree/default.nix b/pkgs/development/libraries/haskell/directory-tree/default.nix index f99e043cf9e..65148f10a22 100644 --- a/pkgs/development/libraries/haskell/directory-tree/default.nix +++ b/pkgs/development/libraries/haskell/directory-tree/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "directory-tree"; - version = "0.10.0"; - sha256 = "08b0w9j55x6c06pri7yvv84n24inhpb4miybdnkyjkjy7r3yy7m4"; + version = "0.10.1"; + sha256 = "02acmfdw1yjb0h9dpjy04xxclsasm1p0m6w1dvccd4x2aqc6ybbw"; buildDepends = [ filepath ]; meta = { homepage = "http://coder.bsimmons.name/blog/2009/05/directory-tree-module-released/"; diff --git a/pkgs/development/libraries/haskell/distributive/default.nix b/pkgs/development/libraries/haskell/distributive/default.nix new file mode 100644 index 00000000000..a8b07c608d8 --- /dev/null +++ b/pkgs/development/libraries/haskell/distributive/default.nix @@ -0,0 +1,14 @@ +{ cabal, transformers }: + +cabal.mkDerivation (self: { + pname = "distributive"; + version = "0.2.2"; + sha256 = "13wvr2wb3h2nr1qd3dwjqx0b6g4igjqm3q2cyi4mc41gwihkbhr2"; + buildDepends = [ transformers ]; + meta = { + homepage = "http://github.com/ekmett/distributive/"; + description = "Haskell 98 Distributive functors -- Dual to Traversable"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/double-conversion/default.nix b/pkgs/development/libraries/haskell/double-conversion/default.nix index 82a1e4d4c39..5d92b8178c1 100644 --- a/pkgs/development/libraries/haskell/double-conversion/default.nix +++ b/pkgs/development/libraries/haskell/double-conversion/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "double-conversion"; - version = "0.2.0.4"; - sha256 = "00rb8n2ky20ah9ry398jagi9gb0gz40yjfalh35cpckmg30z199x"; + version = "0.2.0.5"; + sha256 = "1z23a8sfnq5lady8n2kcina9a7df8lmsliscf85x84dxkd3a1ahf"; buildDepends = [ text ]; meta = { homepage = "https://github.com/bos/double-conversion"; diff --git a/pkgs/development/libraries/haskell/fast-logger/default.nix b/pkgs/development/libraries/haskell/fast-logger/default.nix index 56248997723..e266aa15ff8 100644 --- a/pkgs/development/libraries/haskell/fast-logger/default.nix +++ b/pkgs/development/libraries/haskell/fast-logger/default.nix @@ -1,10 +1,10 @@ -{ cabal, blazeBuilder, filepath }: +{ cabal, blazeBuilder, dateCache, filepath, text, unixTime }: cabal.mkDerivation (self: { pname = "fast-logger"; - version = "0.0.2"; - sha256 = "1pwxhgcy4lmc63dnr9fihkmiclf60hrnsv8wzbsdg0jcj4qi0zr7"; - buildDepends = [ blazeBuilder filepath ]; + version = "0.3.1"; + sha256 = "0sjn3vad0fbchv1fhap71wfnihlwnfhk6p9h9hpnbr0i4b32f1ks"; + buildDepends = [ blazeBuilder dateCache filepath text unixTime ]; meta = { description = "A fast logging system"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/fclabels/default.nix b/pkgs/development/libraries/haskell/fclabels/default.nix index 5f62315a972..79ea3160df2 100644 --- a/pkgs/development/libraries/haskell/fclabels/default.nix +++ b/pkgs/development/libraries/haskell/fclabels/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "fclabels"; - version = "1.1.3"; - sha256 = "1f8aav4gcpixmnnwcml0aqsqswb8fc0rp986nbyap22gmcw4hflx"; + version = "1.1.4.3"; + sha256 = "10qr0ncsqxg0dg2f73ip873gr342saxhidaf3c6g5vr03cvmmkap"; buildDepends = [ mtl transformers ]; meta = { description = "First class accessor labels"; diff --git a/pkgs/development/libraries/haskell/file-embed/default.nix b/pkgs/development/libraries/haskell/file-embed/default.nix index 1ca06b356ec..0a6fdf6c8cc 100644 --- a/pkgs/development/libraries/haskell/file-embed/default.nix +++ b/pkgs/development/libraries/haskell/file-embed/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "file-embed"; - version = "0.0.4.4"; - sha256 = "1czwa5vpafhvif4gv7bwa7hrxkrbrvvybgyjckd0hdpl6bpd4nhp"; + version = "0.0.4.5"; + sha256 = "18rhcjll5gj790g5balk3xhnmmgjh2bixik8vna5drs7y9i0innp"; meta = { homepage = "https://github.com/snoyberg/file-embed"; description = "Use Template Haskell to embed file contents directly"; diff --git a/pkgs/development/libraries/haskell/filepath/default.nix b/pkgs/development/libraries/haskell/filepath/default.nix index ae28bdc2e41..0cd65bb1905 100644 --- a/pkgs/development/libraries/haskell/filepath/default.nix +++ b/pkgs/development/libraries/haskell/filepath/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "filepath"; - version = "1.3.0.0"; - sha256 = "1v5affq82b4fypm49d5sradcx4ymgmkac563vfx483pmyl73i5jl"; + version = "1.3.0.1"; + sha256 = "1ny8dz8rv883vg6hkzg3zank771cr2z9sfhii7aw4rfb71k29g5p"; meta = { homepage = "http://www-users.cs.york.ac.uk/~ndm/filepath/"; description = "Library for manipulating FilePaths in a cross platform way"; diff --git a/pkgs/development/libraries/haskell/filestore/default.nix b/pkgs/development/libraries/haskell/filestore/default.nix index 355c6ef876c..752037698ca 100644 --- a/pkgs/development/libraries/haskell/filestore/default.nix +++ b/pkgs/development/libraries/haskell/filestore/default.nix @@ -12,6 +12,7 @@ cabal.mkDerivation (self: { Diff filepath HUnit mtl parsec split time utf8String xml ]; noHaddock = true; + jailbreak = true; meta = { description = "Interface for versioning file stores"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/fingertree/default.nix b/pkgs/development/libraries/haskell/fingertree/default.nix index 71afad2cdbc..299b2e926db 100644 --- a/pkgs/development/libraries/haskell/fingertree/default.nix +++ b/pkgs/development/libraries/haskell/fingertree/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "fingertree"; - version = "0.0.1.0"; - sha256 = "e80bf256506290c8f4fb44222920ae7d8405fd22e453c7a08dba49297d49328b"; + version = "0.0.1.1"; + sha256 = "00llr24b2r539250fangl0jj39gf26gjwvhjpy5qg8l920hrjn78"; meta = { description = "Generic finger-tree structure, with example instances"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/flexible-defaults/default.nix b/pkgs/development/libraries/haskell/flexible-defaults/default.nix index 40ac59d1c9e..9cba8f2c13f 100644 --- a/pkgs/development/libraries/haskell/flexible-defaults/default.nix +++ b/pkgs/development/libraries/haskell/flexible-defaults/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "flexible-defaults"; - version = "0.0.0.3"; - sha256 = "1s0dz61bqzzbxqvn9i8zwaccsha15als45zzjs2yc11r3m151dla"; + version = "0.0.1.0"; + sha256 = "0vq8ci3zbzmw8abjd12dhjiqzz4ckr99c1fqk32qsp5bvm81bdma"; buildDepends = [ thExtras transformers ]; meta = { homepage = "https://github.com/mokus0/flexible-defaults"; diff --git a/pkgs/development/libraries/haskell/funcmp/default.nix b/pkgs/development/libraries/haskell/funcmp/default.nix index f6893cc3797..d17ca718f0a 100644 --- a/pkgs/development/libraries/haskell/funcmp/default.nix +++ b/pkgs/development/libraries/haskell/funcmp/default.nix @@ -2,14 +2,17 @@ cabal.mkDerivation (self: { pname = "funcmp"; - version = "1.6"; - sha256 = "1l317gnav6adbdi849zdcgcvrlcs4mz4p0s67wg323prq713fkz0"; + version = "1.7"; + sha256 = "1rna7x7lw36fv5pyq0zn4b472mh11r0bszzji13wm3byhhmzs04k"; buildDepends = [ filepath ]; meta = { homepage = "http://savannah.nongnu.org/projects/funcmp/"; description = "Functional MetaPost"; license = "GPL"; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; }; }) diff --git a/pkgs/development/libraries/haskell/ghc-events/default.nix b/pkgs/development/libraries/haskell/ghc-events/default.nix index 4827b749484..0b5fc5c107a 100644 --- a/pkgs/development/libraries/haskell/ghc-events/default.nix +++ b/pkgs/development/libraries/haskell/ghc-events/default.nix @@ -7,10 +7,8 @@ cabal.mkDerivation (self: { isLibrary = true; isExecutable = true; buildDepends = [ binary mtl ]; - patchPhase = '' - sed -i -e 's|mtl *>=.*$|mtl,|' ghc-events.cabal - ''; noHaddock = true; + jailbreak = true; meta = { description = "Library and tool for parsing .eventlog files from GHC"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/gitit/default.nix b/pkgs/development/libraries/haskell/gitit/default.nix index 7f15c201999..7de302aee6d 100644 --- a/pkgs/development/libraries/haskell/gitit/default.nix +++ b/pkgs/development/libraries/haskell/gitit/default.nix @@ -18,6 +18,7 @@ cabal.mkDerivation (self: { safe SHA syb tagsoup text time url utf8String xhtml xml xssSanitize zlib ]; + jailbreak = true; meta = { homepage = "http://gitit.net"; description = "Wiki using happstack, git or darcs, and pandoc"; diff --git a/pkgs/development/libraries/haskell/gloss/default.nix b/pkgs/development/libraries/haskell/gloss/default.nix index 08e08e29ec0..a4b613dd756 100644 --- a/pkgs/development/libraries/haskell/gloss/default.nix +++ b/pkgs/development/libraries/haskell/gloss/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "gloss"; - version = "1.7.4.1"; - sha256 = "01mxazdgmz3k8y4s2k2mj11g1m788dykx60i7bqbdwzbzc65hcfw"; + version = "1.7.5.2"; + sha256 = "1lasq106slq57k832pqhaq5wh7hwxn5bzg7rjk95rf3rrq5xb9f5"; buildDepends = [ bmp GLUT OpenGL ]; meta = { homepage = "http://gloss.ouroborus.net"; diff --git a/pkgs/development/libraries/haskell/glpk-hs/default.nix b/pkgs/development/libraries/haskell/glpk-hs/default.nix new file mode 100644 index 00000000000..006f227a8c2 --- /dev/null +++ b/pkgs/development/libraries/haskell/glpk-hs/default.nix @@ -0,0 +1,15 @@ +{ cabal, deepseq, glpk, mtl }: + +cabal.mkDerivation (self: { + pname = "glpk-hs"; + version = "0.3.3"; + sha256 = "1pnq0v5va7f40ky9xb8c4z9wcmmnny2vk4afasz5pwivbxh42mfl"; + buildDepends = [ deepseq mtl ]; + extraLibraries = [ glpk ]; + meta = { + description = "Comprehensive GLPK linear programming bindings"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/graphviz/default.nix b/pkgs/development/libraries/haskell/graphviz/default.nix index 77867472d66..7986ef07c1e 100644 --- a/pkgs/development/libraries/haskell/graphviz/default.nix +++ b/pkgs/development/libraries/haskell/graphviz/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "graphviz"; - version = "2999.13.0.3"; - sha256 = "0rwjlwfa3s1vgh5mwzwmzq4s153iq338zy7jqi0qyxcs52illqq8"; + version = "2999.14.1.0"; + sha256 = "13fni5sf6cdfvgyh7kqjjdhmjxkhbgl3gbi0cbq90n8blzg4q1ql"; buildDepends = [ colour dlist fgl filepath polyparse text transformers wlPprintText ]; diff --git a/pkgs/development/libraries/haskell/hackage-db/default.nix b/pkgs/development/libraries/haskell/hackage-db/default.nix index b27ff78d8f9..37698cebb38 100644 --- a/pkgs/development/libraries/haskell/hackage-db/default.nix +++ b/pkgs/development/libraries/haskell/hackage-db/default.nix @@ -10,6 +10,9 @@ cabal.mkDerivation (self: { description = "provide access to the Hackage database via Data.Map"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; }; }) diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix index 11e4d90205c..4224bfe1216 100644 --- a/pkgs/development/libraries/haskell/hakyll/default.nix +++ b/pkgs/development/libraries/haskell/hakyll/default.nix @@ -1,16 +1,16 @@ { cabal, binary, blazeHtml, blazeMarkup, citeprocHs, cryptohash -, filepath, hamlet, mtl, pandoc, parsec, regexBase, regexTdfa -, snapCore, snapServer, tagsoup, text, time +, filepath, hamlet, lrucache, mtl, pandoc, parsec, regexBase +, regexTdfa, snapCore, snapServer, tagsoup, text, time }: cabal.mkDerivation (self: { pname = "hakyll"; - version = "3.3.0.1"; - sha256 = "1rymj7j97803hy7nv235m29m0rird1c0ik81mkaicdfiabkihmrq"; + version = "3.4.1.0"; + sha256 = "028wq61kvh2nkz8dxbpcnvic1vlqnz1a2l1xrvficmvk25qyqmvy"; buildDepends = [ binary blazeHtml blazeMarkup citeprocHs cryptohash filepath hamlet - mtl pandoc parsec regexBase regexTdfa snapCore snapServer tagsoup - text time + lrucache mtl pandoc parsec regexBase regexTdfa snapCore snapServer + tagsoup text time ]; meta = { homepage = "http://jaspervdj.be/hakyll"; diff --git a/pkgs/development/libraries/haskell/hamlet/default.nix b/pkgs/development/libraries/haskell/hamlet/default.nix index addc495d867..31d1ad66d2e 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.0.1.4"; - sha256 = "0rvsp54wrhaz5pnn136w1xlny9dkwv48ihyhq02yg5gg510v08v7"; + version = "1.1.0.2"; + sha256 = "0knkc43ldz3jhn3pmsysqbzlsp8akh9kiyy2jncra9y0xhminpqy"; buildDepends = [ blazeBuilder blazeHtml blazeMarkup failure parsec shakespeare text ]; diff --git a/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix b/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix index 6c105b1e476..cf71dde30c3 100644 --- a/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix +++ b/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix @@ -5,6 +5,7 @@ cabal.mkDerivation (self: { version = "7.0.1"; sha256 = "13ayypl2x402h6a7yq7fvgd2mn21gl5gcw2hk7f5vr2bdlvwv53n"; buildDepends = [ hamlet happstackServer text ]; + jailbreak = true; meta = { homepage = "http://www.happstack.com/"; description = "Support for Hamlet HTML templates in Happstack"; diff --git a/pkgs/development/libraries/haskell/happstack/happstack-server.nix b/pkgs/development/libraries/haskell/happstack/happstack-server.nix index 97cfd0173b9..06b882c20bb 100644 --- a/pkgs/development/libraries/haskell/happstack/happstack-server.nix +++ b/pkgs/development/libraries/haskell/happstack/happstack-server.nix @@ -6,15 +6,14 @@ cabal.mkDerivation (self: { pname = "happstack-server"; - version = "7.0.2"; - sha256 = "0p4vy1h3nkq7riipizljc9wz64y3jfiyq5vzv1r963badk3q0xzb"; - isLibrary = true; - isExecutable = true; + version = "7.0.4"; + sha256 = "168201z5slm6mrkckpdpshgaiz29k9j1j97vmbrybprj0zhcrl7r"; buildDepends = [ base64Bytestring blazeHtml extensibleExceptions filepath hslogger html monadControl mtl network parsec sendfile syb systemFilepath text time transformers transformersBase utf8String xhtml zlib ]; + jailbreak = true; meta = { homepage = "http://happstack.com"; description = "Web related tools and services"; diff --git a/pkgs/development/libraries/haskell/happstack/happstack-util.nix b/pkgs/development/libraries/haskell/happstack/happstack-util.nix index b457ec6dc32..8dfac311a9a 100644 --- a/pkgs/development/libraries/haskell/happstack/happstack-util.nix +++ b/pkgs/development/libraries/haskell/happstack/happstack-util.nix @@ -12,9 +12,7 @@ cabal.mkDerivation (self: { extensibleExceptions filepath hslogger mtl network parsec random time unixCompat ]; - patchPhase = '' - sed -i -e 's|mtl >= 1.1 && < 2.1|mtl|' happstack-util.cabal - ''; + jailbreak = true; meta = { homepage = "http://happstack.com"; description = "Web framework"; diff --git a/pkgs/development/libraries/haskell/hashable/default.nix b/pkgs/development/libraries/haskell/hashable/default.nix index c706b020fef..96fe7ae0eb1 100644 --- a/pkgs/development/libraries/haskell/hashable/default.nix +++ b/pkgs/development/libraries/haskell/hashable/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "hashable"; - version = "1.1.2.3"; - sha256 = "19v94b34c2j6f9d9xii2hg0mjxdkq51aifkcqw6hbicn97kfcxls"; + version = "1.1.2.5"; + sha256 = "0gbiaj5ck2bvvinndp2pg7qsm2h2izbnz9wi97dbm7i8r4qd9d9z"; buildDepends = [ text ]; meta = { homepage = "http://github.com/tibbe/hashable"; diff --git a/pkgs/development/libraries/haskell/haskeline/default.nix b/pkgs/development/libraries/haskell/haskeline/0.6.4.7.nix similarity index 100% rename from pkgs/development/libraries/haskell/haskeline/default.nix rename to pkgs/development/libraries/haskell/haskeline/0.6.4.7.nix diff --git a/pkgs/development/libraries/haskell/haskeline/0.7.0.3.nix b/pkgs/development/libraries/haskell/haskeline/0.7.0.3.nix new file mode 100644 index 00000000000..3d51d396c7f --- /dev/null +++ b/pkgs/development/libraries/haskell/haskeline/0.7.0.3.nix @@ -0,0 +1,16 @@ +{ cabal, filepath, terminfo, transformers }: + +cabal.mkDerivation (self: { + pname = "haskeline"; + version = "0.7.0.3"; + sha256 = "10xc229ddk4g87i78vgjbfr7sii28fx00qwnggb5x7sfigfca8sg"; + buildDepends = [ filepath terminfo transformers ]; + configureFlags = "-fterminfo"; + meta = { + homepage = "http://trac.haskell.org/haskeline"; + description = "A command-line interface for user input, written in Haskell"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/haskell-src-exts/1.13.3.nix b/pkgs/development/libraries/haskell/haskell-src-exts/1.13.5.nix similarity index 84% rename from pkgs/development/libraries/haskell/haskell-src-exts/1.13.3.nix rename to pkgs/development/libraries/haskell/haskell-src-exts/1.13.5.nix index d4cb1d97bb7..16f6d6362a1 100644 --- a/pkgs/development/libraries/haskell/haskell-src-exts/1.13.3.nix +++ b/pkgs/development/libraries/haskell/haskell-src-exts/1.13.5.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "haskell-src-exts"; - version = "1.13.3"; - sha256 = "0z2vs6ji0dgm3c11jwcq5jcnjr8a6pawrkn3c8a3a5p612v8d495"; + version = "1.13.5"; + sha256 = "03bzhfp7l9f5hh61qdrr83331nbfgj3jfsfylwmnmcknpisdqnkw"; buildDepends = [ cpphs ]; buildTools = [ happy ]; meta = { diff --git a/pkgs/development/libraries/haskell/haskell-src-meta/default.nix b/pkgs/development/libraries/haskell/haskell-src-meta/default.nix index 2300d6e80ca..1d9bba47b4b 100644 --- a/pkgs/development/libraries/haskell/haskell-src-meta/default.nix +++ b/pkgs/development/libraries/haskell/haskell-src-meta/default.nix @@ -1,10 +1,10 @@ -{ cabal, haskellSrcExts, syb, thLift, uniplate }: +{ cabal, haskellSrcExts, syb, thOrphans, uniplate }: cabal.mkDerivation (self: { pname = "haskell-src-meta"; - version = "0.5.1.2"; - sha256 = "09if8423dwf4jcr6p7d8j4r9i2n8jc7xxvjn1p1mwjp0ajzk8g9s"; - buildDepends = [ haskellSrcExts syb thLift uniplate ]; + version = "0.6.0.1"; + sha256 = "181xjajvppipzgknmbhbb1i2r8rimbr5vzn6gf1ksddgw12sargd"; + buildDepends = [ haskellSrcExts syb thOrphans uniplate ]; meta = { description = "Parse source to template-haskell abstract syntax"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/hastache/default.nix b/pkgs/development/libraries/haskell/hastache/default.nix index ef11e344b44..f37badde96d 100644 --- a/pkgs/development/libraries/haskell/hastache/default.nix +++ b/pkgs/development/libraries/haskell/hastache/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hastache"; - version = "0.3.3"; - sha256 = "18ayrfwi3jn3q650m5dm9wx9c7djwc2miz3mxlscd9gzlnrfi772"; + version = "0.4.2"; + sha256 = "1ad691qxnnx0a6ik0cjdzd8aw7z88p06zckbb3cb1r8pk6m0g7vi"; buildDepends = [ blazeBuilder filepath ieee754 mtl syb text utf8String ]; diff --git a/pkgs/development/libraries/haskell/haxr/default.nix b/pkgs/development/libraries/haskell/haxr/default.nix index 12f2b2f84f3..1283d3a4a59 100644 --- a/pkgs/development/libraries/haskell/haxr/default.nix +++ b/pkgs/development/libraries/haskell/haxr/default.nix @@ -1,17 +1,15 @@ -{ cabal, blazeBuilder, dataenc, HaXml, HTTP, mtl, network, time -, utf8String +{ cabal, base64Bytestring, blazeBuilder, HaXml, HTTP, mtl, network +, time, utf8String }: cabal.mkDerivation (self: { pname = "haxr"; - version = "3000.8.5"; - sha256 = "1gfifqc7ldklapnymwd9ss0lll6q87sbg1hc6pa4c9sh275x1rz6"; + version = "3000.9.0.1"; + sha256 = "106hw8ysjx12dvwij4ld6n54mxj2yl1p7iihp2fwz50v50mz6102"; buildDepends = [ - blazeBuilder dataenc HaXml HTTP mtl network time utf8String + base64Bytestring blazeBuilder HaXml HTTP mtl network time + utf8String ]; - patchPhase = '' - sed -i haxr.cabal -e 's|HaXml == 1.22.\*|HaXml|' - ''; meta = { homepage = "http://www.haskell.org/haskellwiki/HaXR"; description = "XML-RPC client and server library"; diff --git a/pkgs/development/libraries/haskell/heist/default.nix b/pkgs/development/libraries/haskell/heist/default.nix new file mode 100644 index 00000000000..44ba8ba15ee --- /dev/null +++ b/pkgs/development/libraries/haskell/heist/default.nix @@ -0,0 +1,21 @@ +{ cabal, aeson, attoparsec, blazeBuilder, blazeHtml, directoryTree +, filepath, MonadCatchIOTransformers, mtl, random, text, time +, transformers, unorderedContainers, vector, xmlhtml +}: + +cabal.mkDerivation (self: { + pname = "heist"; + version = "0.8.1.1"; + sha256 = "0ad56izskafpc1dx2nq0a8w71ayppwx8dc7kdaw1by972kh3nflh"; + buildDepends = [ + aeson attoparsec blazeBuilder blazeHtml directoryTree filepath + MonadCatchIOTransformers mtl random text time transformers + unorderedContainers vector xmlhtml + ]; + meta = { + homepage = "http://snapframework.com/"; + description = "An (x)html templating system"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/highlighting-kate/default.nix b/pkgs/development/libraries/haskell/highlighting-kate/default.nix index d92d15d2a16..21497f3252a 100644 --- a/pkgs/development/libraries/haskell/highlighting-kate/default.nix +++ b/pkgs/development/libraries/haskell/highlighting-kate/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "highlighting-kate"; - version = "0.5.1"; - sha256 = "0l0g71rg7cs9rm4i04h88fm20868s0kf2da89297xlrm58zfv0jj"; + version = "0.5.3.2"; + sha256 = "09yvqxvjzahz0y6yhsfgkx5xm39a74arv294w14sgmhay1wnlwvj"; isLibrary = true; isExecutable = true; buildDepends = [ blazeHtml filepath mtl parsec regexPcreBuiltin ]; diff --git a/pkgs/development/libraries/haskell/hledger-lib/default.nix b/pkgs/development/libraries/haskell/hledger-lib/default.nix index fb517c3cef1..af230b2e644 100644 --- a/pkgs/development/libraries/haskell/hledger-lib/default.nix +++ b/pkgs/development/libraries/haskell/hledger-lib/default.nix @@ -4,12 +4,13 @@ cabal.mkDerivation (self: { pname = "hledger-lib"; - version = "0.18.1"; - sha256 = "0dv5q20n5almxxl0n68lv1172x61z2q16nvwydzrc7qp1j31d8my"; + version = "0.18.2"; + sha256 = "0lcs58bdix4m7sslrdi38rqw5x5fb4ip0n5is0phxdrbp0nggd4z"; buildDepends = [ cmdargs csv filepath HUnit mtl parsec regexpr safe shakespeareText split time transformers utf8String ]; + jailbreak = true; meta = { homepage = "http://hledger.org"; description = "Core data types, parsers and utilities for the hledger accounting tool"; diff --git a/pkgs/development/libraries/haskell/hledger-web/default.nix b/pkgs/development/libraries/haskell/hledger-web/default.nix index 2659f1292a7..cc4ccc186c6 100644 --- a/pkgs/development/libraries/haskell/hledger-web/default.nix +++ b/pkgs/development/libraries/haskell/hledger-web/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "hledger-web"; - version = "0.18.1"; - sha256 = "1khjqqjjcwcymyh395rfc39wzybacw5n64wmj2sixyw0p1l4mwg7"; + version = "0.18.2"; + sha256 = "1bhah29why34qaiy7mgzpzjd5dm94izcf3jmgflix56gkgzk86p1"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/hledger/default.nix b/pkgs/development/libraries/haskell/hledger/default.nix index 3f5ce8b43d4..46ae378d738 100644 --- a/pkgs/development/libraries/haskell/hledger/default.nix +++ b/pkgs/development/libraries/haskell/hledger/default.nix @@ -5,14 +5,15 @@ cabal.mkDerivation (self: { pname = "hledger"; - version = "0.18.1"; - sha256 = "0nrs9qawvny6dl0pj3f183sgwmam9dsb2dfhp8hqnxx48g1p01lk"; + version = "0.18.2"; + sha256 = "1i0rix3h5vrq9j01fzgwyhs2n8nfzhidi4rjlvn402ps0w6j15ld"; isLibrary = true; isExecutable = true; buildDepends = [ cabalFileTh cmdargs filepath haskeline hledgerLib HUnit mtl parsec regexpr safe shakespeareText split text time utf8String ]; + jailbreak = true; meta = { homepage = "http://hledger.org"; description = "The main command-line interface for the hledger accounting tool"; diff --git a/pkgs/development/libraries/haskell/hmatrix/default.nix b/pkgs/development/libraries/haskell/hmatrix/default.nix index 398299872d5..2542e200586 100644 --- a/pkgs/development/libraries/haskell/hmatrix/default.nix +++ b/pkgs/development/libraries/haskell/hmatrix/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hmatrix"; - version = "0.14.0.1"; - sha256 = "057ii711qsh5307bp3jqpvlhwp2iacr83whhjm5053b5psinj4z5"; + version = "0.14.1.0"; + sha256 = "10fvbk3k2fgac46a86mc8g0s5gsw1p1bz4k57gn6dzgwh73mxjx7"; buildDepends = [ binary random storableComplex vector ]; extraLibraries = [ blas gsl liblapack ]; meta = { diff --git a/pkgs/development/libraries/haskell/hoauth/default.nix b/pkgs/development/libraries/haskell/hoauth/default.nix new file mode 100644 index 00000000000..c568b292c3c --- /dev/null +++ b/pkgs/development/libraries/haskell/hoauth/default.nix @@ -0,0 +1,19 @@ +{ cabal, binary, cryptoPubkeyTypes, curl, dataenc, entropy, mtl +, random, RSA, SHA, time, utf8String +}: + +cabal.mkDerivation (self: { + pname = "hoauth"; + version = "0.3.5"; + sha256 = "06vk3dv2dby7wadxg4qq2bzy10hl8ix2x4vpxggwd13xy3kpzjqp"; + buildDepends = [ + binary cryptoPubkeyTypes curl dataenc entropy mtl random RSA SHA + time utf8String + ]; + meta = { + description = "A Haskell implementation of OAuth 1.0a protocol."; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/hoogle/default.nix b/pkgs/development/libraries/haskell/hoogle/default.nix index 9db10b33b1d..e13ab47beaa 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.11"; - sha256 = "0m708qlj3q8s9vywg51gj7bwwasz5nxqxqhqh8f0k96iawqd9gid"; + version = "4.2.13"; + sha256 = "0asw9lr22d8jxr58b7w2j5hgllxhw2w8kllh5aq5jjs272hjiy9i"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/hscolour/default.nix b/pkgs/development/libraries/haskell/hscolour/default.nix index 2c2aa5be7e6..d8bc08b4b33 100644 --- a/pkgs/development/libraries/haskell/hscolour/default.nix +++ b/pkgs/development/libraries/haskell/hscolour/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "hscolour"; - version = "1.20.2"; - sha256 = "0jl2m2bpsqg2hnf9mmwwrpa7af8wqwaajfp2h3nnnmy5qks10ad5"; + version = "1.20.3"; + sha256 = "15ix93sw4p7g5ln2halcgqppdc0i0vmkzcjzxvqzkk9yp9pq3nrs"; isLibrary = true; isExecutable = true; meta = { diff --git a/pkgs/development/libraries/haskell/hsdns/default.nix b/pkgs/development/libraries/haskell/hsdns/default.nix index aab6530fcc9..2a83df47f09 100644 --- a/pkgs/development/libraries/haskell/hsdns/default.nix +++ b/pkgs/development/libraries/haskell/hsdns/default.nix @@ -12,6 +12,9 @@ cabal.mkDerivation (self: { description = "Asynchronous DNS Resolver"; license = "LGPL"; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; }; }) diff --git a/pkgs/development/libraries/haskell/hsemail/default.nix b/pkgs/development/libraries/haskell/hsemail/default.nix index 36a320dbe68..f69789772ac 100644 --- a/pkgs/development/libraries/haskell/hsemail/default.nix +++ b/pkgs/development/libraries/haskell/hsemail/default.nix @@ -10,6 +10,9 @@ cabal.mkDerivation (self: { description = "Internet Message Parsers"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; }; }) diff --git a/pkgs/development/libraries/haskell/hslogger-template/default.nix b/pkgs/development/libraries/haskell/hslogger-template/default.nix index 5351bbb1777..a7b1a51b705 100644 --- a/pkgs/development/libraries/haskell/hslogger-template/default.nix +++ b/pkgs/development/libraries/haskell/hslogger-template/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "hslogger-template"; - version = "2.0.0"; - sha256 = "1x8c132ckxjhnhlrnm92h0hkalkrgcc91cn73kv9kvcwy9b2fqcr"; + version = "2.0.1"; + sha256 = "1m8h4i8cxxw83vhbw61njvv86qdcff6zi3bf0nyhc4cq7pfrzqvj"; buildDepends = [ hslogger mtl ]; meta = { description = "Automatic generation of hslogger functions"; diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix index 224e5ff6e96..b1cb2bac6ab 100644 --- a/pkgs/development/libraries/haskell/http-conduit/default.nix +++ b/pkgs/development/libraries/haskell/http-conduit/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "http-conduit"; - version = "1.4.1.10"; - sha256 = "0a2014bzh4vvm3qx5yarxgirzlngzy2xrwpi3bvnz1h3q0hggq01"; + version = "1.6.0.3"; + sha256 = "101h4ba92h8gh74pl9kkgfg94sx3nivv6cc2lfm7i85lrp2fwyjr"; 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 b3ae70bbb36..242f73e9b21 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.6.11"; - sha256 = "1waxhicqwp0nmvmpmfadpq9gdldbcx9wh6jz717ghi6y9l485vhf"; + version = "0.7.3.0.1"; + sha256 = "1s2dh75jpf2yllw503hjw0x2anhc4c71vz5yylri8nxzx1zs18rq"; buildDepends = [ blazeBuilder caseInsensitive text ]; meta = { homepage = "https://github.com/aristidb/http-types"; diff --git a/pkgs/development/libraries/haskell/instant-generics/default.nix b/pkgs/development/libraries/haskell/instant-generics/default.nix index 648dfd7c315..f4dfc4848a6 100644 --- a/pkgs/development/libraries/haskell/instant-generics/default.nix +++ b/pkgs/development/libraries/haskell/instant-generics/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "instant-generics"; - version = "0.3.4"; - sha256 = "0j3sfbw3j0izwmhvwcl8nxxvlrpfla5rngxx2yvl6w5i87wyhswi"; + version = "0.3.5"; + sha256 = "15j41krvabf541vm4vpn2jvlg3nbi6pywcig9zbjjpckzwp5vj9x"; buildDepends = [ syb ]; meta = { homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/InstantGenerics"; diff --git a/pkgs/development/libraries/haskell/io-choice/default.nix b/pkgs/development/libraries/haskell/io-choice/default.nix index 85e49f5a67f..f8b1f1d51a4 100644 --- a/pkgs/development/libraries/haskell/io-choice/default.nix +++ b/pkgs/development/libraries/haskell/io-choice/default.nix @@ -3,8 +3,8 @@ cabal.mkDerivation (self: { pname = "io-choice"; - version = "0.0.1"; - sha256 = "0jwxqs65g88q9l0w4xzllj7svz3qr2zgiaq2fyq5jmh33lz74r63"; + version = "0.0.2"; + sha256 = "0kxn357cc31gvaajg41h6xwpivq049dl1zd551xfvrvzndvy061f"; buildDepends = [ liftedBase monadControl transformers transformersBase ]; diff --git a/pkgs/development/libraries/haskell/irc/default.nix b/pkgs/development/libraries/haskell/irc/default.nix index 613f03c80c1..89d277d1f40 100644 --- a/pkgs/development/libraries/haskell/irc/default.nix +++ b/pkgs/development/libraries/haskell/irc/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "irc"; - version = "0.5.0.0"; - sha256 = "0bid9iqgrppkl7hl1cd2m1pvvk5qva53fqfl0v5ld52j904c50sr"; + version = "0.5.1.0"; + sha256 = "1xkgqcjxlxqg60qlv26ypmvf9x288sjz1n47rb7zfvjhdimws8gj"; buildDepends = [ parsec ]; meta = { description = "A small library for parsing IRC messages"; diff --git a/pkgs/development/libraries/haskell/iteratee/default.nix b/pkgs/development/libraries/haskell/iteratee/default.nix index 14c125121bd..ee9026bae49 100644 --- a/pkgs/development/libraries/haskell/iteratee/default.nix +++ b/pkgs/development/libraries/haskell/iteratee/default.nix @@ -4,10 +4,8 @@ cabal.mkDerivation (self: { pname = "iteratee"; - version = "0.8.9.1"; - sha256 = "1yk7jvabmabf0qjcd00imbg7vx84yjf71h7x3zbv4a51ykfy5hax"; - isLibrary = true; - isExecutable = true; + version = "0.8.9.4"; + sha256 = "0j8q5i3kf1ld7630z65hj55p2jlhl23f6qjag4zwrhrh38bfr531"; buildDepends = [ ListLike MonadCatchIOTransformers monadControl parallel transformers transformersBase diff --git a/pkgs/development/libraries/haskell/lambdabot-utils/default.nix b/pkgs/development/libraries/haskell/lambdabot-utils/default.nix new file mode 100644 index 00000000000..3339e7aa96d --- /dev/null +++ b/pkgs/development/libraries/haskell/lambdabot-utils/default.nix @@ -0,0 +1,20 @@ +{ cabal, binary, haskellSrc, mtl, network, random, regexCompat +, regexPosix, syb, tagsoup, utf8String, zlib +}: + +cabal.mkDerivation (self: { + pname = "lambdabot-utils"; + version = "4.2.1"; + sha256 = "1a5rj8zjvfhziwldikgki92lg9bwv6h9ysp6yqip6lja18h4lilx"; + buildDepends = [ + binary haskellSrc mtl network random regexCompat regexPosix syb + tagsoup utf8String zlib + ]; + meta = { + homepage = "http://haskell.org/haskellwiki/Lambdabot"; + description = "Utility libraries for the advanced IRC bot, Lambdabot"; + license = "GPL"; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/lambdabot/default.nix b/pkgs/development/libraries/haskell/lambdabot/default.nix new file mode 100644 index 00000000000..926c5acafba --- /dev/null +++ b/pkgs/development/libraries/haskell/lambdabot/default.nix @@ -0,0 +1,27 @@ +{ cabal, arrows, binary, brainfuck, dataMemocombinators, filepath +, haskellSrc, haskellSrcExts, HTTP, IOSpec, lambdabotUtils, logict +, MonadRandom, mtl, network, numbers, oeis, parsec, random +, readline, regexCompat, show, syb, tagsoup, unlambda, utf8String +, vectorSpace +}: + +cabal.mkDerivation (self: { + pname = "lambdabot"; + version = "4.2.3.3"; + sha256 = "1fxxmrm390pnqpf7v4kap2asaqh02sphl8r6inq4sdy1zs2rxrvk"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + arrows binary brainfuck dataMemocombinators filepath haskellSrc + haskellSrcExts HTTP IOSpec lambdabotUtils logict MonadRandom mtl + network numbers oeis parsec random readline regexCompat show syb + tagsoup unlambda utf8String vectorSpace + ]; + meta = { + homepage = "http://haskell.org/haskellwiki/Lambdabot"; + description = "Lambdabot is a development tool and advanced IRC bot"; + license = "GPL"; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/language-c-quote/default.nix b/pkgs/development/libraries/haskell/language-c-quote/default.nix index b4986af4a01..7cf0aae9596 100644 --- a/pkgs/development/libraries/haskell/language-c-quote/default.nix +++ b/pkgs/development/libraries/haskell/language-c-quote/default.nix @@ -4,13 +4,14 @@ cabal.mkDerivation (self: { pname = "language-c-quote"; - version = "0.3.1.2"; - sha256 = "0lqr9z2akx90l07k1qbv3y4wwwlcilj08zva4v9scbqydrwpqxip"; + version = "0.3.2"; + sha256 = "1pxrag9ws93rsqrsxcyxg07pvp2qw0f19yj2b40ynwzk112nkd16"; buildDepends = [ exceptionMtl exceptionTransformers filepath haskellSrcMeta mainlandPretty mtl srcloc syb symbol ]; buildTools = [ alex happy ]; + jailbreak = true; meta = { homepage = "http://www.eecs.harvard.edu/~mainland/"; description = "C/CUDA/OpenCL quasiquoting library"; diff --git a/pkgs/development/libraries/haskell/largeword/default.nix b/pkgs/development/libraries/haskell/largeword/default.nix index 0c526652399..67159c2bcbf 100644 --- a/pkgs/development/libraries/haskell/largeword/default.nix +++ b/pkgs/development/libraries/haskell/largeword/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "largeword"; - version = "1.0.1"; - sha256 = "0kkkck220wap3ad2k6461ylhshiqbizv0qh35i2325fhqx892gyr"; + version = "1.0.3"; + sha256 = "18b6nhq1cww4wdbrfq0cb828kncxzcsibgs5dbgxa66y6iw93vkg"; meta = { homepage = "http://trac.haskell.org/largeword/wiki"; description = "Provides Word128, Word192 and Word256 and a way of producing other large words if required"; diff --git a/pkgs/development/libraries/haskell/liblastfm/default.nix b/pkgs/development/libraries/haskell/liblastfm/default.nix new file mode 100644 index 00000000000..c625fc44479 --- /dev/null +++ b/pkgs/development/libraries/haskell/liblastfm/default.nix @@ -0,0 +1,15 @@ +{ cabal, aeson, curl, mtl, pureMD5, urlencoded, utf8String, xml }: + +cabal.mkDerivation (self: { + pname = "liblastfm"; + version = "0.0.3.4"; + sha256 = "1d8fypl9s64jpsr8hygyfqq6jzv1bvd22zq4f93xsffpvv7nqnyk"; + buildDepends = [ + aeson curl mtl pureMD5 urlencoded utf8String xml + ]; + meta = { + description = "Wrapper to Lastfm API"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/lifted-base/default.nix b/pkgs/development/libraries/haskell/lifted-base/default.nix index ba5e580ada0..09264ab57f4 100644 --- a/pkgs/development/libraries/haskell/lifted-base/default.nix +++ b/pkgs/development/libraries/haskell/lifted-base/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "lifted-base"; - version = "0.1.1.1"; - sha256 = "1cfk3n12qhyrrfvw410gfydbgmb7r9y65fsjp2r3c4ilcyd5li70"; + version = "0.1.2"; + sha256 = "0js94dlfy2wjl026jcj2l399ly4zgw0cgxkmil6lsm34gcy9vrvq"; buildDepends = [ baseUnicodeSymbols monadControl transformersBase ]; diff --git a/pkgs/development/libraries/haskell/logict/default.nix b/pkgs/development/libraries/haskell/logict/default.nix new file mode 100644 index 00000000000..a603b4fe644 --- /dev/null +++ b/pkgs/development/libraries/haskell/logict/default.nix @@ -0,0 +1,15 @@ +{ cabal, mtl }: + +cabal.mkDerivation (self: { + pname = "logict"; + version = "0.5.0.2"; + sha256 = "0m0a55l061vbxdqw9h1780g893amdxs7glza4jd5jncjsv823s1z"; + buildDepends = [ mtl ]; + meta = { + homepage = "http://code.haskell.org/~dolio/logict"; + description = "A backtracking logic-programming monad"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/lrucache/default.nix b/pkgs/development/libraries/haskell/lrucache/default.nix new file mode 100644 index 00000000000..d92bd820348 --- /dev/null +++ b/pkgs/development/libraries/haskell/lrucache/default.nix @@ -0,0 +1,13 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "lrucache"; + version = "1.1.1"; + sha256 = "05y0b2dbbp017hkbr0pz943956dm31g5xhma4bqnh49yd4lyn5l9"; + meta = { + homepage = "http://github.com/chowells79/lrucache"; + description = "a simple, pure LRU cache"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/mainland-pretty/default.nix b/pkgs/development/libraries/haskell/mainland-pretty/default.nix index f4b49a6f409..d64a6c76180 100644 --- a/pkgs/development/libraries/haskell/mainland-pretty/default.nix +++ b/pkgs/development/libraries/haskell/mainland-pretty/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "mainland-pretty"; - version = "0.1.2.0"; - sha256 = "0qhv8qfzcm5n1scgmxsv1c2qqnhvp8r0hmax22vzaq7jmlzwhj4p"; + version = "0.1.3.0"; + sha256 = "1grfsn066z11737dxdk1bdhyvz9vjxxn6krfgx9bc8jin6n9h6aq"; buildDepends = [ srcloc symbol ]; meta = { homepage = "http://www.eecs.harvard.edu/~mainland/"; diff --git a/pkgs/development/libraries/haskell/math-functions/default.nix b/pkgs/development/libraries/haskell/math-functions/default.nix index fda06d718ed..127e888d110 100644 --- a/pkgs/development/libraries/haskell/math-functions/default.nix +++ b/pkgs/development/libraries/haskell/math-functions/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "math-functions"; - version = "0.1.1.1"; - sha256 = "1256fyd80z6yf61a5a90b3lad7hj0n59cyn741nkdh8p6hqrsi7z"; + version = "0.1.1.2"; + sha256 = "09q9647zxvvg7wi81r14qhhy64d1mwgy8kg0zkhdvg4rzw9j669v"; buildDepends = [ erf vector ]; meta = { homepage = "https://github.com/bos/math-functions"; diff --git a/pkgs/development/libraries/haskell/maude/default.nix b/pkgs/development/libraries/haskell/maude/default.nix index 709156d290f..84f0d83a924 100644 --- a/pkgs/development/libraries/haskell/maude/default.nix +++ b/pkgs/development/libraries/haskell/maude/default.nix @@ -1,10 +1,10 @@ -{ cabal, parsec, text }: +{ cabal, filepath, processExtras, temporary, text, xml }: cabal.mkDerivation (self: { pname = "maude"; - version = "0.3.0"; - sha256 = "1z9bk4fzkbfiqqx4mv4cdlckchvcli2gcp40d04ravvj7x6yaghg"; - buildDepends = [ parsec text ]; + version = "0.6.1"; + sha256 = "0qadqpj5vzg84mqh29p6vr2ffih7y69ds0jdpxmr17am5bh3mhql"; + buildDepends = [ filepath processExtras temporary text xml ]; meta = { homepage = "https://github.com/davidlazar/maude-hs"; description = "An interface to the Maude rewriting system"; diff --git a/pkgs/development/libraries/haskell/mime-mail/default.nix b/pkgs/development/libraries/haskell/mime-mail/default.nix index 37e76284919..d24bf5719bd 100644 --- a/pkgs/development/libraries/haskell/mime-mail/default.nix +++ b/pkgs/development/libraries/haskell/mime-mail/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "mime-mail"; - version = "0.4.1.1"; - sha256 = "01dshc6ysjkab9hl851948l6k0lwgm1fqmyk97zy7wckb252w6y4"; + version = "0.4.1.2"; + sha256 = "01dw9zvgxmwg0jslw14a9kjrmyjvwla8bw40w2426ifdwwxb3ywy"; buildDepends = [ base64Bytestring blazeBuilder filepath random text ]; diff --git a/pkgs/development/libraries/haskell/mime-types/default.nix b/pkgs/development/libraries/haskell/mime-types/default.nix new file mode 100644 index 00000000000..8359d6dc181 --- /dev/null +++ b/pkgs/development/libraries/haskell/mime-types/default.nix @@ -0,0 +1,15 @@ +{ cabal, text }: + +cabal.mkDerivation (self: { + pname = "mime-types"; + version = "0.1.0.0"; + sha256 = "0xc36pr84nszyych3jd8sl6kj1grsyv8ci8v7ilrbpnw7ngbkw1p"; + buildDepends = [ text ]; + meta = { + homepage = "https://github.com/yesodweb/wai"; + description = "Basic mime-type handling types and functions"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/monad-logger/default.nix b/pkgs/development/libraries/haskell/monad-logger/default.nix new file mode 100644 index 00000000000..740b68edb96 --- /dev/null +++ b/pkgs/development/libraries/haskell/monad-logger/default.nix @@ -0,0 +1,14 @@ +{ cabal, fastLogger, resourcet, text, transformers }: + +cabal.mkDerivation (self: { + pname = "monad-logger"; + version = "0.2.0.1"; + sha256 = "151brb5h92xc0mhfqcapmxib7vh2k36rsw493fxbn3256xkzc8gk"; + buildDepends = [ fastLogger resourcet text transformers ]; + meta = { + homepage = "https://github.com/kazu-yamamoto/logger"; + description = "A class of monads which can log messages"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/multiplate/default.nix b/pkgs/development/libraries/haskell/multiplate/default.nix index ac572b7c59a..14310f50ef6 100644 --- a/pkgs/development/libraries/haskell/multiplate/default.nix +++ b/pkgs/development/libraries/haskell/multiplate/default.nix @@ -2,12 +2,9 @@ cabal.mkDerivation (self: { pname = "multiplate"; - version = "0.0.1.1"; - sha256 = "00rxgkvgx1rfvk15gjyyg00vqyg4j24d8d19q6rj07j2mgfvdxw6"; + version = "0.0.2"; + sha256 = "02pqfkdcv4fn0pmxphg19b3fiazn4hpphfj8xgp77vpy2lczndsw"; buildDepends = [ transformers ]; - patchPhase = '' - sed -i -e 's|transformers >= 0.2 && < 0.3|transformers|' multiplate.cabal - ''; meta = { homepage = "http://haskell.org/haskellwiki/Multiplate"; description = "Lightweight generic library for mutually recursive data types"; diff --git a/pkgs/development/libraries/haskell/multirec/default.nix b/pkgs/development/libraries/haskell/multirec/default.nix index 4f73ffa98ae..a7d7459b455 100644 --- a/pkgs/development/libraries/haskell/multirec/default.nix +++ b/pkgs/development/libraries/haskell/multirec/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "multirec"; - version = "0.7.2"; - sha256 = "1f715h27x8gz73d2irgl1gw74zd5lyda80nzk9xxwihqqkzvbhsm"; + version = "0.7.3"; + sha256 = "0k1wbjsvkl08nwjikflc8yyalk654mf8bvi1rhm28i4na52myi5y"; noHaddock = true; meta = { homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/Multirec"; diff --git a/pkgs/development/libraries/haskell/mwc-random/default.nix b/pkgs/development/libraries/haskell/mwc-random/default.nix index 27dabe57f32..1e2d56147c3 100644 --- a/pkgs/development/libraries/haskell/mwc-random/default.nix +++ b/pkgs/development/libraries/haskell/mwc-random/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "mwc-random"; - version = "0.12.0.0"; - sha256 = "0c1gzf5nkcbfi2zlhh7ly8b4g2gcr0c1b76awk38g9as9qibgivr"; + version = "0.12.0.1"; + sha256 = "1sq4yxi231ka8rzwsihqziibs7amvl27ycr018wymm3yz36vsy7c"; buildDepends = [ primitive time vector ]; meta = { homepage = "https://github.com/bos/mwc-random"; diff --git a/pkgs/development/libraries/haskell/network-conduit/default.nix b/pkgs/development/libraries/haskell/network-conduit/default.nix index 2c1fc014ade..4c989e17698 100644 --- a/pkgs/development/libraries/haskell/network-conduit/default.nix +++ b/pkgs/development/libraries/haskell/network-conduit/default.nix @@ -3,8 +3,8 @@ cabal.mkDerivation (self: { pname = "network-conduit"; - version = "0.4.0.1"; - sha256 = "0xmfhar4knyn01xyigrp4lymb1vcsahd9v12i6rrqzi10mdcz6bl"; + version = "0.5.0.1"; + sha256 = "1rk8a8n1yily20y3jr51zbd00m2c6ic8gxw9rnmkr2cfs963l2v5"; buildDepends = [ conduit liftedBase monadControl network transformers ]; diff --git a/pkgs/development/libraries/haskell/network/2.3.0.14.nix b/pkgs/development/libraries/haskell/network/2.3.1.0.nix similarity index 80% rename from pkgs/development/libraries/haskell/network/2.3.0.14.nix rename to pkgs/development/libraries/haskell/network/2.3.1.0.nix index bbc43abc42b..28fa50d8342 100644 --- a/pkgs/development/libraries/haskell/network/2.3.0.14.nix +++ b/pkgs/development/libraries/haskell/network/2.3.1.0.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "network"; - version = "2.3.0.14"; - sha256 = "0naqg7ai50m3p093mi342w2z0flaagarf9n9smkn1dqvq8jg75x5"; + version = "2.3.1.0"; + sha256 = "1fp25wkl5cc4kx0jv5w02b7pzgqadjg1yrknzzwsqxc5s3cpyz6l"; buildDepends = [ parsec ]; meta = { homepage = "http://github.com/haskell/network"; diff --git a/pkgs/development/libraries/haskell/newtype/default.nix b/pkgs/development/libraries/haskell/newtype/default.nix new file mode 100644 index 00000000000..40354c9472c --- /dev/null +++ b/pkgs/development/libraries/haskell/newtype/default.nix @@ -0,0 +1,12 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "newtype"; + version = "0.2"; + sha256 = "0ng4i5r73256gzwl6bw57h0abqixj783c3ggph1hk2wsplx0655p"; + meta = { + description = "A typeclass and set of functions for working with newtypes"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/numbers/default.nix b/pkgs/development/libraries/haskell/numbers/default.nix new file mode 100644 index 00000000000..8b57b3d7e96 --- /dev/null +++ b/pkgs/development/libraries/haskell/numbers/default.nix @@ -0,0 +1,14 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "numbers"; + version = "3000.0.0.0"; + sha256 = "073xjrnbv6z16va2h3arlxq3z8kywb961dwh4jcm8g7w5m84b2xb"; + meta = { + homepage = "https://github.com/DanBurton/numbers"; + description = "Various number types"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/oeis/default.nix b/pkgs/development/libraries/haskell/oeis/default.nix new file mode 100644 index 00000000000..c8b9e984eb1 --- /dev/null +++ b/pkgs/development/libraries/haskell/oeis/default.nix @@ -0,0 +1,14 @@ +{ cabal, HTTP, network }: + +cabal.mkDerivation (self: { + pname = "oeis"; + version = "0.3.1"; + sha256 = "0kxs25b1z0b807vhrn8v7chsdsw8civqiym8767fy2rk5si0i4w2"; + buildDepends = [ HTTP network ]; + meta = { + description = "Interface to the Online Encyclopedia of Integer Sequences"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/pandoc/default.nix b/pkgs/development/libraries/haskell/pandoc/default.nix index c1aabed388b..85a8338e431 100644 --- a/pkgs/development/libraries/haskell/pandoc/default.nix +++ b/pkgs/development/libraries/haskell/pandoc/default.nix @@ -15,6 +15,7 @@ cabal.mkDerivation (self: { highlightingKate HTTP json mtl network pandocTypes parsec random syb tagsoup temporary texmath time utf8String xml zipArchive zlib ]; + jailbreak = true; meta = { homepage = "http://johnmacfarlane.net/pandoc"; description = "Conversion between markup formats"; diff --git a/pkgs/development/libraries/haskell/persistent-postgresql/default.nix b/pkgs/development/libraries/haskell/persistent-postgresql/default.nix new file mode 100644 index 00000000000..9b545ad1524 --- /dev/null +++ b/pkgs/development/libraries/haskell/persistent-postgresql/default.nix @@ -0,0 +1,20 @@ +{ cabal, aeson, conduit, monadControl, persistent, postgresqlLibpq +, postgresqlSimple, text, time, transformers +}: + +cabal.mkDerivation (self: { + pname = "persistent-postgresql"; + version = "1.0.0"; + sha256 = "149vv6wd0a85gphwrqcyd66ivdzyy7yc37c99ngq7377fdnszzhn"; + buildDepends = [ + aeson conduit monadControl persistent postgresqlLibpq + postgresqlSimple text time transformers + ]; + meta = { + homepage = "http://www.yesodweb.com/book/persistent"; + description = "Backend for the persistent library using postgresql"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/persistent-sqlite/default.nix b/pkgs/development/libraries/haskell/persistent-sqlite/default.nix index 1482eec87e4..5b3ecd5ebc4 100644 --- a/pkgs/development/libraries/haskell/persistent-sqlite/default.nix +++ b/pkgs/development/libraries/haskell/persistent-sqlite/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "persistent-sqlite"; - version = "0.9.0.2"; - sha256 = "19wmz13k3qbpam2siykczgacgaj48yw4p7iz3y6v8a2z8wha73zb"; + version = "1.0.0"; + sha256 = "0ak9x6w9566mjc0ggsqxr69x4w5w7igdxkq6wwm6ysy5cvs8fwc8"; buildDepends = [ aeson conduit monadControl persistent text transformers ]; diff --git a/pkgs/development/libraries/haskell/persistent-template/default.nix b/pkgs/development/libraries/haskell/persistent-template/default.nix index a4bbb10a5dd..f87e6348963 100644 --- a/pkgs/development/libraries/haskell/persistent-template/default.nix +++ b/pkgs/development/libraries/haskell/persistent-template/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "persistent-template"; - version = "0.9.0.2"; - sha256 = "1x3xn5dxv41hbadb0riss046lcr3k0h4rg6cvk60x8zxblrswabw"; + version = "1.0.0.1"; + sha256 = "0dvhxcyzqv4h3n5nnaglgq2pipynax2nrsdsgj3wgyk1a5k8wdrw"; buildDepends = [ aeson monadControl persistent text transformers ]; meta = { homepage = "http://www.yesodweb.com/book/persistent"; diff --git a/pkgs/development/libraries/haskell/persistent/default.nix b/pkgs/development/libraries/haskell/persistent/default.nix index 27b7db94fd2..73bb01d7075 100644 --- a/pkgs/development/libraries/haskell/persistent/default.nix +++ b/pkgs/development/libraries/haskell/persistent/default.nix @@ -1,17 +1,18 @@ { cabal, aeson, attoparsec, base64Bytestring, blazeHtml -, blazeMarkup, conduit, liftedBase, monadControl, pathPieces -, poolConduit, resourcet, sqlite, text, time, transformers -, transformersBase, unorderedContainers, vector +, blazeMarkup, conduit, liftedBase, monadControl, monadLogger +, pathPieces, poolConduit, resourcet, sqlite, text, time +, transformers, transformersBase, unorderedContainers, vector }: cabal.mkDerivation (self: { pname = "persistent"; - version = "0.9.0.4"; - sha256 = "1igml2hmc8ga9871dfq4mxqvy639vvlgl3cs48j3b27ci3qwd9jr"; + version = "1.0.1.1"; + sha256 = "05jzraw8g87vbd5qqrpvivzaz8k50sm9dlabd86a6n1hpcd7xaka"; buildDepends = [ aeson attoparsec base64Bytestring blazeHtml blazeMarkup conduit - liftedBase monadControl pathPieces poolConduit resourcet text time - transformers transformersBase unorderedContainers vector + liftedBase monadControl monadLogger pathPieces poolConduit + resourcet text time transformers transformersBase + unorderedContainers vector ]; extraLibraries = [ sqlite ]; meta = { diff --git a/pkgs/development/libraries/haskell/pool-conduit/default.nix b/pkgs/development/libraries/haskell/pool-conduit/default.nix index 73966514e49..b951b0d435f 100644 --- a/pkgs/development/libraries/haskell/pool-conduit/default.nix +++ b/pkgs/development/libraries/haskell/pool-conduit/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "pool-conduit"; - version = "0.1.0.2"; - sha256 = "1fs2kskvsvck9n011f2pv0s3mxd2hh71p61dxrskz79mfvks5yky"; + version = "0.1.0.3"; + sha256 = "0q95b4770xfd9ancbzbisslqax3pcvg1yf3kkplnvp335ffxbax9"; buildDepends = [ resourcePool resourcet transformers ]; meta = { homepage = "http://www.yesodweb.com/book/persistent"; diff --git a/pkgs/development/libraries/haskell/postgresql-libpq/default.nix b/pkgs/development/libraries/haskell/postgresql-libpq/default.nix new file mode 100644 index 00000000000..040c931d1f6 --- /dev/null +++ b/pkgs/development/libraries/haskell/postgresql-libpq/default.nix @@ -0,0 +1,15 @@ +{ cabal, postgresql }: + +cabal.mkDerivation (self: { + pname = "postgresql-libpq"; + version = "0.8.2.1"; + sha256 = "0fjy451gc9lg3kcglq4s5s3hja8ni3adh4jmxd01kfyvyhwggv4d"; + extraLibraries = [ postgresql ]; + meta = { + homepage = "http://github.com/lpsmith/postgresql-libpq"; + description = "low-level binding to libpq"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/postgresql-simple/default.nix b/pkgs/development/libraries/haskell/postgresql-simple/default.nix new file mode 100644 index 00000000000..3e3a1b7dbfd --- /dev/null +++ b/pkgs/development/libraries/haskell/postgresql-simple/default.nix @@ -0,0 +1,19 @@ +{ cabal, attoparsec, blazeBuilder, blazeTextual, postgresqlLibpq +, text, time, transformers, vector +}: + +cabal.mkDerivation (self: { + pname = "postgresql-simple"; + version = "0.2.4.1"; + sha256 = "09yszkiahfyidaq9yfk4mda5sf1m8bcqqag51vasybln9k9hhws3"; + buildDepends = [ + attoparsec blazeBuilder blazeTextual postgresqlLibpq text time + transformers vector + ]; + meta = { + description = "Mid-Level PostgreSQL client library"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/process-extras/default.nix b/pkgs/development/libraries/haskell/process-extras/default.nix new file mode 100644 index 00000000000..ac2950d4927 --- /dev/null +++ b/pkgs/development/libraries/haskell/process-extras/default.nix @@ -0,0 +1,15 @@ +{ cabal, text }: + +cabal.mkDerivation (self: { + pname = "process-extras"; + version = "0.1.3"; + sha256 = "16hm1w34qnrpb6x8gaqv1bs1cd4p98kayf23275s6vd48kw9v0b0"; + buildDepends = [ text ]; + meta = { + homepage = "https://github.com/davidlazar/process-extras"; + description = "Process extras"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/pureMD5/default.nix b/pkgs/development/libraries/haskell/pureMD5/default.nix index 9501c7ffff1..8e66b2c3c03 100644 --- a/pkgs/development/libraries/haskell/pureMD5/default.nix +++ b/pkgs/development/libraries/haskell/pureMD5/default.nix @@ -2,10 +2,8 @@ cabal.mkDerivation (self: { pname = "pureMD5"; - version = "2.1.0.3"; - sha256 = "0whlsb6zq4zcp3wq0bd6pgcsl0namr8b2s6i4l5aykq8v7fx40ii"; - isLibrary = true; - isExecutable = true; + version = "2.1.2.1"; + sha256 = "1zsn949qk95bwx1fbyv84q0lhb4k18bgixl7nivfzsnmhr31fs37"; buildDepends = [ binary cereal cryptoApi tagged ]; meta = { description = "A Haskell-only implementation of the MD5 digest (hash) algorithm"; diff --git a/pkgs/development/libraries/haskell/reactive-banana-wx/default.nix b/pkgs/development/libraries/haskell/reactive-banana-wx/default.nix index 702e3383d34..2d46992ddab 100644 --- a/pkgs/development/libraries/haskell/reactive-banana-wx/default.nix +++ b/pkgs/development/libraries/haskell/reactive-banana-wx/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "reactive-banana-wx"; - version = "0.6.0.1"; - sha256 = "1i674jy8fwirq267vwwdyqa4whxfx3r689rxjbrh9hyicqwcrl24"; + version = "0.7.0.0"; + sha256 = "06qln09d57l084nvh1js3k6074vl8yzih5kwfpp43gsy8in2dspx"; isLibrary = true; isExecutable = true; buildDepends = [ cabalMacosx reactiveBanana wx wxcore ]; diff --git a/pkgs/development/libraries/haskell/reactive-banana/default.nix b/pkgs/development/libraries/haskell/reactive-banana/default.nix index 1c5cb92d47b..a80e911eefa 100644 --- a/pkgs/development/libraries/haskell/reactive-banana/default.nix +++ b/pkgs/development/libraries/haskell/reactive-banana/default.nix @@ -1,13 +1,13 @@ -{ cabal, fclabels, hashable, QuickCheck, transformers -, unorderedContainers, vault +{ cabal, hashable, QuickCheck, transformers, unorderedContainers +, vault }: cabal.mkDerivation (self: { pname = "reactive-banana"; - version = "0.6.0.0"; - sha256 = "1s0ymkqrjnzylxdwqfslf87g7sjqk135hnvgdkzy4dbvvpplq113"; + version = "0.7.0.1"; + sha256 = "0nd6j2782x7i12xw480qgk42jkya9qi0xdas15ik6cmg4c9z1dyk"; buildDepends = [ - fclabels hashable QuickCheck transformers unorderedContainers vault + hashable QuickCheck transformers unorderedContainers vault ]; meta = { homepage = "http://haskell.org/haskellwiki/Reactive-banana"; diff --git a/pkgs/development/libraries/haskell/resource-pool/default.nix b/pkgs/development/libraries/haskell/resource-pool/default.nix index 7ed81b8d986..77bc9105193 100644 --- a/pkgs/development/libraries/haskell/resource-pool/default.nix +++ b/pkgs/development/libraries/haskell/resource-pool/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "resource-pool"; - version = "0.2.1.0"; - sha256 = "12akfi906l1nm7h3wvjkzl9bxn74dbv17xw2c1mqgl6sg470d587"; + version = "0.2.1.1"; + sha256 = "1ypyzy7mkmpab6rghsizrx6raam3l2acwxm56x7jmcv8s2algi1g"; buildDepends = [ hashable monadControl stm time transformers transformersBase vector ]; diff --git a/pkgs/development/libraries/haskell/resourcet/default.nix b/pkgs/development/libraries/haskell/resourcet/default.nix index 7531008d854..e3190749f1c 100644 --- a/pkgs/development/libraries/haskell/resourcet/default.nix +++ b/pkgs/development/libraries/haskell/resourcet/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "resourcet"; - version = "0.3.3.1"; - sha256 = "164r2p08j3im4wz5jkadl5pvb0qj02k4f2s3v08lm39a51kygjdl"; + version = "0.4.0.1"; + sha256 = "0idyb2xvjk9cbz9gy1gr6sw1mz6v9d8fgk0kw778n6k3h488dw9x"; buildDepends = [ liftedBase monadControl mtl transformers transformersBase ]; diff --git a/pkgs/development/libraries/haskell/semigroupoids/default.nix b/pkgs/development/libraries/haskell/semigroupoids/default.nix new file mode 100644 index 00000000000..4ffc3c2badc --- /dev/null +++ b/pkgs/development/libraries/haskell/semigroupoids/default.nix @@ -0,0 +1,14 @@ +{ cabal, comonad, contravariant, semigroups, transformers }: + +cabal.mkDerivation (self: { + pname = "semigroupoids"; + version = "3.0"; + sha256 = "0wsax14ck363nby0xrhcpvdzf0pzspayl7gsm0br0lr6ipmpcrag"; + buildDepends = [ comonad contravariant semigroups transformers ]; + meta = { + homepage = "http://github.com/ekmett/semigroupoids"; + description = "Haskell 98 semigroupoids: Category sans id"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/semigroups/default.nix b/pkgs/development/libraries/haskell/semigroups/default.nix index 8ca726c7eff..240062493e3 100644 --- a/pkgs/development/libraries/haskell/semigroups/default.nix +++ b/pkgs/development/libraries/haskell/semigroups/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "semigroups"; - version = "0.8.3.2"; - sha256 = "0g433l4rinc6r2yr91jnl6wh5b2kn5vsrp08cmznkgaz45lb7n7c"; + version = "0.8.4.1"; + sha256 = "05wv5amgg3nqr1if936zl330sv1k4i9p8xzdmgxsmchp4lshyr6n"; meta = { homepage = "http://github.com/ekmett/semigroups/"; description = "Haskell 98 semigroups"; diff --git a/pkgs/development/libraries/haskell/shakespeare-css/default.nix b/pkgs/development/libraries/haskell/shakespeare-css/default.nix index 1fd00e5e08a..a64e9acc7d7 100644 --- a/pkgs/development/libraries/haskell/shakespeare-css/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-css/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "shakespeare-css"; - version = "1.0.1.2"; - sha256 = "055nzffn5zlbwilm8624iaqzxchi247rwpca8adbxai1n2ja9fh7"; + version = "1.0.1.4"; + sha256 = "0avixf7z3hcvgcijgrm7hisr8i8waa8nb435gv8lv5vvz8yq3k0n"; buildDepends = [ parsec shakespeare text ]; meta = { homepage = "http://www.yesodweb.com/book/shakespearean-templates"; diff --git a/pkgs/development/libraries/haskell/shakespeare-js/default.nix b/pkgs/development/libraries/haskell/shakespeare-js/default.nix index aa759a240c7..ff2f0c09e0c 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.0.0.3"; - sha256 = "00x5xvjlaivl42q75cvbwbh055kgvk9i8s4y3xcmk4h7lnpfyzd6"; + version = "1.0.0.5"; + sha256 = "1d4na2q1q798ki5f84gpf89ri26qmrxqrwbw7mmlrfwkj1qw69rs"; buildDepends = [ shakespeare text ]; meta = { homepage = "http://www.yesodweb.com/book/shakespearean-templates"; diff --git a/pkgs/development/libraries/haskell/shakespeare-text/default.nix b/pkgs/development/libraries/haskell/shakespeare-text/default.nix index 04f9a100619..fbc31e3eda1 100644 --- a/pkgs/development/libraries/haskell/shakespeare-text/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-text/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "shakespeare-text"; - version = "1.0.0.2"; - sha256 = "1dnw6aipx68cd832vs5rwxv2hr7kfk1y83mzd1xl2b3am1g0izfc"; + version = "1.0.0.4"; + sha256 = "14kas2m7kbv1f49qpx6z097r707l3gqp9lwvh0q42cc6rlwab5l7"; buildDepends = [ 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 c5fd290f08d..3cc2456a7d5 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.0.2"; - sha256 = "04nk9l7c5wk3rbkk57s5as30zvsa7wzrsmhdak59i6v30ww22c9f"; + version = "1.0.1.3"; + sha256 = "1m0ca3b73fiph939kpd94mxh4a606mv3hafbwg9j4is38mv5kn8d"; buildDepends = [ parsec text ]; meta = { homepage = "http://www.yesodweb.com/book/shakespearean-templates"; diff --git a/pkgs/development/libraries/haskell/shelly/default.nix b/pkgs/development/libraries/haskell/shelly/default.nix index 7b63732024e..0c266ab1b29 100644 --- a/pkgs/development/libraries/haskell/shelly/default.nix +++ b/pkgs/development/libraries/haskell/shelly/default.nix @@ -3,8 +3,8 @@ cabal.mkDerivation (self: { pname = "shelly"; - version = "0.12.2"; - sha256 = "0nhycisk6jc3mqd2xqcxxgfqsqm8vp5k4g45gdljalb87rqvqkkv"; + version = "0.14.0.1"; + sha256 = "062c3zqr6ad61p0s423h8rhimqfld6p95z3qzrmag9f29a5f4fbz"; buildDepends = [ mtl systemFileio systemFilepath text time unixCompat ]; diff --git a/pkgs/development/libraries/haskell/show/default.nix b/pkgs/development/libraries/haskell/show/default.nix new file mode 100644 index 00000000000..7fe0013d0d2 --- /dev/null +++ b/pkgs/development/libraries/haskell/show/default.nix @@ -0,0 +1,14 @@ +{ cabal, QuickCheck, random, smallcheck, syb }: + +cabal.mkDerivation (self: { + pname = "show"; + version = "0.4.1.2"; + sha256 = "1qaphxjaxng7d0kcn3vvxbvqljzzs1hvmsrdsm3pbi19qlsavd5w"; + buildDepends = [ QuickCheck random smallcheck syb ]; + meta = { + description = "'Show' instances for Lambdabot"; + license = "GPL"; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/simple-sendfile/default.nix b/pkgs/development/libraries/haskell/simple-sendfile/default.nix index 313f2aa4869..d99762df2b2 100644 --- a/pkgs/development/libraries/haskell/simple-sendfile/default.nix +++ b/pkgs/development/libraries/haskell/simple-sendfile/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "simple-sendfile"; - version = "0.2.4"; - sha256 = "1c7imvkb5aq5mlg6a1r36fp9klniicbj56n32yvzj4qqf1zy2pbx"; + version = "0.2.7"; + sha256 = "0chjcn6j5irzjqid3nhh2ya395aqavcar3ygzd01z96ha1nl4dbw"; buildDepends = [ network ]; meta = { description = "Cross platform library for the sendfile system call"; diff --git a/pkgs/development/libraries/haskell/skein/default.nix b/pkgs/development/libraries/haskell/skein/default.nix index 143bf530d09..d6719c7a451 100644 --- a/pkgs/development/libraries/haskell/skein/default.nix +++ b/pkgs/development/libraries/haskell/skein/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "skein"; - version = "0.1.0.7"; - sha256 = "13yhbp17iq30cjh9fid3l0wkyvpj0f1b1bak9s7gfj96basg9ig2"; + version = "0.1.0.9"; + sha256 = "06hx064cpfcd397rmrmfbm7ph38pnxcsn6wij8fcfsx9wq5yq1k1"; buildDepends = [ cereal cryptoApi tagged ]; meta = { homepage = "https://github.com/meteficha/skein"; diff --git a/pkgs/development/libraries/haskell/snap/loader-dynamic.nix b/pkgs/development/libraries/haskell/snap/loader-dynamic.nix new file mode 100644 index 00000000000..5815496695c --- /dev/null +++ b/pkgs/development/libraries/haskell/snap/loader-dynamic.nix @@ -0,0 +1,14 @@ +{ cabal, directoryTree, hint, mtl, snapCore, time }: + +cabal.mkDerivation (self: { + pname = "snap-loader-dynamic"; + version = "0.9.0"; + sha256 = "1pbpvi20an077klvha1dflnlxpfb6m81n9d50hjhidf6430cmmhm"; + buildDepends = [ directoryTree hint mtl snapCore time ]; + meta = { + homepage = "http://snapframework.com/"; + description = "Snap: A Haskell Web Framework: dynamic loader"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/snap/loader-static.nix b/pkgs/development/libraries/haskell/snap/loader-static.nix new file mode 100644 index 00000000000..a9dcbf10810 --- /dev/null +++ b/pkgs/development/libraries/haskell/snap/loader-static.nix @@ -0,0 +1,13 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "snap-loader-static"; + version = "0.9.0"; + sha256 = "1blchmg0qfng7bw235z1gqkwyi764j78bc29vd5p6xxhmq111ys7"; + meta = { + homepage = "http://snapframework.com/"; + description = "Snap: A Haskell Web Framework: static loader"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/snap/snap.nix b/pkgs/development/libraries/haskell/snap/snap.nix new file mode 100644 index 00000000000..e40aee63bc1 --- /dev/null +++ b/pkgs/development/libraries/haskell/snap/snap.nix @@ -0,0 +1,29 @@ +{ cabal, aeson, attoparsec, cereal, clientsession, configurator +, dataLens, dataLensTemplate, directoryTree, filepath, hashable +, heist, logict, MonadCatchIOTransformers, mtl, mwcRandom +, pwstoreFast, snapCore, snapServer, stm, syb, text, time +, transformers, unorderedContainers, utf8String, vector +, vectorAlgorithms, xmlhtml +}: + +cabal.mkDerivation (self: { + pname = "snap"; + version = "0.9.1.1"; + sha256 = "1g8jvnwrhna5g064dmv4v4khrpwwn0vcqw8l7rcpkp75l46fq29z"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + aeson attoparsec cereal clientsession configurator dataLens + dataLensTemplate directoryTree filepath hashable heist logict + MonadCatchIOTransformers mtl mwcRandom pwstoreFast snapCore + snapServer stm syb text time transformers unorderedContainers + utf8String vector vectorAlgorithms xmlhtml + ]; + jailbreak = true; + meta = { + homepage = "http://snapframework.com/"; + description = "Snap: A Haskell Web Framework: project starter executable and glue code library"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/socks/default.nix b/pkgs/development/libraries/haskell/socks/default.nix index eca78fc90df..d1b4494090c 100644 --- a/pkgs/development/libraries/haskell/socks/default.nix +++ b/pkgs/development/libraries/haskell/socks/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "socks"; - version = "0.4.1"; - sha256 = "0kapic4rf1cwbqy5f229b69kr1mg9blpr5p5jna8sx5ds2b8jdjn"; + version = "0.4.2"; + sha256 = "1nbhx2jjij5kjqa0l68s401ach4yziq6w8mvcv589fcscw212w8r"; buildDepends = [ cereal network ]; meta = { homepage = "http://github.com/vincenthz/hs-socks"; diff --git a/pkgs/development/libraries/haskell/split/default.nix b/pkgs/development/libraries/haskell/split/default.nix index 33f927e3d57..42d33d10a06 100644 --- a/pkgs/development/libraries/haskell/split/default.nix +++ b/pkgs/development/libraries/haskell/split/default.nix @@ -2,10 +2,9 @@ cabal.mkDerivation (self: { pname = "split"; - version = "0.1.4.3"; - sha256 = "1i9vmb0zvmhqj6qcbnsapsk9lhsyzznz336c8s7v4sz20s99hsby"; + version = "0.2.0.0"; + sha256 = "1gk0nx6bw5j9gxaa6ki70wqszbllz7c1ccfnwg49fl3qfabg1i7c"; meta = { - homepage = "http://code.haskell.org/~byorgey/code/split"; description = "Combinator library for splitting lists"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; diff --git a/pkgs/development/libraries/haskell/srcloc/default.nix b/pkgs/development/libraries/haskell/srcloc/default.nix index a29d1bd662c..d76309bc795 100644 --- a/pkgs/development/libraries/haskell/srcloc/default.nix +++ b/pkgs/development/libraries/haskell/srcloc/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "srcloc"; - version = "0.1.1.1"; - sha256 = "131g83sa0kjwy4bz6hcaxplywqd0899sw5r5x0nr0bffkhk91k60"; + version = "0.1.2"; + sha256 = "08awipz6al7jk7d974am5v9fkp87i5dy6d457mx1rv7lczlyhws9"; buildDepends = [ syb symbol ]; meta = { homepage = "http://www.eecs.harvard.edu/~mainland/"; diff --git a/pkgs/development/libraries/haskell/statistics/default.nix b/pkgs/development/libraries/haskell/statistics/default.nix index d977fabb92c..de1fd4533ef 100644 --- a/pkgs/development/libraries/haskell/statistics/default.nix +++ b/pkgs/development/libraries/haskell/statistics/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "statistics"; - version = "0.10.1.0"; - sha256 = "0fnpwnhcwxjcm81b9daqdy07cw5qgqa7m2bj6fxxwicpvawcyabc"; + version = "0.10.2.0"; + sha256 = "1sv0fhbi52maq9c4ni109m0051a1nndi3ncz9v29mkxqzyckrp9x"; buildDepends = [ deepseq erf mathFunctions monadPar mwcRandom primitive vector vectorAlgorithms diff --git a/pkgs/development/libraries/haskell/stm/2.4.nix b/pkgs/development/libraries/haskell/stm/2.4.nix new file mode 100644 index 00000000000..a949474cef1 --- /dev/null +++ b/pkgs/development/libraries/haskell/stm/2.4.nix @@ -0,0 +1,13 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "stm"; + version = "2.4"; + sha256 = "13flyzh2vnqnap78qjawdh3150rmp9bxnlgynsf793lm1b3z15fl"; + meta = { + description = "Software Transactional Memory"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/streamproc/default.nix b/pkgs/development/libraries/haskell/streamproc/default.nix index 36080e9044e..fef81d92212 100644 --- a/pkgs/development/libraries/haskell/streamproc/default.nix +++ b/pkgs/development/libraries/haskell/streamproc/default.nix @@ -9,6 +9,9 @@ cabal.mkDerivation (self: { description = "Stream Processer Arrow"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; }; }) diff --git a/pkgs/development/libraries/haskell/stylish-haskell/default.nix b/pkgs/development/libraries/haskell/stylish-haskell/default.nix new file mode 100644 index 00000000000..eca99a8c440 --- /dev/null +++ b/pkgs/development/libraries/haskell/stylish-haskell/default.nix @@ -0,0 +1,20 @@ +{ cabal, aeson, cmdargs, filepath, haskellSrcExts, mtl, strict, syb +, yaml +}: + +cabal.mkDerivation (self: { + pname = "stylish-haskell"; + version = "0.4.0.0"; + sha256 = "1d5a7a5f1lbyf7if0sb9vhmnbi5ry28wakhsgh75hvgzd999vbhx"; + isLibrary = false; + isExecutable = true; + buildDepends = [ + aeson cmdargs filepath haskellSrcExts mtl strict syb yaml + ]; + meta = { + homepage = "https://github.com/jaspervdj/stylish-haskell"; + description = "Haskell code prettifier"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/syb/0.3.7.nix b/pkgs/development/libraries/haskell/syb/0.3.7.nix new file mode 100644 index 00000000000..44a16e0bf5c --- /dev/null +++ b/pkgs/development/libraries/haskell/syb/0.3.7.nix @@ -0,0 +1,14 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "syb"; + version = "0.3.7"; + sha256 = "0wysa348icabskih3k9xbmwaaw34hg58lpz3w3075942h650bx2r"; + meta = { + homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/SYB"; + description = "Scrap Your Boilerplate"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/syb/syb-with-class.nix b/pkgs/development/libraries/haskell/syb/syb-with-class.nix index 10f9f226f69..c6a85e27df1 100644 --- a/pkgs/development/libraries/haskell/syb/syb-with-class.nix +++ b/pkgs/development/libraries/haskell/syb/syb-with-class.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "syb-with-class"; - version = "0.6.1.3"; - sha256 = "0dmj9ah7az5lckamvm46pff0595p6v4pvzdv0lqq97gjs5i59y9d"; + version = "0.6.1.4"; + sha256 = "0fi6m1a4017422kdmj1vvvzbks79jkcldp20h2nb7jsf8zvimfkc"; meta = { description = "Scrap Your Boilerplate With Class"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/symbol/default.nix b/pkgs/development/libraries/haskell/symbol/default.nix index 42cfd77f1c8..b8dd2aa69a2 100644 --- a/pkgs/development/libraries/haskell/symbol/default.nix +++ b/pkgs/development/libraries/haskell/symbol/default.nix @@ -1,10 +1,10 @@ -{ cabal, syb }: +{ cabal, deepseq, syb }: cabal.mkDerivation (self: { pname = "symbol"; - version = "0.1.1.1"; - sha256 = "1vda97jh9jrvb4l9v9m3xzv8z96jdwf5fji643i6ff3n3h9ysn77"; - buildDepends = [ syb ]; + version = "0.1.3"; + sha256 = "1kz4kzbv6bara31pv4vc75r6wvjln6md8gjlsxx8hf50ab8vb68j"; + buildDepends = [ deepseq syb ]; meta = { homepage = "http://www.eecs.harvard.edu/~mainland/"; description = "A 'Symbol' type for fast symbol comparison"; diff --git a/pkgs/development/libraries/haskell/system-fileio/default.nix b/pkgs/development/libraries/haskell/system-fileio/default.nix index 58284655eb8..7534ce4a1d1 100644 --- a/pkgs/development/libraries/haskell/system-fileio/default.nix +++ b/pkgs/development/libraries/haskell/system-fileio/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "system-fileio"; - version = "0.3.8"; - sha256 = "0zv7ngxc3qgrlfbp0vqirzcwmkmi9ql8pgqhn1ls56iqwbxbb654"; + version = "0.3.9"; + sha256 = "0mfmijwnkp92s58jb51lk0p1p3418f6qskr95phc1zp40yrcw8nx"; buildDepends = [ systemFilepath text time ]; meta = { homepage = "https://john-millikin.com/software/haskell-filesystem/"; diff --git a/pkgs/development/libraries/haskell/system-filepath/default.nix b/pkgs/development/libraries/haskell/system-filepath/default.nix index d4ffbf82d2a..851b28baafe 100644 --- a/pkgs/development/libraries/haskell/system-filepath/default.nix +++ b/pkgs/development/libraries/haskell/system-filepath/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "system-filepath"; - version = "0.4.6"; - sha256 = "0p8lf10b5zn2gw5klpjc397q892cydvnl677srj9rk3lhmsm5jjl"; + version = "0.4.7"; + sha256 = "108bmgz6rynkyabr4pws07smdh31syqvzry9cshrw3zd07c3mn89"; buildDepends = [ deepseq text ]; meta = { homepage = "https://john-millikin.com/software/haskell-filesystem/"; diff --git a/pkgs/development/libraries/haskell/tagsoup/0.10.1nix b/pkgs/development/libraries/haskell/tagsoup/0.10.1nix deleted file mode 100644 index 462ee658fd2..00000000000 --- a/pkgs/development/libraries/haskell/tagsoup/0.10.1nix +++ /dev/null @@ -1,16 +0,0 @@ -{ cabal, mtl, network }: - -cabal.mkDerivation (self: { - pname = "tagsoup"; - version = "0.10.1"; - sha256 = "0bssfj5r790yj33q23i0lbj83xahzd9rf4jhqs21vgrpn9fqsynl"; - isLibrary = true; - isExecutable = true; - buildDepends = [ mtl network ]; - meta = { - homepage = "http://community.haskell.org/~ndm/tagsoup/"; - description = "Parsing and extracting information from (possibly malformed) HTML/XML documents"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - }; -}) diff --git a/pkgs/development/libraries/haskell/tagsoup/default.nix b/pkgs/development/libraries/haskell/tagsoup/default.nix index f6d2dd29dbf..78f52a3ad32 100644 --- a/pkgs/development/libraries/haskell/tagsoup/default.nix +++ b/pkgs/development/libraries/haskell/tagsoup/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "tagsoup"; - version = "0.12.6"; - sha256 = "1q1dzsaj131fcvibka72i7si1i0gxkz5d9zl0akd8mbapy5mmlv5"; + version = "0.12.7"; + sha256 = "0f4f0552n9qkycvh01jyk52190nk4frlp9za8vyczayrm3vmw268"; isLibrary = true; isExecutable = true; buildDepends = [ text ]; diff --git a/pkgs/development/libraries/haskell/terminfo/default.nix b/pkgs/development/libraries/haskell/terminfo/default.nix index ea105935cea..24221912025 100644 --- a/pkgs/development/libraries/haskell/terminfo/default.nix +++ b/pkgs/development/libraries/haskell/terminfo/default.nix @@ -1,10 +1,9 @@ -{ cabal, extensibleExceptions, ncurses }: +{ cabal, ncurses }: cabal.mkDerivation (self: { pname = "terminfo"; - version = "0.3.2.3"; - sha256 = "06y2vx7d4hl55p3p1c7yj2lx8yaw14c5h2qclj8m5xg2wkifnf5f"; - buildDepends = [ extensibleExceptions ]; + version = "0.3.2.5"; + sha256 = "1hadb1gv28c43xq78scalb4zzvbs6im2s0hq7ycrbsdgm6iryhbg"; extraLibraries = [ ncurses ]; meta = { homepage = "http://code.haskell.org/terminfo"; diff --git a/pkgs/development/libraries/haskell/test-framework-quickcheck2/default.nix b/pkgs/development/libraries/haskell/test-framework-quickcheck2/default.nix index 1f1a45d4245..e0615469ab7 100644 --- a/pkgs/development/libraries/haskell/test-framework-quickcheck2/default.nix +++ b/pkgs/development/libraries/haskell/test-framework-quickcheck2/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "test-framework-quickcheck2"; - version = "0.2.12.2"; - sha256 = "08m8y78qy23imcwyqdqla7syxdf91iqrb0j8g6g7gwsg5asjq6ip"; + version = "0.2.12.3"; + sha256 = "17pj6b1cclihy203zpb75rkx2djldc9kcj10wqkf5fjmf9vvi0ks"; buildDepends = [ extensibleExceptions QuickCheck random testFramework ]; diff --git a/pkgs/development/libraries/haskell/test-framework/0.6.nix b/pkgs/development/libraries/haskell/test-framework/0.6.nix deleted file mode 100644 index 94054894568..00000000000 --- a/pkgs/development/libraries/haskell/test-framework/0.6.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ cabal, ansiTerminal, ansiWlPprint, extensibleExceptions, hostname -, random, regexPosix, time, xml -}: - -cabal.mkDerivation (self: { - pname = "test-framework"; - version = "0.6"; - sha256 = "1ah5q3fwd5dmh2zb4rphdpz7hs39m4g1khvxjjwfzwyd9pxiz723"; - isLibrary = true; - isExecutable = true; - buildDepends = [ - ansiTerminal ansiWlPprint extensibleExceptions hostname random - regexPosix time xml - ]; - meta = { - homepage = "http://batterseapower.github.com/test-framework/"; - description = "Framework for running and organising tests, with HUnit and QuickCheck support"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/test-framework/0.5.nix b/pkgs/development/libraries/haskell/test-framework/default.nix similarity index 88% rename from pkgs/development/libraries/haskell/test-framework/0.5.nix rename to pkgs/development/libraries/haskell/test-framework/default.nix index d69bd131774..14fb53a5a09 100644 --- a/pkgs/development/libraries/haskell/test-framework/0.5.nix +++ b/pkgs/development/libraries/haskell/test-framework/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "test-framework"; - version = "0.5"; - sha256 = "19zm9xdhyjhqi2ryd2gkwi7m92s88mmiw1b6b91hjfhfw3c1qlzz"; + version = "0.6.1"; + sha256 = "1rx2c3yckw50vrydswb61ngvp27yxcimm5q6jcyqpn16fpkvxijw"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/texmath/0.4.nix b/pkgs/development/libraries/haskell/texmath/0.4.nix deleted file mode 100644 index 9d9a4f07586..00000000000 --- a/pkgs/development/libraries/haskell/texmath/0.4.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ cabal, parsec, syb, xml }: - -cabal.mkDerivation (self: { - pname = "texmath"; - version = "0.4"; - sha256 = "1rvnhqljxkljy8ncpaj8p7b14nvvm6zmiixv13m1zxlcr457j2ai"; - isLibrary = true; - isExecutable = true; - buildDepends = [ parsec syb xml ]; - meta = { - homepage = "http://github.com/jgm/texmath"; - description = "Conversion of LaTeX math formulas to MathML"; - license = "GPL"; - platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/texmath/default.nix b/pkgs/development/libraries/haskell/texmath/default.nix index 6820b2ed247..65d9da1548f 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.0.6"; - sha256 = "0wxpz9vsgi4lfgjz5w96pn2r2jdflkvb4yd06nxshimxdr51974k"; + version = "0.6.1.1"; + sha256 = "06yk19jvpj7di1njybk1hdc7hp6c9h3yb4gvi7ljna6wqrh6zqaz"; isLibrary = true; isExecutable = true; buildDepends = [ parsec syb xml ]; diff --git a/pkgs/development/libraries/haskell/text/0.11.2.2.nix b/pkgs/development/libraries/haskell/text/0.11.2.3.nix similarity index 80% rename from pkgs/development/libraries/haskell/text/0.11.2.2.nix rename to pkgs/development/libraries/haskell/text/0.11.2.3.nix index a4dc9f88277..e1f0c6ea72d 100644 --- a/pkgs/development/libraries/haskell/text/0.11.2.2.nix +++ b/pkgs/development/libraries/haskell/text/0.11.2.3.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "text"; - version = "0.11.2.2"; - sha256 = "0ch0fiwjwkpiwamfxxbcka2gp6lbwpqcv7pmik6qm850163f4i33"; + version = "0.11.2.3"; + sha256 = "0jrl3qbi91gkcnws9crsa59jsmmbjy91fwvl07qka9m48nq3f9rm"; buildDepends = [ deepseq ]; meta = { homepage = "https://github.com/bos/text"; diff --git a/pkgs/development/libraries/haskell/th-orphans/default.nix b/pkgs/development/libraries/haskell/th-orphans/default.nix new file mode 100644 index 00000000000..da14adfe339 --- /dev/null +++ b/pkgs/development/libraries/haskell/th-orphans/default.nix @@ -0,0 +1,14 @@ +{ cabal, thLift }: + +cabal.mkDerivation (self: { + pname = "th-orphans"; + version = "0.6"; + sha256 = "1ablf4c8vp9kzvr75ngl5yz3ip5klk6zmq7bcqcvks758b9c6qgj"; + buildDepends = [ thLift ]; + noHaddock = true; + meta = { + description = "Orphan instances for TH datatypes"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/threadmanager/default.nix b/pkgs/development/libraries/haskell/threadmanager/default.nix index 776a2422265..dc058844247 100644 --- a/pkgs/development/libraries/haskell/threadmanager/default.nix +++ b/pkgs/development/libraries/haskell/threadmanager/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "threadmanager"; - version = "0.1.4"; - sha256 = "0p35ihdc9k9svzbwiszll5i53km09rvw5mqshph273fby7nvni9i"; + version = "0.1.5"; + sha256 = "0jdr0rrpx7frnh0a2vibg0170w48wvn6gv8imkiqiz6y6481ny5p"; meta = { homepage = "http://github.com/bsl/threadmanager"; description = "Simple thread management"; diff --git a/pkgs/development/libraries/haskell/tls/default.nix b/pkgs/development/libraries/haskell/tls/default.nix index 71067cd75ff..2154aa347d2 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 = "0.9.5"; - sha256 = "1nbfimyxi546n239brhw5lrb7907svvhvy5zgy1f853h17vnli5y"; + version = "0.9.10"; + sha256 = "1kiwb5skirdla32gjicgmjyk09p8f701jgs6krxbi38gmmfj1dxf"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/unbound/default.nix b/pkgs/development/libraries/haskell/unbound/default.nix index 466285d3e55..a90381202e1 100644 --- a/pkgs/development/libraries/haskell/unbound/default.nix +++ b/pkgs/development/libraries/haskell/unbound/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "unbound"; - version = "0.4.1"; - sha256 = "1fryjs5byyqha945qy8vyfpq4fzjmnh0jc01wzvk6ri292qipsyn"; + version = "0.4.1.1"; + sha256 = "0niv8mm4zjkndj0g32dgr32177dfp647hi32hqzwiis77vcfvdzb"; buildDepends = [ mtl RepLib transformers ]; meta = { homepage = "http://code.google.com/p/replib/"; diff --git a/pkgs/development/libraries/haskell/unix-compat/default.nix b/pkgs/development/libraries/haskell/unix-compat/default.nix index 85e6bb81533..df329ba1d90 100644 --- a/pkgs/development/libraries/haskell/unix-compat/default.nix +++ b/pkgs/development/libraries/haskell/unix-compat/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "unix-compat"; - version = "0.3.0.1"; - sha256 = "09y2iih741l4jpi83c15zap94phfms4mavzg04r9rjgbav0ns2c4"; + version = "0.3.0.2"; + sha256 = "0rikix2l8d0n948pzri2rdis9k5q0m73h7vxsxjz1vh24ryjj59f"; meta = { homepage = "http://github.com/jystic/unix-compat"; description = "Portable POSIX-compatibility layer"; diff --git a/pkgs/development/libraries/haskell/unix-time/default.nix b/pkgs/development/libraries/haskell/unix-time/default.nix new file mode 100644 index 00000000000..61d8f86189d --- /dev/null +++ b/pkgs/development/libraries/haskell/unix-time/default.nix @@ -0,0 +1,12 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "unix-time"; + version = "0.1.2"; + sha256 = "146m4b93bla0pbf76bmff6f3aq9zx60cwy58mkqa0a4dyndd3pid"; + meta = { + description = "Unix time parser/formatter and utilities"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/unlambda/default.nix b/pkgs/development/libraries/haskell/unlambda/default.nix new file mode 100644 index 00000000000..c0cfc72bd9e --- /dev/null +++ b/pkgs/development/libraries/haskell/unlambda/default.nix @@ -0,0 +1,16 @@ +{ cabal, mtl }: + +cabal.mkDerivation (self: { + pname = "unlambda"; + version = "0.1"; + sha256 = "0xmn5w5vza6z2i3fs2hv2jgmb1lyk918viknsx3lk36i1dbyivgi"; + isLibrary = true; + isExecutable = true; + buildDepends = [ mtl ]; + meta = { + description = "Unlambda interpreter"; + license = "GPL"; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/unordered-containers/default.nix b/pkgs/development/libraries/haskell/unordered-containers/default.nix index 21ec0c92b06..8ac2372d1c0 100644 --- a/pkgs/development/libraries/haskell/unordered-containers/default.nix +++ b/pkgs/development/libraries/haskell/unordered-containers/default.nix @@ -2,10 +2,11 @@ cabal.mkDerivation (self: { pname = "unordered-containers"; - version = "0.2.1.0"; - sha256 = "0zk2ip32h6faqa1pfmiw242fdarr63lds4j828ix7qhrjifwiw4p"; + version = "0.2.2.1"; + sha256 = "0ny8w7xw0ch3yp0fnskzygz61b72ln5s5ccsdlcqpp29cvfar6zy"; buildDepends = [ deepseq hashable ]; meta = { + homepage = "https://github.com/tibbe/unordered-containers"; description = "Efficient hashing-based container types"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; diff --git a/pkgs/development/libraries/haskell/urlencoded/default.nix b/pkgs/development/libraries/haskell/urlencoded/default.nix new file mode 100644 index 00000000000..45891bb45b1 --- /dev/null +++ b/pkgs/development/libraries/haskell/urlencoded/default.nix @@ -0,0 +1,17 @@ +{ cabal, mtl, network, split }: + +cabal.mkDerivation (self: { + pname = "urlencoded"; + version = "0.3.0.1"; + sha256 = "1i6r05d5libcilngsa6illcazfv6g4rhibzgk8c2jsjq9cg53ihz"; + isLibrary = true; + isExecutable = true; + buildDepends = [ mtl network split ]; + jailbreak = true; + meta = { + homepage = "https://github.com/pheaver/urlencoded"; + description = "Generate or process x-www-urlencoded data"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/uu-parsinglib/default.nix b/pkgs/development/libraries/haskell/uu-parsinglib/default.nix index 8e2ad732aa2..1bb3cb76dac 100644 --- a/pkgs/development/libraries/haskell/uu-parsinglib/default.nix +++ b/pkgs/development/libraries/haskell/uu-parsinglib/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "uu-parsinglib"; - version = "2.7.3.2"; - sha256 = "0z53s9wvk57g3d9x3iswjydwm7nw5vfrj7k08v75fw6rwldkal60"; + version = "2.7.3.4"; + sha256 = "1f582cr17qxwrhxx6pdv503ldm4ccbnbv9pcksibgparfyc25bnv"; buildDepends = [ ListLike time ]; meta = { homepage = "http://www.cs.uu.nl/wiki/bin/view/HUT/ParserCombinators"; diff --git a/pkgs/development/libraries/haskell/vacuum/default.nix b/pkgs/development/libraries/haskell/vacuum/default.nix index 764a55402e7..11f74432be6 100644 --- a/pkgs/development/libraries/haskell/vacuum/default.nix +++ b/pkgs/development/libraries/haskell/vacuum/default.nix @@ -2,13 +2,13 @@ cabal.mkDerivation (self: { pname = "vacuum"; - version = "1.0.0.2"; - sha256 = "1amlzd89952fvw1sbajf9kv3f2s2i6xbqs1zjxw442achg465y7i"; + version = "2.0.0.0"; + sha256 = "0a810ql4lp1pyvys9a5aw28gxn7h2p4hkc0by4pmpw5d7kdhn9y3"; extraLibraries = [ ghcPaths ]; meta = { - homepage = "http://web.archive.org/web/20100410115820/http://moonpatio.com/vacuum/"; - description = "Extract graph representations of ghc heap values"; - license = "LGPL"; + homepage = "http://thoughtpolice.github.com/vacuum"; + description = "Graph representation of the GHC heap"; + license = self.stdenv.lib.licenses.gpl3; platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.andres ]; }; diff --git a/pkgs/development/libraries/haskell/vault/default.nix b/pkgs/development/libraries/haskell/vault/default.nix index 84fd27a3642..4d74884a1a7 100644 --- a/pkgs/development/libraries/haskell/vault/default.nix +++ b/pkgs/development/libraries/haskell/vault/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "vault"; - version = "0.2.0.0"; - sha256 = "1hv87kvi2bwf9ff8mhjzdf8rvqhk1xpschzs1x3swadj1kc9f1sv"; + version = "0.2.0.1"; + sha256 = "027wgbnmdnp98f0wvc9xsfh175n7rq8m2j9i7j1c5vxwgi61dqxq"; buildDepends = [ hashable unorderedContainers ]; meta = { homepage = "https://github.com/HeinrichApfelmus/vault"; diff --git a/pkgs/development/libraries/haskell/vector-algorithms/default.nix b/pkgs/development/libraries/haskell/vector-algorithms/default.nix index f98cc09918a..2704942b360 100644 --- a/pkgs/development/libraries/haskell/vector-algorithms/default.nix +++ b/pkgs/development/libraries/haskell/vector-algorithms/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "vector-algorithms"; - version = "0.5.4"; - sha256 = "0j16jmnmgksbzsq2vvxjmciywi91clak77i6zjjghvn9dpmnsmv2"; + version = "0.5.4.1"; + sha256 = "00dikjmy1pyyn3mmq7sjnmd91xcg7q3n3yiil3dqi1fgr0787xng"; buildDepends = [ primitive vector ]; meta = { homepage = "http://code.haskell.org/~dolio/"; diff --git a/pkgs/development/libraries/haskell/vector-space-points/default.nix b/pkgs/development/libraries/haskell/vector-space-points/default.nix new file mode 100644 index 00000000000..7497ed59c4f --- /dev/null +++ b/pkgs/development/libraries/haskell/vector-space-points/default.nix @@ -0,0 +1,13 @@ +{ cabal, newtype, vectorSpace }: + +cabal.mkDerivation (self: { + pname = "vector-space-points"; + version = "0.1.1.1"; + sha256 = "08lar9ydni87w79y86xk2blddsgx5n6gwz3262w8z32dgy9lrmwx"; + buildDepends = [ newtype vectorSpace ]; + meta = { + description = "A type for points, as distinct from vectors"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/vector-space/default.nix b/pkgs/development/libraries/haskell/vector-space/default.nix index d24dc536da1..2957959f005 100644 --- a/pkgs/development/libraries/haskell/vector-space/default.nix +++ b/pkgs/development/libraries/haskell/vector-space/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "vector-space"; - version = "0.8.1"; - sha256 = "0khbi46i9q585nhxhf842wsdifcj1i1dqm84hj0r36474rfh55z5"; + version = "0.8.2"; + sha256 = "09gndxxscyc9w85fih370gag8yd1xbfg94nxkwdvhzvbkns9k2ad"; buildDepends = [ Boolean MemoTrie NumInstances ]; meta = { homepage = "http://haskell.org/haskellwiki/vector-space"; diff --git a/pkgs/development/libraries/haskell/void/default.nix b/pkgs/development/libraries/haskell/void/default.nix index 8c129568479..581d2f8c9ae 100644 --- a/pkgs/development/libraries/haskell/void/default.nix +++ b/pkgs/development/libraries/haskell/void/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "void"; - version = "0.5.6"; - sha256 = "168xp4jxrlhxdw47y3xyr3hi57xharsrll8521a1phh8vzrbpi4z"; + version = "0.5.7"; + sha256 = "1rkc32122mkyxl0a4spbcqz908wh49l5ab8gfvsy0y02d3lldfd4"; buildDepends = [ semigroups ]; meta = { homepage = "http://github.com/ekmett/void"; diff --git a/pkgs/development/libraries/haskell/wai-app-static/default.nix b/pkgs/development/libraries/haskell/wai-app-static/default.nix index 0653352d87e..f073d36f502 100644 --- a/pkgs/development/libraries/haskell/wai-app-static/default.nix +++ b/pkgs/development/libraries/haskell/wai-app-static/default.nix @@ -1,15 +1,17 @@ -{ cabal, base64Bytestring, blazeBuilder, blazeHtml, cryptohash -, fileEmbed, httpDate, httpTypes, text, time, transformers +{ cabal, base64Bytestring, blazeBuilder, blazeHtml, blazeMarkup +, cereal, cryptoConduit, cryptohash, fileEmbed, httpDate, httpTypes +, mimeTypes, systemFileio, systemFilepath, text, time, transformers , unixCompat, wai }: cabal.mkDerivation (self: { pname = "wai-app-static"; - version = "1.2.0.4"; - sha256 = "06j9k93kzzzqznp61kwclvnnfas77jry4x93r5jn5n22198szcyi"; + version = "1.3.0.1"; + sha256 = "0rgbqbcj4jd6xpjm3nqa5hdf3an7208in536dl6x9n88w9a6qngp"; buildDepends = [ - base64Bytestring blazeBuilder blazeHtml cryptohash fileEmbed - httpDate httpTypes text time transformers unixCompat wai + base64Bytestring blazeBuilder blazeHtml blazeMarkup cereal + cryptoConduit cryptohash fileEmbed httpDate httpTypes mimeTypes + systemFileio systemFilepath text time transformers unixCompat wai ]; meta = { homepage = "http://www.yesodweb.com/book/wai"; diff --git a/pkgs/development/libraries/haskell/wai-extra/default.nix b/pkgs/development/libraries/haskell/wai-extra/default.nix index 3c808dd430b..0debe101b4f 100644 --- a/pkgs/development/libraries/haskell/wai-extra/default.nix +++ b/pkgs/development/libraries/haskell/wai-extra/default.nix @@ -1,17 +1,18 @@ { cabal, ansiTerminal, blazeBuilder, blazeBuilderConduit -, caseInsensitive, conduit, dataDefault, fastLogger, httpTypes -, network, resourcet, stringsearch, text, time, transformers, wai -, zlibConduit +, caseInsensitive, conduit, dataDefault, dateCache, fastLogger +, httpTypes, network, resourcet, stringsearch, text, time +, transformers, void, wai, waiLogger, zlibConduit }: cabal.mkDerivation (self: { pname = "wai-extra"; - version = "1.2.0.5"; - sha256 = "0m9zdn6cdh2j7bwsf17225rdn7jwj7iy97khbd9g7p9rv1lpdain"; + version = "1.3.0.1"; + sha256 = "0mclhaxdgj1vcqa6q22zl5zv4znfis1zyivwypl1pwv0r267siy5"; buildDepends = [ ansiTerminal blazeBuilder blazeBuilderConduit caseInsensitive - conduit dataDefault fastLogger httpTypes network resourcet - stringsearch text time transformers wai zlibConduit + conduit dataDefault dateCache fastLogger httpTypes network + resourcet stringsearch text time transformers void wai waiLogger + zlibConduit ]; meta = { homepage = "http://github.com/yesodweb/wai"; diff --git a/pkgs/development/libraries/haskell/wai-logger/default.nix b/pkgs/development/libraries/haskell/wai-logger/default.nix index d943e2495e6..16f02f87746 100644 --- a/pkgs/development/libraries/haskell/wai-logger/default.nix +++ b/pkgs/development/libraries/haskell/wai-logger/default.nix @@ -1,14 +1,14 @@ -{ cabal, blazeBuilder, byteorder, caseInsensitive, fastLogger -, httpTypes, network, time, wai +{ cabal, blazeBuilder, byteorder, caseInsensitive, dateCache +, fastLogger, httpTypes, network, wai }: cabal.mkDerivation (self: { pname = "wai-logger"; - version = "0.1.4"; - sha256 = "1rvcqq4jlkcjavy8a3vf61jclwpnjmj6cp3whrzwvay9b1qfsck3"; + version = "0.3.0"; + sha256 = "132jcjyqr7bxcfi7v9mapvx8dci0lz8rv91mgnrzgvpac542c2yq"; buildDepends = [ - blazeBuilder byteorder caseInsensitive fastLogger httpTypes network - time wai + blazeBuilder byteorder caseInsensitive dateCache fastLogger + httpTypes network wai ]; meta = { description = "A logging system for WAI"; diff --git a/pkgs/development/libraries/haskell/wai/default.nix b/pkgs/development/libraries/haskell/wai/default.nix index 2e0f723aba0..a67da394a65 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.2.0.3"; - sha256 = "0pl6zc29z58vpvsn37siiyr89mxc4khsnmzv2408i5vhlv2ks01p"; + version = "1.3.0"; + sha256 = "08y0s7b5db5nyvxv0bvraj6ih7054h5n4lkwdlm3nkbm8s9k8hwv"; 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 0a3791a7f8d..30bbbef9a0b 100644 --- a/pkgs/development/libraries/haskell/warp/default.nix +++ b/pkgs/development/libraries/haskell/warp/default.nix @@ -1,16 +1,16 @@ { cabal, blazeBuilder, blazeBuilderConduit, caseInsensitive , conduit, httpTypes, liftedBase, network, networkConduit -, simpleSendfile, transformers, unixCompat, wai +, simpleSendfile, transformers, unixCompat, void, wai }: cabal.mkDerivation (self: { pname = "warp"; - version = "1.2.2"; - sha256 = "0jja9fjjd0f54awbx2p865w1mxj75qxy17skj1sc83i5ck32n6f0"; + version = "1.3.1"; + sha256 = "12f4v080v8jgm02swqbbgq9yvbajmbr8ja2p6ljc7bhf3rkpwplr"; buildDepends = [ blazeBuilder blazeBuilderConduit caseInsensitive conduit httpTypes liftedBase network networkConduit simpleSendfile transformers - unixCompat wai + unixCompat void wai ]; meta = { homepage = "http://github.com/yesodweb/wai"; diff --git a/pkgs/development/libraries/haskell/wl-pprint-text/default.nix b/pkgs/development/libraries/haskell/wl-pprint-text/default.nix index 0db3ef08060..083f269255a 100644 --- a/pkgs/development/libraries/haskell/wl-pprint-text/default.nix +++ b/pkgs/development/libraries/haskell/wl-pprint-text/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "wl-pprint-text"; - version = "1.0.0.0"; - sha256 = "1zvjsbn98g0lja2jj00d7mvqjq4rik7v7wsy5655wibmy0hbll90"; + version = "1.1.0.0"; + sha256 = "18xgsrxg20sk18m9dwds6161vl4hgdp052qbb0cg9jqy50vhddis"; buildDepends = [ text ]; meta = { description = "A Wadler/Leijen Pretty Printer for Text values"; diff --git a/pkgs/development/libraries/haskell/wxHaskell/wxc.nix b/pkgs/development/libraries/haskell/wxHaskell/wxc.nix index 7bfd121a13f..f439b9e1594 100644 --- a/pkgs/development/libraries/haskell/wxHaskell/wxc.nix +++ b/pkgs/development/libraries/haskell/wxHaskell/wxc.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "wxc"; - version = "0.90.0.3"; - sha256 = "14b8g2w4knwxj5vkp759y8m3nmsi4n1zy57ma1kz7lw6jklb7dlq"; + version = "0.90.0.4"; + sha256 = "1bh20i1rb8ng0ni1v98nm8qv5wni19dvxwf5i3ijxhrxqdq4i7p6"; buildDepends = [ wxdirect ]; extraLibraries = [ libX11 mesa wxGTK ]; noHaddock = true; diff --git a/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix b/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix index 9fa98d47f91..98032d91c8e 100644 --- a/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix +++ b/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "wxcore"; - version = "0.90.0.1"; - sha256 = "031947805bjw32f1a8w2ra8714ysq5k0pxp11cr9hgcc93l9f3pq"; + version = "0.90.0.3"; + sha256 = "0d79hr6cz9zj3w57h6630nfnsmfq1w73gz04jjmlhwh8ih557imw"; buildDepends = [ filepath parsec stm time wxc wxdirect ]; extraLibraries = [ libX11 mesa wxGTK ]; meta = { diff --git a/pkgs/development/libraries/haskell/xml-conduit/default.nix b/pkgs/development/libraries/haskell/xml-conduit/default.nix index 9e2d0c59a52..3f2e6e6af4f 100644 --- a/pkgs/development/libraries/haskell/xml-conduit/default.nix +++ b/pkgs/development/libraries/haskell/xml-conduit/default.nix @@ -1,16 +1,17 @@ { cabal, attoparsec, attoparsecConduit, blazeBuilder -, blazeBuilderConduit, conduit, dataDefault, failure, monadControl -, resourcet, systemFilepath, text, transformers, xmlTypes +, blazeBuilderConduit, blazeHtml, blazeMarkup, conduit, dataDefault +, failure, monadControl, resourcet, systemFilepath, text +, transformers, xmlTypes }: cabal.mkDerivation (self: { pname = "xml-conduit"; - version = "0.7.0.3"; - sha256 = "143cd8mjxckknlza327cmn63prw89ypnw32bk762s72vbqm1xvvv"; + version = "1.0.3.1"; + sha256 = "1000gbdwfp98s44kkp793lmqrdm046phwxcvlik20b2485ml8yrj"; buildDepends = [ attoparsec attoparsecConduit blazeBuilder blazeBuilderConduit - conduit dataDefault failure monadControl resourcet systemFilepath - text transformers xmlTypes + blazeHtml blazeMarkup conduit dataDefault failure monadControl + resourcet systemFilepath text transformers xmlTypes ]; meta = { homepage = "http://github.com/snoyberg/xml"; diff --git a/pkgs/development/libraries/haskell/xml-types/default.nix b/pkgs/development/libraries/haskell/xml-types/default.nix index 080096b6f33..48bd32b7c89 100644 --- a/pkgs/development/libraries/haskell/xml-types/default.nix +++ b/pkgs/development/libraries/haskell/xml-types/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "xml-types"; - version = "0.3.2"; - sha256 = "1aihs1n6hxq6frvxdqjqxsfwi2w2c2qx4bjypimjpjxf6d6n1396"; + version = "0.3.3"; + sha256 = "0jvchgzmqsnc0dax73nh7wa7x6n07qnl4wr1d58v21rlbqcklgcn"; buildDepends = [ text ]; meta = { homepage = "https://john-millikin.com/software/haskell-xml/"; diff --git a/pkgs/development/libraries/haskell/xmlhtml/default.nix b/pkgs/development/libraries/haskell/xmlhtml/default.nix new file mode 100644 index 00000000000..654da2e76b5 --- /dev/null +++ b/pkgs/development/libraries/haskell/xmlhtml/default.nix @@ -0,0 +1,17 @@ +{ cabal, blazeBuilder, blazeHtml, blazeMarkup, parsec, text +, unorderedContainers +}: + +cabal.mkDerivation (self: { + pname = "xmlhtml"; + version = "0.2.0.2"; + sha256 = "0dqlqx3cnrqap3ficdkmwm8661j8i7qknb8xhjqvfmnb9pwqdks2"; + buildDepends = [ + blazeBuilder blazeHtml blazeMarkup parsec text unorderedContainers + ]; + meta = { + description = "XML parser and renderer with HTML 5 quirks mode"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/yaml/default.nix b/pkgs/development/libraries/haskell/yaml/default.nix index e3228d039c1..52460c8246b 100644 --- a/pkgs/development/libraries/haskell/yaml/default.nix +++ b/pkgs/development/libraries/haskell/yaml/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "yaml"; - version = "0.7.0.3"; - sha256 = "1w9xsg48np3wi859jdg5vm3dxihbdrbvd1i364lsfblbmry964mr"; + version = "0.8.0.2"; + sha256 = "14blcsylbf9wx4yw8fsk8ddjvg844x97xfc1h7r4ls9l9ar7k95j"; buildDepends = [ aeson attoparsec conduit resourcet text transformers unorderedContainers vector diff --git a/pkgs/development/libraries/haskell/yesod-auth/default.nix b/pkgs/development/libraries/haskell/yesod-auth/default.nix index 3b92570989e..ac5c87d7613 100644 --- a/pkgs/development/libraries/haskell/yesod-auth/default.nix +++ b/pkgs/development/libraries/haskell/yesod-auth/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "yesod-auth"; - version = "1.0.2.1"; - sha256 = "0fkk9vyb8z9hr77d771f74ka6s95fbzk5zw359cx8m2d5rc9fqvr"; + version = "1.1.1.1"; + sha256 = "1ryq3jxcgb55ijjmcv0j234n9nay2ianifb59gz9akyv0sc3zcl9"; buildDepends = [ aeson authenticate blazeHtml blazeMarkup hamlet httpConduit liftedBase mimeMail persistent persistentTemplate pureMD5 diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix index b21ce4b00f0..5a6d6e1c41c 100644 --- a/pkgs/development/libraries/haskell/yesod-core/default.nix +++ b/pkgs/development/libraries/haskell/yesod-core/default.nix @@ -1,21 +1,22 @@ { cabal, aeson, blazeBuilder, blazeHtml, blazeMarkup , caseInsensitive, cereal, clientsession, conduit, cookie, failure -, fastLogger, hamlet, httpTypes, liftedBase, monadControl, parsec -, pathPieces, random, resourcet, shakespeare, shakespeareCss -, shakespeareI18n, shakespeareJs, text, time, transformers -, transformersBase, vector, wai, waiExtra, waiLogger, yesodRoutes +, fastLogger, hamlet, httpTypes, liftedBase, monadControl +, monadLogger, parsec, pathPieces, random, resourcet, shakespeare +, shakespeareCss, shakespeareI18n, shakespeareJs, text, time +, transformers, transformersBase, vector, wai, waiExtra +, yesodRoutes }: cabal.mkDerivation (self: { pname = "yesod-core"; - version = "1.0.1.2"; - sha256 = "1c9ay0xv2s1kcj92ai0bj1gbml4k4w62n2mw7c5r6m88k8wmxh6z"; + version = "1.1.1.2"; + sha256 = "1q0p4hnmd0mg3pqkydqcv61p3hrmnqnrsya005dyvxf320anya0y"; buildDepends = [ aeson blazeBuilder blazeHtml blazeMarkup caseInsensitive cereal clientsession conduit cookie failure fastLogger hamlet httpTypes - liftedBase monadControl parsec pathPieces random resourcet - shakespeare shakespeareCss shakespeareI18n shakespeareJs text time - transformers transformersBase vector wai waiExtra waiLogger + liftedBase monadControl monadLogger parsec pathPieces random + resourcet shakespeare shakespeareCss shakespeareI18n shakespeareJs + text time transformers transformersBase vector wai waiExtra yesodRoutes ]; meta = { diff --git a/pkgs/development/libraries/haskell/yesod-default/default.nix b/pkgs/development/libraries/haskell/yesod-default/default.nix index d801d36e9c4..c3dce8ca7d3 100644 --- a/pkgs/development/libraries/haskell/yesod-default/default.nix +++ b/pkgs/development/libraries/haskell/yesod-default/default.nix @@ -1,15 +1,15 @@ -{ cabal, networkConduit, shakespeareCss, shakespeareJs, text -, transformers, unorderedContainers, wai, waiExtra, warp, yaml -, yesodCore +{ cabal, dataDefault, hamlet, networkConduit, shakespeareCss +, shakespeareJs, text, transformers, unorderedContainers, wai +, waiExtra, warp, yaml, yesodCore }: cabal.mkDerivation (self: { pname = "yesod-default"; - version = "1.0.1.1"; - sha256 = "0jv7fxrgh2x93saz0vrba0mzafq3wmq85b3idcsny4d8mgj6ngv0"; + version = "1.1.0"; + sha256 = "124407a0in474l71jja04ds0xh84ac5i3jv62iswxlcp1y9f52bq"; buildDepends = [ - networkConduit shakespeareCss shakespeareJs text transformers - unorderedContainers wai waiExtra warp yaml yesodCore + dataDefault hamlet networkConduit shakespeareCss shakespeareJs text + transformers unorderedContainers wai waiExtra warp yaml yesodCore ]; meta = { homepage = "http://www.yesodweb.com/"; diff --git a/pkgs/development/libraries/haskell/yesod-form/default.nix b/pkgs/development/libraries/haskell/yesod-form/default.nix index 512c0ca1b6d..8f3cf37149f 100644 --- a/pkgs/development/libraries/haskell/yesod-form/default.nix +++ b/pkgs/development/libraries/haskell/yesod-form/default.nix @@ -1,18 +1,20 @@ -{ cabal, blazeBuilder, blazeHtml, blazeMarkup, dataDefault -, emailValidate, hamlet, network, persistent, shakespeareCss -, shakespeareJs, text, time, transformers, wai, xssSanitize -, yesodCore, yesodPersistent +{ cabal, attoparsec, blazeBuilder, blazeHtml, blazeMarkup +, cryptoApi, dataDefault, emailValidate, hamlet, network +, persistent, shakespeareCss, shakespeareJs, text, time +, transformers, wai, xssSanitize, yesodCore, yesodPersistent }: cabal.mkDerivation (self: { pname = "yesod-form"; - version = "1.0.0.4"; - sha256 = "1wc7nrsf7r9zs24q2amy1zij5sfycs1arnrf8g769c7gihjhdqfd"; + version = "1.1.1.1"; + sha256 = "0239sbnpl022g53iwbg9pnphiyadxysdwrqz3f8spf6x3w2gs6vg"; buildDepends = [ - blazeBuilder blazeHtml blazeMarkup dataDefault emailValidate hamlet - network persistent shakespeareCss shakespeareJs text time - transformers wai xssSanitize yesodCore yesodPersistent + attoparsec blazeBuilder blazeHtml blazeMarkup cryptoApi dataDefault + emailValidate hamlet network persistent shakespeareCss + shakespeareJs text time transformers wai xssSanitize yesodCore + yesodPersistent ]; + noHaddock = true; meta = { homepage = "http://www.yesodweb.com/"; description = "Form handling support for Yesod Web Framework"; diff --git a/pkgs/development/libraries/haskell/yesod-json/default.nix b/pkgs/development/libraries/haskell/yesod-json/default.nix index 7ff0abedc1a..4a2a2346a87 100644 --- a/pkgs/development/libraries/haskell/yesod-json/default.nix +++ b/pkgs/development/libraries/haskell/yesod-json/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "yesod-json"; - version = "1.0.0.1"; - sha256 = "0dh294y067xa1y9lxamspbq21npv66ilsiayynsiykzik86k6vph"; + version = "1.1.0"; + sha256 = "13dbajs51nyrvch13xz05h6jrnhc097s0iykw5z43x05a6xwj20n"; buildDepends = [ aeson attoparsecConduit blazeBuilder conduit safe shakespeareJs text transformers vector wai waiExtra yesodCore yesodRoutes diff --git a/pkgs/development/libraries/haskell/yesod-persistent/default.nix b/pkgs/development/libraries/haskell/yesod-persistent/default.nix index c6cf7f22159..a094f472233 100644 --- a/pkgs/development/libraries/haskell/yesod-persistent/default.nix +++ b/pkgs/development/libraries/haskell/yesod-persistent/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "yesod-persistent"; - version = "1.0.0.1"; - sha256 = "1v4ip4g9x2a5byl0a9a1raad3aba7hs618vx7fnc5n2ajjji84mx"; + version = "1.1.0"; + sha256 = "0c8cvc2gy9ixa0h79ycnyi86indny2i86g5xcg30a2rvc4mjbaaj"; buildDepends = [ persistent persistentTemplate transformers yesodCore ]; diff --git a/pkgs/development/libraries/haskell/yesod-routes/default.nix b/pkgs/development/libraries/haskell/yesod-routes/default.nix index 8b3a685105a..9a801d62df8 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.0.1.2"; - sha256 = "15ar99ywxrsd6pgqwmql7vg801n53l3jw0s2iynddq9jjl4yqpf7"; + version = "1.1.0"; + sha256 = "0r0a3s1dngqp2vcq0cdsbqf1lsyhygj2x4a93csr2iyn244zgxnx"; 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 72a1fed8db9..ddd0f24d9af 100644 --- a/pkgs/development/libraries/haskell/yesod-static/default.nix +++ b/pkgs/development/libraries/haskell/yesod-static/default.nix @@ -1,15 +1,16 @@ { cabal, base64Bytestring, cereal, conduit, cryptoConduit -, cryptohash, fileEmbed, httpTypes, text, transformers, unixCompat -, wai, waiAppStatic, yesodCore +, cryptohash, fileEmbed, httpTypes, systemFilepath, text +, transformers, unixCompat, wai, waiAppStatic, yesodCore }: cabal.mkDerivation (self: { pname = "yesod-static"; - version = "1.0.0.3"; - sha256 = "1nl7cf8yw5akldlrkamnkbypwnj7g1pjkx7nkmlc38jbx58izf5d"; + version = "1.1.0.1"; + sha256 = "1hlg32bhmhc5npd0bm317mssrddf7jzhwr0z3ns0dpiynz9mh0vy"; buildDepends = [ base64Bytestring cereal conduit cryptoConduit cryptohash fileEmbed - httpTypes text transformers unixCompat wai waiAppStatic yesodCore + httpTypes systemFilepath text transformers unixCompat wai + waiAppStatic yesodCore ]; meta = { homepage = "http://www.yesodweb.com/"; diff --git a/pkgs/development/libraries/haskell/yesod/default.nix b/pkgs/development/libraries/haskell/yesod/default.nix index 256c398cfe4..46ebf6c8b85 100644 --- a/pkgs/development/libraries/haskell/yesod/default.nix +++ b/pkgs/development/libraries/haskell/yesod/default.nix @@ -1,22 +1,23 @@ { cabal, attoparsec, blazeBuilder, blazeHtml, blazeMarkup, Cabal -, fastLogger, filepath, hamlet, httpTypes, monadControl, parsec -, shakespeareCss, shakespeareJs, shakespeareText, text, time -, transformers, unixCompat, wai, waiExtra, waiLogger, warp -, yesodAuth, yesodCore, yesodForm, yesodJson, yesodPersistent +, filepath, hamlet, httpTypes, monadControl, parsec, shakespeareCss +, shakespeareJs, shakespeareText, systemFileio, systemFilepath, tar +, text, time, transformers, unixCompat, unorderedContainers, wai +, waiExtra, warp, yaml, yesodAuth, yesodCore, yesodForm, yesodJson +, yesodPersistent, zlib }: cabal.mkDerivation (self: { pname = "yesod"; - version = "1.0.1.6"; - sha256 = "0w5k5bcv50fjpyja6ydknk78dk50swx6b0myhizj8rcf851xga43"; + version = "1.1.0.3"; + sha256 = "07rj7dyicnklp6hs1m0kjj6xz983d1zryv2f3sqhf620bc2d70fx"; isLibrary = true; isExecutable = true; buildDepends = [ - attoparsec blazeBuilder blazeHtml blazeMarkup Cabal fastLogger - filepath hamlet httpTypes monadControl parsec shakespeareCss - shakespeareJs shakespeareText text time transformers unixCompat wai - waiExtra waiLogger warp yesodAuth yesodCore yesodForm yesodJson - yesodPersistent + attoparsec blazeBuilder blazeHtml blazeMarkup Cabal filepath hamlet + httpTypes monadControl parsec shakespeareCss shakespeareJs + shakespeareText systemFileio systemFilepath tar text time + transformers unixCompat unorderedContainers wai waiExtra warp yaml + yesodAuth yesodCore yesodForm yesodJson yesodPersistent zlib ]; meta = { homepage = "http://www.yesodweb.com/"; diff --git a/pkgs/development/libraries/haskell/zipper/default.nix b/pkgs/development/libraries/haskell/zipper/default.nix index bf27fa78162..5ff1da422ef 100644 --- a/pkgs/development/libraries/haskell/zipper/default.nix +++ b/pkgs/development/libraries/haskell/zipper/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "zipper"; - version = "0.4.1"; - sha256 = "19xgvqznf200akzf19mp40fg75c0gzpp38wq3n671nm90r08lgvi"; + version = "0.4.2"; + sha256 = "1r8092amq5w9gl5szycl1r7wx87xnmkcapdzcwfa4c3pvxrhjy44"; buildDepends = [ multirec ]; meta = { homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/Multirec"; diff --git a/pkgs/development/libraries/haskell/zlib-bindings/default.nix b/pkgs/development/libraries/haskell/zlib-bindings/default.nix index d5557eae390..c78ca3f68ee 100644 --- a/pkgs/development/libraries/haskell/zlib-bindings/default.nix +++ b/pkgs/development/libraries/haskell/zlib-bindings/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "zlib-bindings"; - version = "0.1.0.1"; - sha256 = "0r1hjmmxb9kz5fvfrjvzjd0pnhb87vyldqvb73yjq35s16bj4vlc"; + version = "0.1.1.1"; + sha256 = "1r502gskbm36smd5nj0f53ildv9rkm3k79zmwdmrskg6z1n7jmfh"; buildDepends = [ zlib ]; meta = { homepage = "http://github.com/snoyberg/zlib-bindings"; diff --git a/pkgs/development/libraries/haskell/zlib-conduit/default.nix b/pkgs/development/libraries/haskell/zlib-conduit/default.nix index e8b63564322..728d2d202f1 100644 --- a/pkgs/development/libraries/haskell/zlib-conduit/default.nix +++ b/pkgs/development/libraries/haskell/zlib-conduit/default.nix @@ -1,10 +1,10 @@ -{ cabal, conduit, transformers, zlibBindings }: +{ cabal, conduit, transformers, void, zlibBindings }: cabal.mkDerivation (self: { pname = "zlib-conduit"; - version = "0.4.0.2"; - sha256 = "1pwgyawc308rm1xcvzfz96ar11mngx79any7lragffj6f132qlm7"; - buildDepends = [ conduit transformers zlibBindings ]; + version = "0.5.0.1"; + sha256 = "138wag9fjq3hx48nzr0nvvclcyjwcd0ykjbbgms2h9msmz9vflk5"; + buildDepends = [ conduit transformers void zlibBindings ]; meta = { homepage = "http://github.com/snoyberg/conduit"; description = "Streaming compression/decompression via conduits"; diff --git a/pkgs/development/libraries/haskell/zlib/0.5.3.3.nix b/pkgs/development/libraries/haskell/zlib/0.5.3.3.nix index a151a45c0e7..bba9e1a13fe 100644 --- a/pkgs/development/libraries/haskell/zlib/0.5.3.3.nix +++ b/pkgs/development/libraries/haskell/zlib/0.5.3.3.nix @@ -5,6 +5,7 @@ cabal.mkDerivation (self: { version = "0.5.3.3"; sha256 = "1hrq34w9y8m7nahvrdpnkh9rdb4jycpcpv9ix6qrxijvbz2vdbg2"; extraLibraries = [ zlib ]; + jailbreak = true; meta = { description = "Compression and decompression in the gzip and zlib formats"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/hunspell/default.nix b/pkgs/development/libraries/hunspell/default.nix index 9f3650c2155..c5243bc6393 100644 --- a/pkgs/development/libraries/hunspell/default.nix +++ b/pkgs/development/libraries/hunspell/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ncurses, readline }: stdenv.mkDerivation rec { - name = "hunspell-1.2.12"; + name = "hunspell-1.3.2"; src = fetchurl { url = "mirror://sf/hunspell/${name}.tar.gz"; - sha256 = "0s8fh8zanhks6bgkb7dzwscy97fb6wl4ymvjqz7188fz29qjlnaz"; + sha256 = "1gfxdajnqk2civkshkfjx5ldg7kjdgj76m5khpsbjk4lxsjd9vdl"; }; propagatedBuildInputs = [ ncurses readline ]; diff --git a/pkgs/development/libraries/hwloc/default.nix b/pkgs/development/libraries/hwloc/default.nix index aa59a891714..4f2bd4f679a 100644 --- a/pkgs/development/libraries/hwloc/default.nix +++ b/pkgs/development/libraries/hwloc/default.nix @@ -17,7 +17,11 @@ stdenv.mkDerivation rec { buildInputs = stdenv.lib.filter (x: x != null) ([ expat ncurses ] ++ (stdenv.lib.optionals (!stdenv.isCygwin) [ cairo libX11 ]) - ++ (stdenv.lib.optionals stdenv.isLinux [ pciutils numactl ])); + ++ (stdenv.lib.optionals stdenv.isLinux [ numactl ])); + + propagatedBuildInputs = + # Since `libpci' appears in `hwloc.pc', it must be propagated. + stdenv.lib.optional stdenv.isLinux pciutils; postInstall = stdenv.lib.optionalString (stdenv.isLinux && numactl != null) diff --git a/pkgs/development/libraries/java/rhino/default.nix b/pkgs/development/libraries/java/rhino/default.nix index 800ae7ba718..3e666c9fa23 100644 --- a/pkgs/development/libraries/java/rhino/default.nix +++ b/pkgs/development/libraries/java/rhino/default.nix @@ -5,7 +5,7 @@ let options = "-Dbuild.compiler=gcj"; # FIXME: We assume GCJ here. xbeans = fetchurl { - url = "http://www.apache.org/dist/xmlbeans/binaries/xmlbeans-2.2.0.zip"; + url = "http://archive.apache.org/dist/xmlbeans/binaries/xmlbeans-2.2.0.zip"; sha256 = "1pb08d9j81d0wz5wj31idz198iwhqb7mch872n08jh1354rjlqwk"; }; in diff --git a/pkgs/development/libraries/kdevplatform/default.nix b/pkgs/development/libraries/kdevplatform/default.nix index 10aa4c02028..367987d5dee 100644 --- a/pkgs/development/libraries/kdevplatform/default.nix +++ b/pkgs/development/libraries/kdevplatform/default.nix @@ -2,11 +2,11 @@ gettext, pkgconfig, apr, aprutil, boost, qjson }: stdenv.mkDerivation rec { - name = "kdevplatform-1.3.0"; + name = "kdevplatform-1.3.1"; src = fetchurl { - url = "mirror://kde/stable/kdevelop/4.3.0/src/${name}.tar.bz2"; - sha256 = "0afka8999csyj8hbgmcsbn8h2by04v7n8k4mrwkl0b79crdvwbcd"; + url = "mirror://kde/stable/kdevelop/4.3.1/src/${name}.tar.bz2"; + sha256 = "1fiqwabw5ilhw1jwvvr743dym12y3kxrs3zlqahz57yncdsglcl6"; }; propagatedBuildInputs = [ kdelibs qt4 phonon ]; diff --git a/pkgs/development/libraries/libcdr/default.nix b/pkgs/development/libraries/libcdr/default.nix new file mode 100644 index 00000000000..823a4839e80 --- /dev/null +++ b/pkgs/development/libraries/libcdr/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, libwpg, libwpd, lcms2, pkgconfig }: + +stdenv.mkDerivation rec { + name = "libcdr-0.0.8"; + + src = fetchurl { + url = "http://dev-www.libreoffice.org/src/${name}.tar.xz"; + sha256 = "117a8gp29xs3kin6kaisb3frsx8dwrsjgs4wq4y5hjqprzy6lwz0"; + }; + + buildInputs = [ libwpg libwpd lcms2 ]; + + buildNativeInputs = [ pkgconfig ]; + + CXXFLAGS="--std=gnu++0x"; # For c++11 constants in lcms2.h + + meta = { + description = "A library providing ability to interpret and import Corel Draw drawings into various applications"; + homepage = http://www.freedesktop.org/wiki/Software/libcdr; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/development/libraries/libdivsufsort/default.nix b/pkgs/development/libraries/libdivsufsort/default.nix new file mode 100644 index 00000000000..21ee2351c58 --- /dev/null +++ b/pkgs/development/libraries/libdivsufsort/default.nix @@ -0,0 +1,16 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation { + name = "libdivsufsort-2.0.1"; + + src = fetchurl { + url = http://libdivsufsort.googlecode.com/files/libdivsufsort-2.0.1.tar.bz2; + sha256 = "1g0q40vb2k689bpasa914yi8sjsmih04017mw20zaqqpxa32rh2m"; + }; + + meta = { + homepage = http://code.google.com/p/libdivsufsort/; + license = "MIT"; + description = "Library to construct the suffix array and the BW transformed string"; + }; +} diff --git a/pkgs/development/libraries/libexif/default.nix b/pkgs/development/libraries/libexif/default.nix index a9b60feff2f..48c66cb6070 100644 --- a/pkgs/development/libraries/libexif/default.nix +++ b/pkgs/development/libraries/libexif/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, gettext }: stdenv.mkDerivation rec { - name = "libexif-0.6.20"; + name = "libexif-0.6.21"; src = fetchurl { url = "mirror://sourceforge/libexif/${name}.tar.bz2"; - sha256 = "05fphfmgrni6838v0lkcqv88fbw7r1mdw3ypy3bh567vv05x4wm7"; + sha256 = "06nlsibr3ylfwp28w8f5466l6drgrnydgxrm4jmxzrmk5svaxk8n"; }; buildInputs = [ gettext ]; diff --git a/pkgs/development/libraries/libextractor/default.nix b/pkgs/development/libraries/libextractor/default.nix index b532f3283d4..a6b670eedb6 100644 --- a/pkgs/development/libraries/libextractor/default.nix +++ b/pkgs/development/libraries/libextractor/default.nix @@ -1,5 +1,10 @@ -{ fetchurl, stdenv, libtool, gettext, zlib, bzip2, flac, libvorbis, libmpeg2 -, ffmpeg, exiv2, libgsf, rpm, pkgconfig, glib, gtk }: +{ fetchurl, stdenv, libtool, gettext, zlib, bzip2, flac, libvorbis +, exiv2, libgsf, rpm, pkgconfig +, gtkSupport ? true, glib ? null, gtk ? null +, videoSupport ? true, ffmpeg ? null, libmpeg2 ? null}: + +assert gtkSupport -> glib != null && gtk != null; +assert videoSupport -> ffmpeg != null && libmpeg2 != null; stdenv.mkDerivation rec { name = "libextractor-0.6.2"; @@ -16,10 +21,11 @@ stdenv.mkDerivation rec { ''; buildInputs = - [ libtool gettext zlib bzip2 flac libvorbis libmpeg2 exiv2 ffmpeg + [ libtool gettext zlib bzip2 flac libvorbis exiv2 libgsf rpm - pkgconfig glib gtk - ]; + pkgconfig + ] ++ stdenv.lib.optionals gtkSupport [ glib gtk ] + ++ stdenv.lib.optionals videoSupport [ ffmpeg libmpeg2 ]; configureFlags = "--disable-ltdl-install " + "--with-ltdl-include=${libtool}/include " diff --git a/pkgs/development/libraries/libexttextcat/default.nix b/pkgs/development/libraries/libexttextcat/default.nix new file mode 100644 index 00000000000..a75fada7484 --- /dev/null +++ b/pkgs/development/libraries/libexttextcat/default.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "libexttextcat-3.3.1"; + + src = fetchurl { + url = "http://dev-www.libreoffice.org/src/libexttextcat/${name}.tar.xz"; + sha256 = "1a7ablpipfbiyhl6wsraj5z8pj3qkqgnrms73wzsqhpbyww334h4"; + }; + + patches = [ ./memory-leaks.patch ]; + + meta = { + description = "An N-Gram-Based Text Categorization library primarily intended for language guessing"; + homepage = http://www.freedesktop.org/wiki/Software/libexttextcat; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/development/libraries/libexttextcat/memory-leaks.patch b/pkgs/development/libraries/libexttextcat/memory-leaks.patch new file mode 100644 index 00000000000..0be4ffdc93a --- /dev/null +++ b/pkgs/development/libraries/libexttextcat/memory-leaks.patch @@ -0,0 +1,37 @@ +Combined upstream commits 980592386f23db8b0dc84c434805cb167d0cc091 and +5ef4ad86ec934282cba891922ec2d13784da3354. +diff -u b/src/textcat.c b/src/textcat.c +--- b/src/textcat.c ++++ b/src/textcat.c +@@ -212,8 +212,6 @@ + sizeof(char) * (tmp_size + 1)); + if (tmp == NULL) + { +- free(finger_print_file_name); +- finger_print_file_name_size = 0; + goto BAILOUT; + } + else +@@ -226,10 +224,7 @@ + strcat(finger_print_file_name, segment[0]); + + if (fp_Read(h->fprint[h->size], finger_print_file_name, 400) == 0) +- { +- textcat_Done(h); + goto BAILOUT; +- } + h->fprint_disable[h->size] = 0xF0; /* 0xF0 is the code for enabled + languages, 0x0F is for disabled + */ +@@ -242,9 +237,10 @@ + return h; + + BAILOUT: ++ free(finger_print_file_name); + fclose(fp); ++ textcat_Done(h); + return NULL; +- + } + + extern candidate_t *textcat_GetClassifyFullOutput(void *handle) diff --git a/pkgs/development/libraries/libgpg-error/default.nix b/pkgs/development/libraries/libgpg-error/default.nix index 255057b5134..f7052b90b42 100644 --- a/pkgs/development/libraries/libgpg-error/default.nix +++ b/pkgs/development/libraries/libgpg-error/default.nix @@ -1,6 +1,6 @@ -{stdenv, fetchurl}: +{ stdenv, fetchurl, bash }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (rec { name = "libgpg-error-1.10"; src = fetchurl { @@ -26,3 +26,16 @@ stdenv.mkDerivation rec { platforms = stdenv.lib.platforms.all; }; } + +// + +(stdenv.lib.optionalAttrs stdenv.isSunOS { + # For some reason, /bin/sh on OpenIndiana leads to this at the end of the + # `config.status' run: + # ./config.status[1401]: shift: (null): bad number + # (See .) + # Thus, re-run it with Bash. + postConfigure = + '' ${bash}/bin/sh config.status + ''; +})) diff --git a/pkgs/development/libraries/libgsf/default.nix b/pkgs/development/libraries/libgsf/default.nix index 9d36bc3d5f2..3941fd4d694 100644 --- a/pkgs/development/libraries/libgsf/default.nix +++ b/pkgs/development/libraries/libgsf/default.nix @@ -1,7 +1,10 @@ { fetchurl, stdenv, perl, perlXMLParser, pkgconfig, libxml2 -, glib, gettext, intltool, bzip2, gdk_pixbuf -, gnome_vfs, libbonobo, python }: +, gettext, intltool, bzip2, glib, python +, gnomeSupport ? true, gdk_pixbuf ? null +, gnome_vfs ? null, libbonobo ? null }: +assert gnomeSupport -> gdk_pixbuf != null && gnome_vfs != null && libbonobo != null + && glib != null; stdenv.mkDerivation rec { name = "libgsf-1.14.22"; @@ -13,9 +16,11 @@ stdenv.mkDerivation rec { buildNativeInputs = [ intltool pkgconfig ]; buildInputs = - [ perl perlXMLParser gettext bzip2 gnome_vfs python gdk_pixbuf ]; + [ perl perlXMLParser gettext bzip2 python ] + ++ stdenv.lib.optionals gnomeSupport [ gnome_vfs gdk_pixbuf ]; - propagatedBuildInputs = [ glib libxml2 libbonobo ]; + propagatedBuildInputs = [ libxml2 glib ] + ++ stdenv.lib.optionals gnomeSupport [ libbonobo ]; doCheck = true; diff --git a/pkgs/development/libraries/libical/default.nix b/pkgs/development/libraries/libical/default.nix index 54dfc1aecc6..80f3a1b8e71 100644 --- a/pkgs/development/libraries/libical/default.nix +++ b/pkgs/development/libraries/libical/default.nix @@ -1,10 +1,13 @@ -{stdenv, fetchurl, perl}: +{stdenv, fetchsvn, perl, cmake}: stdenv.mkDerivation rec { - name = "libical-0.48"; - src = fetchurl { - url = "mirror://sourceforge/freeassociation/${name}.tar.gz"; - sha256 = "1w6znkh0xxhbcm717mbzfva9ycrqs2lajhng391i7pghaw3qprra"; + name = "libical-0.48-p20120623"; + src = fetchsvn { + url = "https://freeassociation.svn.sourceforge.net/svnroot/freeassociation/trunk/libical"; + rev = "1130"; + sha256 = "56caf19abdf44807fda75a67ef0886319551e53c4e4ece4da4fc862e34c64e1a"; }; - buildNativeInputs = [ perl ]; + buildNativeInputs = [ perl cmake ]; + + patches = [ ./respect-env-tzdir.patch ]; } diff --git a/pkgs/development/libraries/libical/respect-env-tzdir.patch b/pkgs/development/libraries/libical/respect-env-tzdir.patch new file mode 100644 index 00000000000..12da8d41c7b --- /dev/null +++ b/pkgs/development/libraries/libical/respect-env-tzdir.patch @@ -0,0 +1,32 @@ +* Remove /usr/*/zoneinfo from the default search path +* Respect $TZDIR +diff --git a/src/libical/icaltz-util.c b/src/libical/icaltz-util.c +index adf7598..d2fd5c8 100644 +--- a/src/libical/icaltz-util.c ++++ b/src/libical/icaltz-util.c +@@ -108,7 +108,7 @@ typedef struct + + static int r_pos [] = {1, 2, 3, -2, -1}; + +-static char *search_paths [] = {"/usr/share/zoneinfo","/usr/lib/zoneinfo","/etc/zoneinfo","/usr/share/lib/zoneinfo"}; ++static char *search_paths [] = {"/etc/zoneinfo"}; + static char *zdir = NULL; + + #define NUM_SEARCH_PATHS (sizeof (search_paths)/ sizeof (search_paths [0])) +@@ -195,6 +195,16 @@ set_zonedir (void) + const char *fname = ZONES_TAB_SYSTEM_FILENAME; + int i; + ++ const char *env_tzdir = strdup (getenv ("TZDIR")); ++ if (env_tzdir) { ++ sprintf (file_path, "%s/%s", env_tzdir, fname); ++ if (!access (file_path, F_OK|R_OK)) { ++ zdir = env_tzdir; ++ return; ++ } ++ free (env_tzdir); ++ } ++ + for (i = 0;i < NUM_SEARCH_PATHS; i++) { + sprintf (file_path, "%s/%s", search_paths [i], fname); + if (!access (file_path, F_OK|R_OK)) { diff --git a/pkgs/development/libraries/libjpeg-turbo/default.nix b/pkgs/development/libraries/libjpeg-turbo/default.nix index f7135e4018d..eb86a1d3ff2 100644 --- a/pkgs/development/libraries/libjpeg-turbo/default.nix +++ b/pkgs/development/libraries/libjpeg-turbo/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchurl, nasm }: +{ stdenv, fetchurl, nasm }: + +stdenv.mkDerivation rec { + name = "libjpeg-turbo-1.2.1"; -stdenv.mkDerivation { - name = "libjpeg-turbo-1.1.1"; - src = fetchurl { - url = mirror://sourceforge/libjpeg-turbo/libjpeg-turbo-1.1.1.tar.gz; - sha256 = "553b1f5a968fb9efc089623ed99be2aa6bc21586be92eb04848489c91a63f1e2"; + url = "mirror://sourceforge/libjpeg-turbo/${name}.tar.gz"; + sha256 = "0w1pj3j7hkx6irkrxlcmz53l94s6im0wml1v36nysb50akq26cyb"; }; buildInputs = [ nasm ]; - + meta = { homepage = http://libjpeg-turbo.virtualgl.org/; description = "A faster (using SIMD) libjpeg implementation"; diff --git a/pkgs/development/libraries/libjpeg/default.nix b/pkgs/development/libraries/libjpeg/default.nix index f598482f830..63d698dda18 100644 --- a/pkgs/development/libraries/libjpeg/default.nix +++ b/pkgs/development/libraries/libjpeg/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation { - name = "libjpeg-8c"; + name = "libjpeg-8d"; src = fetchurl { - url = http://www.ijg.org/files/jpegsrc.v8c.tar.gz; - sha256 = "16kwrjhziv81gl9fq9b7qir8khm3wfb9zj7fzs7yabsb00z0pz7d"; + url = http://www.ijg.org/files/jpegsrc.v8d.tar.gz; + sha256 = "1cz0dy05mgxqdgjf52p54yxpyy95rgl30cnazdrfmw7hfca9n0h0"; }; meta = { diff --git a/pkgs/development/libraries/libktorrent/default.nix b/pkgs/development/libraries/libktorrent/default.nix index 1f50f1b976b..083fbf13c81 100644 --- a/pkgs/development/libraries/libktorrent/default.nix +++ b/pkgs/development/libraries/libktorrent/default.nix @@ -2,8 +2,8 @@ , phonon, libgcrypt }: let - mp_ = "1.3"; - version = "1.${mp_}"; + mp_ = "2.1"; + version = "1.${mp_}-2"; version4 = "4.${mp_}"; in stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://ktorrent.org/downloads/${version4}/${name}.tar.bz2"; - sha256 = "0mvvx6mdfy0pyhk6lwwmmbd3pd2ai6n2rf5kdjqhpkm9wbrck85n"; + sha256 = "1b4ibkba27ivvjsh5s93xwlcgzvvwsgl6mcd8g96d1al05n2ccw9"; }; buildNativeInputs = [ cmake automoc4 gettext ]; diff --git a/pkgs/development/libraries/liblockfile/default.nix b/pkgs/development/libraries/liblockfile/default.nix new file mode 100644 index 00000000000..2db90845f69 --- /dev/null +++ b/pkgs/development/libraries/liblockfile/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + _name = "liblockfile"; + version = "1.09"; + name = "${_name}-${version}"; + + src = fetchurl { + url = "mirror://debian/pool/main/libl/${_name}/${_name}_${version}.orig.tar.gz"; + sha256 = "0zqvbxls1632wqfhv4v3q2djzlz9391h0wdgsvhnaqrr0nx9x5qn"; + }; + + preConfigure = '' + sed -i -e 's/install -g [^ ]* /install /' Makefile.in + ''; + + preInstall = '' + mkdir -p $out/{bin,lib,include,man} $out/man/man{1,3} + ''; + + + meta = { + description = "Liblockfile is a shared library with NFS-safe locking functions."; + homepage = http://packages.debian.org/unstable/libs/liblockfile1; + license = "GPLv2+"; + + maintainers = [ stdenv.lib.maintainers.bluescreen303 ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/development/libraries/libmikmod/default.nix b/pkgs/development/libraries/libmikmod/default.nix index 3d2a2635fbc..cde3aecce07 100644 --- a/pkgs/development/libraries/libmikmod/default.nix +++ b/pkgs/development/libraries/libmikmod/default.nix @@ -1,9 +1,9 @@ { stdenv, fetchurl, texinfo }: stdenv.mkDerivation rec { - name = "libmikmod-3.1.12"; + name = "libmikmod-3.2.0"; src = fetchurl { - url = "mirror://sourceforge/mikmod/${name}.tar.gz"; - sha256 = "0cpwpl0iqd5zsdwshw69arzlwp883bkmkx41wf3fzrh60dw2n6l9"; + url = "http://mikmod.shlomifish.org/files/${name}.tar.gz"; + sha256 = "07k6iyx6pyzisncgdkd071w2dhm3rx6l34hbja3wbc7rpf888k3k"; }; buildInputs = [ texinfo ]; meta = { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { A library for playing tracker music module files supporting many formats, including MOD, S3M, IT and XM. ''; - homepage = http://mikmod.raphnet.net/; + homepage = http://mikmod.shlomifish.org/; license = "LGPLv2+"; maintainers = with stdenv.lib.maintainers; [ astsmtl ]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/development/libraries/libmng/default.nix b/pkgs/development/libraries/libmng/default.nix index 3082bd0ce23..5a73fd417f9 100644 --- a/pkgs/development/libraries/libmng/default.nix +++ b/pkgs/development/libraries/libmng/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zlib, libpng, libjpeg, lcms, automake, autoconf, libtool }: +{ stdenv, fetchurl, zlib, libpng, libjpeg, lcms, automake110x, autoconf, libtool }: stdenv.mkDerivation rec { name = "libmng-1.0.10"; @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { preConfigure = "unmaintained/autogen.sh"; - buildNativeInputs = [ automake autoconf libtool ]; + buildNativeInputs = [ automake110x autoconf libtool ]; propagatedBuildInputs = [ zlib libpng libjpeg lcms ]; - meta = { + meta = { description = "Reference library for reading, displaying, writing and examining Multiple-Image Network Graphics"; homepage = http://www.libmng.com; license = "zlib/libpng"; diff --git a/pkgs/development/libraries/libspectre/0001-Fix-a-crash-with-documents-containing-an-invalid-Pag.patch b/pkgs/development/libraries/libspectre/0001-Fix-a-crash-with-documents-containing-an-invalid-Pag.patch new file mode 100644 index 00000000000..3e232ee5ac5 --- /dev/null +++ b/pkgs/development/libraries/libspectre/0001-Fix-a-crash-with-documents-containing-an-invalid-Pag.patch @@ -0,0 +1,29 @@ +From 7500e4d1ae85ecf9f61b1446e07ebb887118757c Mon Sep 17 00:00:00 2001 +From: Carlos Garcia Campos +Date: Sat, 30 Oct 2010 15:55:18 +0200 +Subject: [PATCH 1/2] Fix a crash with documents containing an invalid + %%Pages: comment + +When failed to allocate memory for pages because of invalid %%Pages: +comment, set maxpages to 0 to ignore the comment. Problem spotted +by Marek Kasik. Fixes bug #30867. +--- + libspectre/ps.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/libspectre/ps.c b/libspectre/ps.c +index 6c7cfce..4578cec 100644 +--- a/libspectre/ps.c ++++ b/libspectre/ps.c +@@ -597,6 +597,8 @@ psscan(const char *filename, int scanstyle) + if (maxpages > 0) { + doc->pages = (struct page *) PS_calloc(maxpages, + sizeof(struct page)); ++ if (!doc->pages) ++ maxpages = 0; + CHECK_MALLOCED(doc->pages); + } + } +-- +1.7.11 + diff --git a/pkgs/development/libraries/libspectre/0002-Allocate-at-least-1-page-in-doc-pages.patch b/pkgs/development/libraries/libspectre/0002-Allocate-at-least-1-page-in-doc-pages.patch new file mode 100644 index 00000000000..09ab9e11c16 --- /dev/null +++ b/pkgs/development/libraries/libspectre/0002-Allocate-at-least-1-page-in-doc-pages.patch @@ -0,0 +1,38 @@ +From 8ffd9185f81cb8337cece4c8e3672d0e6a97e935 Mon Sep 17 00:00:00 2001 +From: Marek Kasik +Date: Wed, 24 Nov 2010 15:54:14 +0100 +Subject: [PATCH 2/2] Allocate at least 1 page in doc->pages + +Allocate at least 1 page if there are no %%Pages: or %%Page: comments +in the PS file (#31512). +--- + libspectre/ps.c | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/libspectre/ps.c b/libspectre/ps.c +index 4578cec..0130fb4 100644 +--- a/libspectre/ps.c ++++ b/libspectre/ps.c +@@ -1004,14 +1004,14 @@ psscan(const char *filename, int scanstyle) + section_len += line_len; + } + ++ if (maxpages == 0) { ++ maxpages = 1; ++ doc->pages = (struct page *) PS_calloc(maxpages, sizeof(struct page)); ++ CHECK_MALLOCED(doc->pages); ++ } + + newpage: + while (DSCcomment(line) && iscomment(line+2, "Page:")) { +- if (maxpages == 0) { +- maxpages = 1; +- doc->pages = (struct page *) PS_calloc(maxpages, sizeof(struct page)); +- CHECK_MALLOCED(doc->pages); +- } + label = ps_gettext(line+length("%%Page:"), &next_char); + if (sscanf(next_char, "%u", &thispage) != 1) thispage = 0; + if (nextpage == 1) { +-- +1.7.11 + diff --git a/pkgs/development/libraries/libspectre/default.nix b/pkgs/development/libraries/libspectre/default.nix index 0be6ac5f4ef..379727aec5c 100644 --- a/pkgs/development/libraries/libspectre/default.nix +++ b/pkgs/development/libraries/libspectre/default.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { ghostscript ]; + patches = [ ./0001-Fix-a-crash-with-documents-containing-an-invalid-Pag.patch ./0002-Allocate-at-least-1-page-in-doc-pages.patch ]; + doCheck = true; meta = { diff --git a/pkgs/development/libraries/libvisio/default.nix b/pkgs/development/libraries/libvisio/default.nix new file mode 100644 index 00000000000..99146cd02cc --- /dev/null +++ b/pkgs/development/libraries/libvisio/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, boost, libwpd, libwpg, pkgconfig }: + +stdenv.mkDerivation rec { + name = "libvisio-0.0.19"; + + src = fetchurl { + url = "http://dev-www.libreoffice.org/src/${name}.tar.xz"; + sha256 = "1iqkz280mi066bdccyxagkqm41i270nx01cacvgjq2pflgd3njd1"; + }; + + buildNativeInputs = [ pkgconfig ]; + buildInputs = [ boost libwpd libwpg ]; + + configureFlags = "--disable-werror"; + + meta = { + description = "A library providing ability to interpret and import visio diagrams into various applications"; + homepage = http://www.freedesktop.org/wiki/Software/libvisio; + platforms = stdenv.lib.platforms.gnu; # random choice + }; +} diff --git a/pkgs/development/libraries/mdds/default.nix b/pkgs/development/libraries/mdds/default.nix new file mode 100644 index 00000000000..484f878a55e --- /dev/null +++ b/pkgs/development/libraries/mdds/default.nix @@ -0,0 +1,16 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "mdds-0.6.0"; + + src = fetchurl { + url = http://multidimalgorithm.googlecode.com/files/mdds_0.6.0.tar.bz2; + sha256 = "0yx6cx2cxk9wpmfpv6k3agkr1sjzxdgxrm3zfj34zwyxr3sh0ql4"; + }; + + meta = { + homepage = https://code.google.com/p/multidimalgorithm/; + description = "A collection of multi-dimensional data structure and indexing algorithm"; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/development/libraries/mpich2/default.nix b/pkgs/development/libraries/mpich2/default.nix index 967abe500e2..0ad2d4e4749 100644 --- a/pkgs/development/libraries/mpich2/default.nix +++ b/pkgs/development/libraries/mpich2/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { configureFlags = "--enable-shared --enable-sharedlib"; buildInputs = [ python perl gfortran ]; - propagatedBuildInputs = stdenv.lib.optional (stdenv ? glibc) [ stdenv.glibc ]; + propagatedBuildInputs = stdenv.lib.optional (stdenv ? glibc) stdenv.glibc; patchPhase = '' for i in $(find -type f -not -name Makefile.\*) diff --git a/pkgs/development/libraries/mythes/default.nix b/pkgs/development/libraries/mythes/default.nix new file mode 100644 index 00000000000..ff06f2a0050 --- /dev/null +++ b/pkgs/development/libraries/mythes/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, hunspell, pkgconfig, perl }: + +stdenv.mkDerivation rec { + name = "mythes-1.2.3"; + + src = fetchurl { + url = "mirror://sourceforge/hunspell/${name}.tar.gz"; + sha256 = "0f5q7yiwg9bw4a5zxg0dapqdfc2grfb4ss34ifir3mhhy4q3jf4j"; + }; + + buildInputs = [ hunspell ]; + buildNativeInputs = [ pkgconfig perl ]; + + meta = { + homepage = http://hunspell.sourceforge.net/; + description = "Thesaurus library from Hunspell project"; + inherit (hunspell.meta) platforms; + }; +} diff --git a/pkgs/development/libraries/nettle/default.nix b/pkgs/development/libraries/nettle/default.nix index 22c2fb14aca..6c7383435a8 100644 --- a/pkgs/development/libraries/nettle/default.nix +++ b/pkgs/development/libraries/nettle/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, gmp, gnum4 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (rec { name = "nettle-2.4"; src = fetchurl { @@ -51,3 +51,13 @@ stdenv.mkDerivation rec { platforms = stdenv.lib.platforms.all; }; } + +// + +stdenv.lib.optionalAttrs stdenv.isSunOS { + # Make sure the right is found, and not the incompatible + # /usr/include/mp.h from OpenSolaris. See + # + # for details. + configureFlags = [ "--with-include-path=${gmp}/include" ]; +}) diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index 3b4d10eaa08..38e9d80d5b7 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -1,82 +1,81 @@ -{ stdenv, fetchurl, nspr, perl, zlib, includeTools ? false}: +{ stdenv, fetchurl, fetchgit, nspr, perl, zlib, sqlite +, includeTools ? false +}: let - nssConfig = fetchurl { - url = "http://sources.gentoo.org/viewcvs.py/*checkout*/gentoo-x86/dev-libs/nss/files/3.12-nss-config.in?rev=1.2"; - sha256 = "1ck9q68fxkjq16nflixbqi4xc6bmylmj994h3f1j42g8mp0xf0vd"; + nssPEM = fetchgit { + url = "git://git.fedorahosted.org/git/nss-pem.git"; + rev = "07a683505d4a0a1113c4085c1ce117425d0afd80"; + sha256 = "e4a9396d90e50e8b3cceff45f312eda9aaf356423f4eddd354a0e1afbbfd4cf8"; }; -in - -stdenv.mkDerivation { - name = "nss-3.13.3"; - - src = fetchurl { - url = http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_13_3_RTM/src/nss-3.13.3.tar.gz; - sha256 = "efa10f2c70da4bddabf1a6081964969bb23359b93d6eadbf4739274a77bc3587"; + secLoadPatch = fetchurl { + url = "http://patch-tracker.debian.org/patch/series/dl/nss/2:3.13.5-1/85_security_load.patch"; + sha256 = "8a8d0ae4ebbd7c389973fa5d26d8bc5f473046c6cb1d8283cb9a3c1f4c565c47"; }; - buildInputs = [nspr perl zlib]; +in stdenv.mkDerivation rec { + name = "nss-${version}"; + version = "3.13.6"; - patches = [ ./nss-3.12.5-gentoo-fixups.diff ]; + src = let + uscoreVersion = stdenv.lib.replaceChars ["."] ["_"] version; + releasePath = "releases/NSS_${uscoreVersion}_RTM/src/nss-${version}.tar.gz"; + in fetchurl { + url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/${releasePath}"; + sha256 = "f7e90727e0ecc1c29de10da39a79bc9c53b814ccfbf40720e053b29c683d43a0"; + }; - # Based on the build instructions at - # http://www.mozilla.org/projects/security/pki/nss/nss-3.11.4/nss-3.11.4-build.html + buildInputs = [ nspr perl zlib sqlite ]; + + postUnpack = '' + cp -rdv "${nssPEM}/mozilla/security/nss/lib/ckfw/pem" \ + "$sourceRoot/mozilla/security/nss/lib/ckfw/" + chmod -R u+w "$sourceRoot/mozilla/security/nss/lib/ckfw/pem" + ''; + + patches = [ + ./nss-3.12.5-gentoo-fixups.diff + secLoadPatch + ./nix_secload_fixup.patch + ]; postPatch = '' + sed -i -e 's/^DIRS.*$/& pem/' mozilla/security/nss/lib/ckfw/manifest.mn sed -i -e "/^PREFIX =/s:= /usr:= $out:" mozilla/security/nss/config/Makefile ''; preConfigure = "cd mozilla/security/nss"; - BUILD_OPT = "1"; + makeFlags = [ + "NSPR_INCLUDE_DIR=${nspr}/include/nspr" + "NSPR_LIB_DIR=${nspr}/lib" + "NSDISTMODE=copy" + "BUILD_OPT=1" + "SOURCE_PREFIX=\$(out)" + "NSS_ENABLE_ECC=1" + "NSS_USE_SYSTEM_SQLITE=1" + ] ++ stdenv.lib.optional stdenv.is64bit "USE_64=1"; - makeFlags = - [ "NSPR_CONFIG_STATUS=" "NSDISTMODE=copy" "BUILD_OPT=1" "SOURCE_PREFIX=\$(out)" - "NSS_ENABLE_ECC=1" - ] - ++ stdenv.lib.optional stdenv.is64bit "USE_64=1"; + buildFlags = [ "build_coreconf" "build_dbm" "all" ]; - buildFlags = "nss_build_all"; + postInstall = '' + rm -rf $out/private + mv $out/public $out/include + mv $out/*.OBJ/* $out/ + rmdir $out/*.OBJ - NIX_CFLAGS_COMPILE = "-I${nspr}/include/nspr"; + cp -av config/nss-config $out/bin/nss-config + ''; - preBuild = - '' - # Fool it into thinking NSPR has already been built. - touch build_nspr - - # Hack to make -lz dependencies work. - touch cmd/signtool/-lz cmd/modutil/-lz - ''; - - postInstall = - '' - #find $out -name "*.a" | xargs rm - rm -rf $out/private - mv $out/public $out/include - mv $out/*.OBJ/* $out/ - rmdir $out/*.OBJ - ${if includeTools then "" else "rm -rf $out/bin"} - - # Borrowed from Gentoo. Firefox expects an nss-config script, - # but NSS doesn't provide it. - - NSS_VMAJOR=`cat lib/nss/nss.h | grep "#define.*NSS_VMAJOR" | awk '{print $3}'` - NSS_VMINOR=`cat lib/nss/nss.h | grep "#define.*NSS_VMINOR" | awk '{print $3}'` - NSS_VPATCH=`cat lib/nss/nss.h | grep "#define.*NSS_VPATCH" | awk '{print $3}'` - - ${if includeTools then "" else "mkdir $out/bin"} - cp ${nssConfig} $out/bin/nss-config - chmod u+x $out/bin/nss-config - substituteInPlace $out/bin/nss-config \ - --subst-var-by MOD_MAJOR_VERSION $NSS_VMAJOR \ - --subst-var-by MOD_MINOR_VERSION $NSS_VMINOR \ - --subst-var-by MOD_PATCH_VERSION $NSS_VPATCH \ - --subst-var-by prefix $out \ - --subst-var-by exec_prefix $out \ - --subst-var-by includedir $out/include/nss \ - --subst-var-by libdir $out/lib - ''; # */ + postFixup = '' + for libname in freebl3 nssdbm3 softokn3 + do + libfile="$out/lib/lib$libname.so" + LD_LIBRARY_PATH=$out/lib $out/bin/shlibsign -v -i "$libfile" + done + '' + stdenv.lib.optionalString (!includeTools) '' + find $out/bin -type f \( -name nss-config -o -delete \) + ''; } diff --git a/pkgs/development/libraries/nss/nix_secload_fixup.patch b/pkgs/development/libraries/nss/nix_secload_fixup.patch new file mode 100644 index 00000000000..960fe0ef7a7 --- /dev/null +++ b/pkgs/development/libraries/nss/nix_secload_fixup.patch @@ -0,0 +1,50 @@ +diff --git a/mozilla/security/coreconf/config.mk b/mozilla/security/coreconf/config.mk +index 72557c6..bdcbf88 100644 +--- a/mozilla/security/coreconf/config.mk ++++ b/mozilla/security/coreconf/config.mk +@@ -207,3 +207,5 @@ endif + DEFINES += -DUSE_UTIL_DIRECTLY + USE_UTIL_DIRECTLY = 1 + ++# nix specific stuff: ++DEFINES += -DNIX_NSS_LIBDIR=\"$(out)/lib/\" +diff --git a/mozilla/security/nss/cmd/shlibsign/shlibsign.c b/mozilla/security/nss/cmd/shlibsign/shlibsign.c +index 5ce626e..e1e8039 100644 +--- a/mozilla/security/nss/cmd/shlibsign/shlibsign.c ++++ b/mozilla/security/nss/cmd/shlibsign/shlibsign.c +@@ -770,7 +770,7 @@ int main(int argc, char **argv) + assert(libname != NULL); + lib = PR_LoadLibrary(libname); + if (!lib) +- lib = PR_LoadLibrary("/usr/lib/nss/libsoftokn3.so"); ++ lib = PR_LoadLibrary(NIX_NSS_LIBDIR"libsoftokn3.so"); + assert(lib != NULL); + PR_FreeLibraryName(libname); + +diff --git a/mozilla/security/nss/lib/util/secload.c b/mozilla/security/nss/lib/util/secload.c +index 7d6fc22..0b7759b 100644 +--- a/mozilla/security/nss/lib/util/secload.c ++++ b/mozilla/security/nss/lib/util/secload.c +@@ -105,9 +105,9 @@ loader_LoadLibInReferenceDir(const char *referencePath, const char *name) + /* Remove the trailing filename from referencePath and add the new one */ + c = strrchr(referencePath, PR_GetDirectorySeparator()); + if (!c) { /* referencePath doesn't contain a / means that dladdr gave us argv[0] +- * and program was called from $PATH. Hack to get libs from /usr/lib */ +- referencePath = "/usr/lib/"; +- c = &referencePath[8]; /* last / */ ++ * and program was called from $PATH. Hack to get libs from NIX_NSS_LIBDIR */ ++ referencePath = NIX_NSS_LIBDIR; ++ c = &referencePath[sizeof(NIX_NSS_LIBDIR) - 1]; /* last / */ + } + if (c) { + size_t referencePathSize = 1 + c - referencePath; +@@ -125,8 +125,7 @@ loader_LoadLibInReferenceDir(const char *referencePath, const char *name) + (strncmp(fullName + referencePathSize - 4, "bin", 3) == 0)) { + memcpy(fullName + referencePathSize -4, "lib", 3); + } +- strcpy(fullName + referencePathSize, "nss/"); +- strcpy(fullName + referencePathSize + 4, name); ++ strcpy(fullName + referencePathSize, name); + dlh = PR_LoadLibraryWithFlags(libSpec, PR_LD_NOW | PR_LD_LOCAL + #ifdef PR_LD_ALT_SEARCH_PATH + /* allow library's dependencies to be found in the same directory diff --git a/pkgs/development/libraries/opencv/2.1.nix b/pkgs/development/libraries/opencv/2.1.nix index 6f422463db9..ea5b1313dc7 100644 --- a/pkgs/development/libraries/opencv/2.1.nix +++ b/pkgs/development/libraries/opencv/2.1.nix @@ -9,11 +9,17 @@ stdenv.mkDerivation rec { sha256 = "26061fd52ab0ab593c093ff94b5f5c09b956d7deda96b47019ff11932111397f"; }; - buildInputs = [ cmake gtk glib libjpeg libpng libtiff jasper ffmpeg pkgconfig + # The order is important; libpng should go before X libs, because they + # propagate the libpng 1.5 (and opencv wants libpng 1.2) + buildInputs = [ cmake libpng gtk glib libjpeg libtiff jasper ffmpeg pkgconfig xineLib gstreamer ]; enableParallelBuilding = true; + patchPhase = '' + sed -i 's/ptrdiff_t/std::ptrdiff_t/' include/opencv/* + ''; + preConfigure = '' export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -D__STDC_CONSTANT_MACROS " ''; diff --git a/pkgs/development/libraries/opencv/default.nix b/pkgs/development/libraries/opencv/default.nix index 46c170d33f9..d40b253df2f 100644 --- a/pkgs/development/libraries/opencv/default.nix +++ b/pkgs/development/libraries/opencv/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, cmake, gtk, libjpeg, libpng, libtiff, jasper, ffmpeg , pkgconfig, gstreamer, xineLib, glib }: -let v = "2.3.1a"; in +let v = "2.4.2"; in stdenv.mkDerivation rec { name = "opencv-${v}"; src = fetchurl { url = "mirror://sourceforge/opencvlibrary/OpenCV-${v}.tar.bz2"; - sha256 = "0325s7pa2npcw2gc06pr6q5ik4xdyf08rvkfc0myn10w20lzb8m9"; + sha256 = "0a1c4ys78k670dsk1fapylpf8hwfyzy944r9jvwivqh33s0j6039"; }; buildInputs = [ gtk glib libjpeg libpng libtiff jasper ffmpeg xineLib gstreamer ]; diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix index 22f98535803..5c9fedb7fc5 100644 --- a/pkgs/development/libraries/openldap/default.nix +++ b/pkgs/development/libraries/openldap/default.nix @@ -1,23 +1,19 @@ {stdenv, fetchurl, openssl, cyrus_sasl, db4, groff}: -stdenv.mkDerivation { - name = "openldap-2.4.13"; - +stdenv.mkDerivation rec { + name = "openldap-2.4.31"; + src = fetchurl { - url = ftp://ftp.nl.uu.net/pub/unix/db/openldap/openldap-release/openldap-2.4.13.tgz; - sha256 = "18l06v8z5wnr92m28bwxd27l6kw3i0gi00yivv603da6m76cm0ic"; + url = "ftp://ftp.nl.uu.net/pub/unix/db/openldap/openldap-release/${name}.tgz"; + sha256 = "bde845840df4794b869a6efd6a6b1086f80989038e4844b2e4d7d6b57b39c5b6"; }; - + buildInputs = [openssl cyrus_sasl db4 groff]; - + dontPatchELF = 1; # !!! - # Build on Glibc 2.9. - # http://www.openldap.org/lists/openldap-bugs/200808/msg00130.html - NIX_CFLAGS_COMPILE = "-D_GNU_SOURCE"; - meta = { - homepage = http://www.openldap.org/; + homepage = "http://www.openldap.org/"; description = "An open source implementation of the Lightweight Directory Access Protocol"; }; } diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index f8d2b32542c..ef6037b7a28 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -23,6 +23,11 @@ let ./gnu.patch # submitted upstream ] + ++ stdenv.lib.optionals (stdenv.system == "x86_64-kfreebsd-gnu") + [ ./gnu.patch + ./kfreebsd-gnu.patch + ] + ++ stdenv.lib.optional stdenv.isDarwin ./darwin-arch.patch; in diff --git a/pkgs/development/libraries/openssl/kfreebsd-gnu.patch b/pkgs/development/libraries/openssl/kfreebsd-gnu.patch new file mode 100644 index 00000000000..66cedf746ba --- /dev/null +++ b/pkgs/development/libraries/openssl/kfreebsd-gnu.patch @@ -0,0 +1,36 @@ +Allow compilation on GNU/kFreeBSD. Ideally, there'd be a single way to process +all glibc-based system, but the build system is soooo broken. + +--- openssl-1.0.0i/config ++++ openssl-1.0.0i/config +@@ -170,6 +170,10 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${ + echo "${MACHINE}-whatever-linux1"; exit 0 + ;; + ++ GNU/kFreeBSD*) ++ echo "kfreebsd-gnu"; exit 0; ++ ;; ++ + GNU*) + echo "hurd-x86"; exit 0; + ;; +@@ -810,6 +814,7 @@ case "$GUESSOS" in + beos-*) OUT="$GUESSOS" ;; + x86pc-*-qnx6) OUT="QNX6-i386" ;; + *-*-qnx6) OUT="QNX6" ;; ++ kfreebsd-gnu) OUT="kfreebsd-gnu";; + *) OUT=`echo $GUESSOS | awk -F- '{print $3}'`;; + esac + + +--- openssl-1.0.0i/Configure ++++ openssl-1.0.0i/Configure +@@ -565,6 +565,9 @@ my %table=( + ##### GNU Hurd + "hurd-x86", "gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -march=i486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC", + ++##### GNU/kFreeBSD on x86_64, copied from "linux-x86_64" ++"kfreebsd-gnu", "gcc:-m64 -DL_ENDIAN -DTERMIOS -O3 -Wall -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64", ++ + ##### OS/2 EMX + "OS2-EMX", "gcc::::::::", diff --git a/pkgs/development/libraries/pcre/8.30.nix b/pkgs/development/libraries/pcre/8.30.nix new file mode 100644 index 00000000000..2f636492eb6 --- /dev/null +++ b/pkgs/development/libraries/pcre/8.30.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchurl, unicodeSupport ? true, cplusplusSupport ? true }: + +stdenv.mkDerivation rec { + name = "pcre-8.30"; + + src = fetchurl { + url = "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${name}.tar.bz2"; + sha256 = "c1113fd7db934e97ad8b3917d432e5b642e9eb9afd127eb797804937c965f4ac"; + }; + + # The compiler on Darwin crashes with an internal error while building the + # C++ interface. Disabling optimizations on that platform remedies the + # problem. In case we ever update the Darwin GCC version, the exception for + # that platform ought to be removed. + configureFlags = '' + ${if unicodeSupport then "--enable-unicode-properties" else ""} + ${if !cplusplusSupport then "--disable-cpp" else ""} + '' + stdenv.lib.optionalString stdenv.isDarwin "CXXFLAGS=-O0"; + + doCheck = !stdenv.isCygwin; # XXX: test failure on Cygwin + + meta = { + homepage = "http://www.pcre.org/"; + description = "A library for Perl Compatible Regular Expressions"; + license = "BSD-3"; + + longDescription = '' + The PCRE library is a set of functions that implement regular + expression pattern matching using the same syntax and semantics as + Perl 5. PCRE has its own native API, as well as a set of wrapper + functions that correspond to the POSIX regular expression API. The + PCRE library is free, even for building proprietary software. + ''; + + platforms = stdenv.lib.platforms.all; + maintainers = [ stdenv.lib.maintainers.simons ]; + }; +} diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix index dd83d7dfd8f..88daab5ff92 100644 --- a/pkgs/development/libraries/polkit/default.nix +++ b/pkgs/development/libraries/polkit/default.nix @@ -1,29 +1,31 @@ { stdenv, fetchurl, pkgconfig, glib, expat, pam, intltool, gettext -, gobjectIntrospection }: +, gobjectIntrospection +, useSystemd ? false, systemd ? null }: let system = "/var/run/current-system/sw"; - + foolVars = { LOCALSTATE = "/var"; SYSCONF = "/etc"; LIB = "${system}/lib"; DATA = "${system}/share"; }; - + in stdenv.mkDerivation rec { - name = "polkit-0.104"; + name = "polkit-0.105"; src = fetchurl { - url = "http://hal.freedesktop.org/releases/${name}.tar.gz"; - sha256 = "1yf7307svs8qk76qdlgww1bhgdcia5cm92n16xz7njhy73c162kb"; + url = "http://www.freedesktop.org/software/polkit/releases/${name}.tar.gz"; + sha256 = "1pz1hn4z0f1wk4f7w8q1g6ygwan1b6kxmfad3b7gql27pb47rp4g"; }; buildInputs = - [ pkgconfig glib expat pam intltool gobjectIntrospection ]; + [ pkgconfig glib expat pam intltool gobjectIntrospection ] + ++ stdenv.lib.optional useSystemd systemd; configureFlags = "--libexecdir=$(out)/libexec/polkit-1"; @@ -47,7 +49,7 @@ stdenv.mkDerivation rec { INTROSPECTION_GIRDIR=$(out)/share/gir-1.0 INTROSPECTION_TYPELIBDIR=$(out)lib/girepository-1.0 ''; - + postInstall = '' # Allow some files with paranoid permissions to be stripped in @@ -56,7 +58,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.freedesktop.org/wiki/Software/PolicyKit; + homepage = http://www.freedesktop.org/wiki/Software/polkit; description = "A toolkit for defining and handling the policy that allows unprivileged processes to speak to privileged processes"; platforms = platforms.linux; maintainers = [ maintainers.urkud ]; diff --git a/pkgs/development/libraries/qoauth/default.nix b/pkgs/development/libraries/qoauth/default.nix new file mode 100644 index 00000000000..f93e4479e71 --- /dev/null +++ b/pkgs/development/libraries/qoauth/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, qt4, qca2 }: + +stdenv.mkDerivation { + name = "qoauth-1.0.1"; + + src = fetchurl { + url = https://github.com/ayoy/qoauth/tarball/v1.0.1; + name = "qoauth-1.0.1.tar.gz"; + sha256 = "1ax0g4dd49a3a1699ams13bkhz690xfwqg8rxp1capbdpf2aa8cp"; + }; + + configurePhase = "qmake PREFIX=$prefix"; + patchPhase = "sed -e 's/lib64/lib/g' -i src/src.pro"; + + buildInputs = [ qt4 qca2 ]; + + NIX_CFLAGS_COMPILE="-I${qca2}/include/QtCrypto"; + NIX_LDFLAGS = "-lqca"; + + meta = { + description = "Qt library for OAuth authentication"; + inherit (qt4.meta) platforms; + maintainers = [ stdenv.lib.maintainers.urkud ]; + }; +} diff --git a/pkgs/development/libraries/readline/readline-6.2-patches.nix b/pkgs/development/libraries/readline/readline-6.2-patches.nix index 4e0ff213527..719face2135 100644 --- a/pkgs/development/libraries/readline/readline-6.2-patches.nix +++ b/pkgs/development/libraries/readline/readline-6.2-patches.nix @@ -3,4 +3,6 @@ patch: [ (patch "001" "1qxl74f4n0hv4a807byrgbk4ixd8m50apj3922q2ss9pfi0nra1q") (patch "002" "1m670g2xzib6r81315q9r24nh9brmxkpq07acch1fwxmih94jqqy") +(patch "003" "0x13c9wir4r44v2vdg96y0ahn8kl3wcmb5y0xn15yvid6pzk28fb") +(patch "004" "0xjlkxfssfsd6jwbqhfjs4hybcps0b9zgz8v86vbhnzag4j39g89") ] diff --git a/pkgs/development/libraries/sbc/default.nix b/pkgs/development/libraries/sbc/default.nix new file mode 100644 index 00000000000..d621eed6728 --- /dev/null +++ b/pkgs/development/libraries/sbc/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, libsndfile, pkgconfig }: + +stdenv.mkDerivation rec { + name = "sbc-1.0"; + + src = fetchurl { + url = "http://www.kernel.org/pub/linux/bluetooth/${name}.tar.xz"; + sha256 = "10mq2rmh3h90bwq5cdcmizf93zf8f2br8gds0jxr9i962ai0m5xz"; + }; + + buildInputs = [ pkgconfig libsndfile ]; + + meta = { + description = "SubBand Codec Library"; + + homepage = http://www.bluez.org/; + + licenses = stdenv.lib.licenses.gpl2; + + maintainers = [ stdenv.lib.maintainers.shlevy ]; + }; +} diff --git a/pkgs/development/libraries/science/math/liblapack/default.nix b/pkgs/development/libraries/science/math/liblapack/default.nix index e2b43b6b053..9f25011b76f 100644 --- a/pkgs/development/libraries/science/math/liblapack/default.nix +++ b/pkgs/development/libraries/science/math/liblapack/default.nix @@ -4,10 +4,10 @@ let usedLibExtension = if shared then ".so" else ".a"; in stdenv.mkDerivation { - name = "liblapack-3.4.0"; + name = "liblapack-3.4.1"; src = fetchurl { - url = "http://www.netlib.org/lapack/lapack-3.4.0.tgz"; - sha256 = "1sf30v1ps5icg67dvw5sbx5yhypx13am470gqg2f7l04f3wrw4x7"; + url = "http://www.netlib.org/lapack/lapack-3.4.1.tgz"; + sha256 = "93b910f94f6091a2e71b59809c4db4a14655db527cfc5821ade2e8c8ab75380f"; }; propagatedBuildInputs = [ atlasMaybeShared ]; diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix new file mode 100644 index 00000000000..4d30671c488 --- /dev/null +++ b/pkgs/development/libraries/science/math/openblas/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl, gfortran, perl }: + +stdenv.mkDerivation rec { + version = "0.2.2"; + lapack_version = "3.4.1"; + lapack_src = fetchurl { + url = "http://www.netlib.org/lapack/lapack-${lapack_version}.tgz"; + sha256 = "93b910f94f6091a2e71b59809c4db4a14655db527cfc5821ade2e8c8ab75380f"; + }; + + name = "openblas-${version}"; + src = fetchurl { + url = "https://github.com/xianyi/OpenBLAS/tarball/v${version}"; + sha256 = "13kdx3knff5ajnmgn419g0dnh83plin07p7akwamr3v7z5qfrzqr"; + name = "openblas-${version}.tar.gz"; + }; + + preBuild = "cp ${lapack_src} lapack-${lapack_version}.tgz"; + + buildInputs = [gfortran perl]; + + cpu = builtins.head (stdenv.lib.splitString "-" stdenv.system); + + target = if cpu == "i686" then "P6" else + if cpu == "x86_64" then "CORE2" else + # allow autodetect + ""; + + makeFlags = "${if target != "" then "TARGET=" else ""}${target} FC=gfortran CC=cc PREFIX=\"\$(out)\""; + + meta = { + description = "Basic Linear Algebra Subprograms"; + license = stdenv.lib.licenses.bsd3; + homepage = "https://github.com/xianyi/OpenBLAS"; + }; +} diff --git a/pkgs/development/libraries/serd/default.nix b/pkgs/development/libraries/serd/default.nix new file mode 100644 index 00000000000..8deb26abc1d --- /dev/null +++ b/pkgs/development/libraries/serd/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, pcre, pkgconfig, python }: + +stdenv.mkDerivation rec { + name = "serd-${version}"; + version = "0.14.0"; + + src = fetchurl { + url = "http://download.drobilla.net/${name}.tar.bz2"; + sha256 = "023gsw0nwn2fh2vp7v2gwsmdwk6658zfl1ihdvr9xbayfcv88wlg"; + }; + + buildInputs = [ pcre pkgconfig python ]; + + configurePhase = "python waf configure --prefix=$out"; + + buildPhase = "python waf"; + + installPhase = "python waf install"; + + meta = with stdenv.lib; { + homepage = http://drobilla.net/software/serd; + description = "A lightweight C library for RDF syntax which supports reading and writing Turtle and NTriples"; + license = licenses.mit; + maintainers = [ maintainers.goibhniu ]; + + }; +} diff --git a/pkgs/development/libraries/silgraphite/default.nix b/pkgs/development/libraries/silgraphite/default.nix new file mode 100644 index 00000000000..db018cca465 --- /dev/null +++ b/pkgs/development/libraries/silgraphite/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, pkgconfig, freetype, libXft, pango, fontconfig }: + +stdenv.mkDerivation rec { + version = "2.3.1"; + name = "silgraphite-2.3.1"; + + src = fetchurl { + url = "mirror://sourceforge/silgraphite/silgraphite/${version}/${name}.tar.gz"; + sha256 = "9b07c6e91108b1fa87411af4a57e25522784cfea0deb79b34ced608444f2ed65"; + }; + + buildInputs = [pkgconfig freetype libXft pango fontconfig]; + + NIX_CFLAGS_COMPILE = "-I${freetype}/include/freetype2"; + + meta = { + description = "An advanced font engine"; + maintainers = [ stdenv.lib.maintainers.raskin ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/development/libraries/soprano/default.nix b/pkgs/development/libraries/soprano/default.nix index 54e40efe65e..7705ee1893d 100644 --- a/pkgs/development/libraries/soprano/default.nix +++ b/pkgs/development/libraries/soprano/default.nix @@ -2,11 +2,11 @@ , pkgconfig }: stdenv.mkDerivation rec { - name = "soprano-2.7.6"; + name = "soprano-2.8.0"; src = fetchurl { url = "mirror://sourceforge/soprano/${name}.tar.bz2"; - sha256 = "0cnprxc8wykl96aphsh2d3711h7cals7gnibbxpsmsqyqbnhbp98"; + sha256 = "1israssklrb4mhx2dgkfnabh21ll1jyis1c5c42rc9gi23mkb7ah"; }; patches = [ ./find-virtuoso.patch ]; diff --git a/pkgs/development/libraries/sord/default.nix b/pkgs/development/libraries/sord/default.nix new file mode 100644 index 00000000000..ee9d241424c --- /dev/null +++ b/pkgs/development/libraries/sord/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, pkgconfig, python, serd }: + +stdenv.mkDerivation rec { + name = "sord-${version}"; + version = "0.8.0"; + + src = fetchurl { + url = "http://download.drobilla.net/${name}.tar.bz2"; + sha256 = "0ncaplfr3wal9h8h3lafw0bhx34w046r7md74djgrysrm2h77pwr"; + }; + + buildInputs = [ pkgconfig python serd ]; + + configurePhase = "python waf configure --prefix=$out"; + + buildPhase = "python waf"; + + installPhase = "python waf install"; + + meta = with stdenv.lib; { + homepage = http://drobilla.net/software/sord; + description = "A lightweight C library for storing RDF data in memory"; + license = licenses.mit; + maintainers = [ maintainers.goibhniu ]; + + }; +} diff --git a/pkgs/development/libraries/spice-protocol/default.nix b/pkgs/development/libraries/spice-protocol/default.nix new file mode 100644 index 00000000000..c1b6d0e67e7 --- /dev/null +++ b/pkgs/development/libraries/spice-protocol/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "spice-protocol-0.10.1"; + + src = fetchurl { + url = "http://www.spice-space.org/download/releases/${name}.tar.bz2"; + sha256 = "0drmy2ws7qwmvjxfynhssbvh1y954rfik99hnl789g7yg6vcpxp5"; + }; + + meta = { + description = "Protocol headers for the SPICE protocol."; + homepage = http://www.spice-space.org; + license = stdenv.lib.licenses.bsd3; + + maintainers = [ stdenv.lib.maintainers.bluescreen303 ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/development/libraries/spice/default.nix b/pkgs/development/libraries/spice/default.nix new file mode 100644 index 00000000000..cba5d910783 --- /dev/null +++ b/pkgs/development/libraries/spice/default.nix @@ -0,0 +1,46 @@ +{ stdenv, fetchurl, pkgconfig, pixman, celt, alsaLib, openssl +, libXrandr, libXfixes, libXext, libXrender, libXinerama, libjpeg, zlib +, spiceProtocol }: + +with stdenv.lib; + +stdenv.mkDerivation rec { + name = "spice-0.10.1"; + + src = fetchurl { + url = "http://www.spice-space.org/download/releases/${name}.tar.bz2"; + sha256 = "105p5fh6hhhzvz0fh1x52lzi41rpvajf390xbbw3da4417lf5pqk"; + }; + + buildInputs = [ pixman celt alsaLib openssl libjpeg zlib + libXrandr libXfixes libXrender libXext libXinerama + ]; + + buildNativeInputs = [ pkgconfig spiceProtocol ]; + + # NIX_CFLAGS_COMPILE = "-fno-stack-protector"; + + configureFlags = [ + "--with-sasl=no" + ]; + + postInstall = '' + ln -s spice-server $out/include/spice + ''; + + meta = { + description = "Complete open source solution for interaction with virtualized desktop devices"; + longDescription = '' + The Spice project aims to provide a complete open source solution for interaction + with virtualized desktop devices.The Spice project deals with both the virtualized + devices and the front-end. Interaction between front-end and back-end is done using + VD-Interfaces. The VD-Interfaces (VDI) enable both ends of the solution to be easily + utilized by a third-party component. + ''; + homepage = http://www.spice-space.org/; + license = licenses.lgpl21; + + maintainers = [ maintainers.bluescreen303 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/suitesparse/default.nix b/pkgs/development/libraries/suitesparse/default.nix index b3fe6db059a..e3a7fbb5a08 100644 --- a/pkgs/development/libraries/suitesparse/default.nix +++ b/pkgs/development/libraries/suitesparse/default.nix @@ -1,9 +1,10 @@ { stdenv, fetchurl, blas, liblapack, gfortran } : -stdenv.mkDerivation { - name = "suitesparse"; +stdenv.mkDerivation rec { + version = "4.0.0"; + name = "suitesparse-${version}"; src = fetchurl { - url = http://www.cise.ufl.edu/research/sparse/SuiteSparse/SuiteSparse-3.5.0.tar.gz ; - sha256 = "0npn7c1j5qag5m2r0cmh3bwc42c1jk8k2yg2cfyxlcrp0h7wn4rc"; + url = "http://www.cise.ufl.edu/research/sparse/SuiteSparse/SuiteSparse-${version}.tar.gz" ; + sha256 = "1nvbdw10wa6654k8sa2vhr607q6fflcywyji5xd767cqpwag4v5j"; }; buildInputs = [blas liblapack gfortran] ; patches = [./disable-metis.patch]; @@ -14,6 +15,8 @@ stdenv.mkDerivation { mkdir -p $out/include ''; + makeFlags = ''PREFIX=\"$(out)\" INSTALL_LIB=$(out)/lib INSTALL_INCLUDE=$(out)/include''; + NIX_CFLAGS = "-fPIC"; } diff --git a/pkgs/development/libraries/suitesparse/disable-metis.patch b/pkgs/development/libraries/suitesparse/disable-metis.patch index 68fd22bc643..5b735eb7d3c 100644 --- a/pkgs/development/libraries/suitesparse/disable-metis.patch +++ b/pkgs/development/libraries/suitesparse/disable-metis.patch @@ -1,140 +1,18 @@ -diff -Nrc SuiteSparse/UFconfig/Makefile SuiteSparse-new/UFconfig/Makefile -*** SuiteSparse/UFconfig/Makefile 2009-11-11 20:59:08.000000000 +0100 ---- SuiteSparse-new/UFconfig/Makefile 2010-08-02 13:14:04.000000000 +0200 -*************** -*** 25,31 **** - - # install UFconfig - install: -! $(CP) Lib/libufconfig.a $(INSTALL_LIB)/libufconfig.$(VERSION).a - ( cd $(INSTALL_LIB) ; ln -s libufconfig.$(VERSION).a libufconfig.a ) - $(CP) UFconfig.h $(INSTALL_INCLUDE) - ---- 25,31 ---- - - # install UFconfig - install: -! $(CP) libufconfig.a $(INSTALL_LIB)/libufconfig.$(VERSION).a - ( cd $(INSTALL_LIB) ; ln -s libufconfig.$(VERSION).a libufconfig.a ) - $(CP) UFconfig.h $(INSTALL_INCLUDE) - -diff -Nrc SuiteSparse/UFconfig/UFconfig.mk SuiteSparse-new/UFconfig/UFconfig.mk -*** SuiteSparse/UFconfig/UFconfig.mk 2010-06-02 17:40:42.000000000 +0200 ---- SuiteSparse-new/UFconfig/UFconfig.mk 2010-08-02 14:55:27.000000000 +0200 -*************** -*** 34,40 **** - # performance. You should select the optimization parameters that are best - # for your system. On Linux, use "CFLAGS = -O3 -fexceptions" for example. - CC = cc -! CFLAGS = -O3 -fexceptions - - # C++ compiler (also uses CFLAGS) - CPLUSPLUS = g++ ---- 34,40 ---- - # performance. You should select the optimization parameters that are best - # for your system. On Linux, use "CFLAGS = -O3 -fexceptions" for example. - CC = cc -! CFLAGS = -O3 -fexceptions -fPIC - - # C++ compiler (also uses CFLAGS) - CPLUSPLUS = g++ -*************** -*** 71,78 **** - # MAKE = gmake - - # For "make install" -! INSTALL_LIB = /usr/local/lib -! INSTALL_INCLUDE = /usr/local/include - - #------------------------------------------------------------------------------ - # BLAS and LAPACK configuration: ---- 71,78 ---- - # MAKE = gmake - - # For "make install" -! INSTALL_LIB = $(out)/lib -! INSTALL_INCLUDE = $(out)/include - - #------------------------------------------------------------------------------ - # BLAS and LAPACK configuration: -*************** -*** 127,134 **** - # The path is relative to where it is used, in CHOLMOD/Lib, CHOLMOD/MATLAB, etc. - # You may wish to use an absolute path. METIS is optional. Compile - # CHOLMOD with -DNPARTITION if you do not wish to use METIS. -! METIS_PATH = ../../metis-4.0 -! METIS = ../../metis-4.0/libmetis.a - - # If you use CHOLMOD_CONFIG = -DNPARTITION then you must use the following - # options: ---- 127,134 ---- - # The path is relative to where it is used, in CHOLMOD/Lib, CHOLMOD/MATLAB, etc. - # You may wish to use an absolute path. METIS is optional. Compile - # CHOLMOD with -DNPARTITION if you do not wish to use METIS. -! #METIS_PATH = ../../metis-4.0 -! #METIS = - - # If you use CHOLMOD_CONFIG = -DNPARTITION then you must use the following - # options: -*************** -*** 189,195 **** - # -DNSUNPERF for Solaris only. If defined, do not use the Sun - # Performance Library - -! CHOLMOD_CONFIG = - - #------------------------------------------------------------------------------ - # SuiteSparseQR configuration: ---- 189,195 ---- - # -DNSUNPERF for Solaris only. If defined, do not use the Sun - # Performance Library - -! CHOLMOD_CONFIG = -DNPARTITION - - #------------------------------------------------------------------------------ - # SuiteSparseQR configuration: -*************** -*** 203,209 **** - # -DHAVE_TBB enable the use of Intel's Threading Building Blocks (TBB) - - # default, without timing, without TBB: -! SPQR_CONFIG = - # with timing and TBB: - # SPQR_CONFIG = -DTIMING -DHAVE_TBB - # with timing ---- 203,209 ---- - # -DHAVE_TBB enable the use of Intel's Threading Building Blocks (TBB) - - # default, without timing, without TBB: -! SPQR_CONFIG = -DNPARTITION - # with timing and TBB: - # SPQR_CONFIG = -DTIMING -DHAVE_TBB - # with timing diff -Nrc SuiteSparse/UMFPACK/Demo/Makefile SuiteSparse-new/UMFPACK/Demo/Makefile *** SuiteSparse/UMFPACK/Demo/Makefile 2009-11-11 21:09:45.000000000 +0100 --- SuiteSparse-new/UMFPACK/Demo/Makefile 2010-08-02 12:53:16.000000000 +0200 *************** -*** 40,51 **** +*** 40,46 **** ../../CAMD/Lib/libcamd.a: ( cd ../../CAMD ; $(MAKE) library ) -- ../../metis-4.0/libmetis.a: -- ( cd ../../metis-4.0/Lib ; $(MAKE) ) +- $(METIS): +- ( cd $(METIS_PATH) && $(MAKE) ) UMFPACK = ../Lib/libumfpack.a ../../AMD/Lib/libamd.a \ - ../../CHOLMOD/Lib/libcholmod.a ../../COLAMD/Lib/libcolamd.a \ -! ../../CAMD/Lib/libcamd.a ../../metis-4.0/libmetis.a \ - ../../CCOLAMD/Lib/libccolamd.a - - libs: $(UMFPACK) ---- 40,49 ---- +--- 40,44 ---- ../../CAMD/Lib/libcamd.a: ( cd ../../CAMD ; $(MAKE) library ) UMFPACK = ../Lib/libumfpack.a ../../AMD/Lib/libamd.a \ - ../../CHOLMOD/Lib/libcholmod.a ../../COLAMD/Lib/libcolamd.a \ -! ../../CAMD/Lib/libcamd.a \ - ../../CCOLAMD/Lib/libccolamd.a - - libs: $(UMFPACK) diff --git a/pkgs/development/libraries/tbb/default.nix b/pkgs/development/libraries/tbb/default.nix new file mode 100644 index 00000000000..13ec42f1ba2 --- /dev/null +++ b/pkgs/development/libraries/tbb/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation { + name = "tbb-4.0-u5"; + + src = fetchurl { + url = "http://threadingbuildingblocks.org/uploads/77/187/4.0%20update%205/tbb40_20120613oss_src.tgz"; + sha256 = "aaa98146049e55f6ac969298340eeb49df61395403fcc1480824a4ecd0d46192"; + }; + + checkTarget = "test"; + doCheck = false; + + installPhase = '' + mkdir -p $out/{lib,share/doc} + cp "build/"*release*"/"*so* $out/lib/ + mv include $out/ + rm $out/include/index.html + mv doc/html $out/share/doc/tbb + ''; + + enableParallelBuilding = true; + + meta = { + homepage = "http://threadingbuildingblocks.org/"; + description = "Intel Thread Building Blocks C++ Library"; + license = "LGPLv3+"; + + longDescription = '' + Intel Threading Building Blocks offers a rich and complete approach to + expressing parallelism in a C++ program. It is a library that helps you + take advantage of multi-core processor performance without having to be a + threading expert. Intel TBB is not just a threads-replacement library. It + represents a higher-level, task-based parallelism that abstracts platform + details and threading mechanisms for scalability and performance. + ''; + + maintainers = [ stdenv.lib.maintainers.simons ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/development/libraries/tclgpg/default.nix b/pkgs/development/libraries/tclgpg/default.nix new file mode 100644 index 00000000000..d8bea7f14e3 --- /dev/null +++ b/pkgs/development/libraries/tclgpg/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchsvn, autoconf, automake, tcl, tcllib, gnupg }: + +stdenv.mkDerivation rec { + name = "tclgpg-${version}"; + version = "1.0pre"; + + src = fetchsvn { + url = "http://tclgpg.googlecode.com/svn/trunk"; + rev = 74; + sha256 = "5207b1d246fea6d4527e8c044579dae45a2e31eeaa5633f4f97c7e7b54ec27c5"; + }; + + configureFlags = "--with-tcl=" + tcl + "/lib " + + "--with-tclinclude=" + tcl + "/include "; + + preConfigure = '' + configureFlags="--exec_prefix=$prefix $configureFlags" + sed -i -e 's|dtplite|TCLLIBPATH="${tcllib}/lib/tcllib${tcllib.version}" &|' Makefile.in + autoreconf -vfi + ''; + + prePatch = '' + sed -i -e 's|\[auto_execok gpg\]|"${gnupg}/bin/gpg2"|' tclgpg.tcl + ''; + + passthru = { + libPrefix = "gpg1.0"; + }; + + buildInputs = [ autoconf automake tcl tcllib ]; + + meta = { + homepage = http://code.google.com/p/tclgpg/; + description = "A Tcl interface to GNU Privacy Guard"; + license = stdenv.lib.licenses.bsd2; + }; +} diff --git a/pkgs/development/libraries/tcllib/default.nix b/pkgs/development/libraries/tcllib/default.nix index fcfbbe19d94..12bbe0914e0 100644 --- a/pkgs/development/libraries/tcllib/default.nix +++ b/pkgs/development/libraries/tcllib/default.nix @@ -9,5 +9,15 @@ stdenv.mkDerivation rec { sha256 = "11052fgfmv9vyswzjjgfvh3pi0k3fnfnl9ri6nl4vc6f6z5ry56x"; }; - buildInputs = [tcl]; + passthru = { + libPrefix = "tcllib${version}"; + }; + + buildInputs = [ tcl ]; + + meta = { + homepage = "http://tcl.activestate.com/software/tcllib/"; + description = "Tcl-only library of standard routines for Tcl"; + license = stdenv.lib.licenses.tcltk; + }; } diff --git a/pkgs/development/libraries/tcltls/default.nix b/pkgs/development/libraries/tcltls/default.nix index dbbfc3d3855..278fed37514 100644 --- a/pkgs/development/libraries/tcltls/default.nix +++ b/pkgs/development/libraries/tcltls/default.nix @@ -17,5 +17,15 @@ stdenv.mkDerivation rec { sha256 = "adec50143a9ad634a671d24f7c7bbf2455487eb5f12d290f41797c32a98b93f3"; }; - buildInputs = [tcl openssl]; + passthru = { + libPrefix = "tls${version}"; + }; + + buildInputs = [ tcl openssl ]; + + meta = { + homepage = "http://tls.sourceforge.net/"; + description = "An OpenSSL / RSA-bsafe Tcl extension"; + license = stdenv.lib.licenses.tcltk; + }; } diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix index a7630ee5d69..af0e6426b81 100644 --- a/pkgs/development/libraries/v8/default.nix +++ b/pkgs/development/libraries/v8/default.nix @@ -1,36 +1,43 @@ -{ stdenv, fetchsvn, python, scons, readline, makeWrapper }: +{ stdenv, fetchsvn, gyp, readline, python, which }: assert readline != null; let system = stdenv.system; arch = if system == "i686-linux" then "ia32" else if system == "x86_64-linux" || system == "x86_64-darwin" then "x64" else ""; - version = "3.6.6.25"; + version = "3.11.10.15"; in + assert arch != ""; + stdenv.mkDerivation rec { name = "v8-${version}"; src = fetchsvn { url = "http://v8.googlecode.com/svn/tags/${version}"; - sha256 = "2a097cbea29a8488419840245bf7bf85513941ceb22c5ef0a3825bfe5edaa045"; + sha256 = "0pdw4r6crsb07gshww4kbfbavxgkal8yaxkaggnkz62lrwbcwrwi"; }; - buildInputs = [python scons readline makeWrapper]; - - buildPhase = '' - export CXX=`type -p g++` - export CPPPATH=${readline}/include - export LIBPATH=${readline}/lib - scons snapshot=on console=readline library=shared importenv=PATH arch=${arch} library d8 + configurePhase = '' + mkdir build/gyp + ln -sv ${gyp}/bin/gyp build/gyp/gyp ''; + buildNativeInputs = stdenv.lib.optional (system == "i686-linux") which; + buildInputs = [ readline python ]; + + buildFlags = [ + "library=shared" + "console=readline" + "${arch}.release" + ]; + + enableParallelBuilding = true; + installPhase = '' mkdir -p $out/bin mkdir -p $out/lib - - cp -v libv8.* $out/lib - cp -v d8 $out/bin/d8 - cp -vR include $out/ - wrapProgram $out/bin/d8 --set ${if stdenv.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"} $out/lib + mv -v out/${arch}.release/d8 $out/bin + mv -v out/${arch}.release/lib.target/libv8.so $out/lib + mv -v include $out/ ''; } diff --git a/pkgs/development/libraries/webkit/gtk2.nix b/pkgs/development/libraries/webkit/gtk2.nix index 76a9b90b411..5c755c193a5 100644 --- a/pkgs/development/libraries/webkit/gtk2.nix +++ b/pkgs/development/libraries/webkit/gtk2.nix @@ -13,8 +13,8 @@ rec { buildInputs = [gtk glib atk cairo curl fontconfig freetype gettext libjpeg libpng libtiff libxml2 libxslt pango sqlite icu gperf bison flex autoconf automake libtool - perl intltool pkgconfig libsoup gtkdoc libXt libproxy - enchant python ruby which renderproto libXrender geoclue + intltool pkgconfig libsoup gtkdoc libXt libproxy + enchant python ruby which renderproto libXrender geoclue perl ]; propagatedBuildInputs = [ diff --git a/pkgs/development/libraries/xine-lib/default.nix b/pkgs/development/libraries/xine-lib/default.nix index 13b2fdce458..4ae48a4c04e 100644 --- a/pkgs/development/libraries/xine-lib/default.nix +++ b/pkgs/development/libraries/xine-lib/default.nix @@ -5,21 +5,13 @@ }: stdenv.mkDerivation rec { - name = "xine-lib-1.2.0"; + name = "xine-lib-1.2.2"; src = fetchurl { - url = "mirror://sourceforge/xine/${name}.tar.bz2"; - sha256 = "1yss9cxxkcb6dzrv78xvi845ls6lhhbv6g8yfm6zjjl07v7jbm6c"; + url = "mirror://sourceforge/xine/${name}.tar.xz"; + sha256 = "1mjk686h1qzqj51h4xs4xvagfgnnhm8czbzzjvr5w034pr8n8rg1"; }; - patches = [ ./zlib126.patch ]; -# patches = -# [ (fetchurl { -# url = "http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/media-libs/xine-lib/files/xine-lib-1.1.19-ffmpeg.patch?revision=1.1"; -# sha256 = "0dqr0kc829djfn0wvk4jg84v61pxynqbp4s4phvywd7x9caf092b"; -# }) -# ]; - buildNativeInputs = [ pkgconfig perl ]; buildInputs = [ diff --git a/pkgs/development/libraries/xine-lib/zlib126.patch b/pkgs/development/libraries/xine-lib/zlib126.patch deleted file mode 100644 index f48063e038b..00000000000 --- a/pkgs/development/libraries/xine-lib/zlib126.patch +++ /dev/null @@ -1,52 +0,0 @@ -http://anonscm.debian.org/hg/xine-lib/xine-lib/rev/24d09421ed09 - -# HG changeset patch -# User Ulrich Müller -# Date 1327945720 0 -# Node ID 24d09421ed09d3a78efeab5c9b8ab31daaaba4fd -# Parent da296856c52e654cf599248de3a01bb754363c79 -Compile failure in osd.c with sys-libs/zlib-1.2.6 - -diff -r da296856c52e -r 24d09421ed09 misc/xine-fontconv.c ---- a/misc/xine-fontconv.c Wed Jan 18 22:01:28 2012 +0000 -+++ b/misc/xine-fontconv.c Mon Jan 30 17:48:40 2012 +0000 -@@ -109,7 +109,7 @@ - osd_font_t font; - - --static int gzwrite_i16(gzFile *fp, uint16_t number) { -+static int gzwrite_i16(gzFile fp, uint16_t number) { - return gzputc(fp, number & 0xFF) != -1 && - gzputc(fp, (number >> 8) & 0xFF) != -1; - } -@@ -341,7 +341,7 @@ - - char filename[1024]; - FT_Bitmap *out_bitmap; -- gzFile *fp; -+ gzFile fp; - int error; - int error_counter; - int glyph_index; -diff -r da296856c52e -r 24d09421ed09 src/xine-engine/osd.c ---- a/src/xine-engine/osd.c Wed Jan 18 22:01:28 2012 +0000 -+++ b/src/xine-engine/osd.c Mon Jan 30 17:48:40 2012 +0000 -@@ -650,7 +650,7 @@ - osd->display_y = y; - } - --static uint16_t gzread_i16(gzFile *fp) { -+static uint16_t gzread_i16(gzFile fp) { - uint16_t ret; - ret = gzgetc(fp); - ret |= (gzgetc(fp)<<8); -@@ -663,7 +663,7 @@ - - static int osd_renderer_load_font(osd_renderer_t *this, char *filename) { - -- gzFile *fp; -+ gzFile fp; - osd_font_t *font = NULL; - int i, ret = 0; - - diff --git a/pkgs/development/ocaml-modules/extlib/default.nix b/pkgs/development/ocaml-modules/extlib/default.nix index 55e1c841830..a520f8196d8 100644 --- a/pkgs/development/ocaml-modules/extlib/default.nix +++ b/pkgs/development/ocaml-modules/extlib/default.nix @@ -8,6 +8,7 @@ stdenv.mkDerivation { sha256 = "ca6d69adeba4242ce41c02a23746ba1e464c0bbec66e2d16b02c3c6e85dc10aa"; }; + patches = [ ./hashtable-ocaml4-compat.patch ]; buildInputs = [ocaml findlib]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/extlib/hashtable-ocaml4-compat.patch b/pkgs/development/ocaml-modules/extlib/hashtable-ocaml4-compat.patch new file mode 100644 index 00000000000..c587f2b6cd3 --- /dev/null +++ b/pkgs/development/ocaml-modules/extlib/hashtable-ocaml4-compat.patch @@ -0,0 +1,12 @@ +Revision 396 from the official extlib repository. + +--- extlib/extHashtbl.ml (revision 395) ++++ extlib/extHashtbl.ml (working copy) +@@ -32,6 +32,7 @@ + } + + include Hashtbl ++ let create n = Hashtbl.create (* no seed *) n + + external h_conv : ('a, 'b) t -> ('a, 'b) h_t = "%identity" + external h_make : ('a, 'b) h_t -> ('a, 'b) t = "%identity" \ No newline at end of file diff --git a/pkgs/development/ocaml-modules/ocamlgraph/default.nix b/pkgs/development/ocaml-modules/ocamlgraph/default.nix index 92a46573117..2e109f1d621 100644 --- a/pkgs/development/ocaml-modules/ocamlgraph/default.nix +++ b/pkgs/development/ocaml-modules/ocamlgraph/default.nix @@ -1,8 +1,8 @@ -{stdenv, fetchurl, ocaml, findlib }: +{stdenv, fetchurl, ocaml, findlib, ocamlPackages }: let ocaml_version = (builtins.parseDrvName ocaml.name).version; - version = "1.8.1"; + version = "1.8.2"; in stdenv.mkDerivation { @@ -10,15 +10,21 @@ stdenv.mkDerivation { src = fetchurl { url = "http://ocamlgraph.lri.fr/download/ocamlgraph-${version}.tar.gz"; - sha256 = "0hrba69wvw9b42irkvjf6q7zzw12v5nyyc33yaq3jlf1qbzqhqxs"; + sha256 = "e54ae60cd977a032854166dad56348d0fb76c6cd8e03e960af455268f0c8b5a6"; }; - buildInputs = [ ocaml findlib ]; + buildInputs = [ ocaml findlib ocamlPackages.lablgtk ]; patches = ./destdir.patch; + # some patching is required so that the lablgtk2 library is taken into account. It + # does not reside in a subdirectory of the default library path, hence: + # * configure looked in the wrong path + # * ocaml needs that directory and the stubs directory as -I flag postPatch = '' sed -i 's@$(DESTDIR)$(OCAMLLIB)/ocamlgraph@$(DESTDIR)/lib/ocaml/${ocaml_version}/site-lib/ocamlgraph@' Makefile.in + sed -i 's@$OCAMLLIB/lablgtk2@${ocamlPackages.lablgtk}/lib/ocaml/${ocaml_version}/site-lib/lablgtk2@' configure Makefile.in + sed -i 's@-I +lablgtk2@-I ${ocamlPackages.lablgtk}/lib/ocaml/${ocaml_version}/site-lib/lablgtk2 -I ${ocamlPackages.lablgtk}/lib/ocaml/${ocaml_version}/site-lib/stublibs@' configure Makefile.in editor/Makefile ''; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/ocamlmake/default.nix b/pkgs/development/ocaml-modules/ocamlmake/default.nix index 23858576efd..0170119d94e 100644 --- a/pkgs/development/ocaml-modules/ocamlmake/default.nix +++ b/pkgs/development/ocaml-modules/ocamlmake/default.nix @@ -2,14 +2,14 @@ let - version = "6.36.0"; - sha256 = "7c9a771d79bf945050dc7530957f4b61669976177818185e64c002cbfd75e3a2"; + version = "6.37.0"; + sha256 = "99ff58080ed154cc4bd70f915fe4760dffb026a1c0447caa0b3bdb982b24b0a8"; in stdenv.mkDerivation { name = "ocaml-make-${version}"; src = fetchurl { - url = "http://hg.ocaml.info/release/ocaml-make/archive/release-${version}.tar.bz2"; + url = "http://bitbucket.org/mmottl/ocaml-makefile/downloads/ocaml-makefile-${version}.tar.gz"; inherit sha256; }; diff --git a/pkgs/development/ocaml-modules/sexplib/default.nix b/pkgs/development/ocaml-modules/sexplib/default.nix index d999dc471bd..32d5c842dc8 100644 --- a/pkgs/development/ocaml-modules/sexplib/default.nix +++ b/pkgs/development/ocaml-modules/sexplib/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "b1022da052254581aae51fb634345920364439f715a2c786abcd0b828c2ce697"; }; - patches = [ ./sexp-3.10-compat.patch ]; + patches = [ ./sexp-3.10-compat.patch ./sexplib-7.0.5-patch-ocamlbuild-ocaml4.patch ]; buildInputs = [ocaml findlib ocaml_typeconv ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/sexplib/sexplib-7.0.5-patch-ocamlbuild-ocaml4.patch b/pkgs/development/ocaml-modules/sexplib/sexplib-7.0.5-patch-ocamlbuild-ocaml4.patch new file mode 100644 index 00000000000..02e13e39445 --- /dev/null +++ b/pkgs/development/ocaml-modules/sexplib/sexplib-7.0.5-patch-ocamlbuild-ocaml4.patch @@ -0,0 +1,29 @@ +Patch from the fedora repository. + +--- sexplib-7.0.5.old/myocamlbuild.ml 2012-03-20 16:41:54.000000000 +0000 ++++ sexplib-7.0.5/myocamlbuild.ml 2012-07-30 11:38:21.829869635 +0100 +@@ -438,7 +438,13 @@ + BaseEnvLight.var_choose cond_specs env + in + flag tags & spec) +- t.flags ++ t.flags; ++ ++ flag ["ocaml"; "compile"; "byte"; "use_toploop"] (S[A"-I"; A"+compiler-libs"]); ++ flag ["ocaml"; "link"; "byte"; "use_toploop"] (S[A"-I"; A"+compiler-libs"; A"+compiler-libs/ocamltoplevel.cma"]); ++ flag ["ocaml"; "compile"; "native"; "use_toploop"] (S[A"-I"; A"+compiler-libs"]); ++ flag ["ocaml"; "link"; "native"; "use_toploop"] (S[A"-I"; A"+compiler-libs"; A"+compiler-libs/ocamltoplevel.cmxa"]); ++ + | _ -> + () + +--- sexplib-7.0.5.old/_tags 2012-03-20 16:41:54.000000000 +0000 ++++ sexplib-7.0.5/_tags 2012-07-30 11:37:01.749255839 +0100 +@@ -49,6 +49,7 @@ + : pkg_camlp4.extend + # Library sexplib_top + "top": include ++: use_toploop + # Executable sexp_test + "lib_test/sexp_test.byte": use_sexplib + "lib_test/sexp_test.byte": pkg_unix diff --git a/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix b/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix index 4aa8b4ad812..c2c7b5f8363 100644 --- a/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix +++ b/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, buildPerlPackage, zlib }: +{ fetchurl, buildPerlPackage, zlib, stdenv }: buildPerlPackage rec { name = "Compress-Raw-Zlib-2.051"; @@ -17,4 +17,6 @@ buildPerlPackage rec { GZIP_OS_CODE = AUTO_DETECT EOF ''; + + doCheck = !stdenv.isDarwin; } diff --git a/pkgs/development/perl-modules/DBD-Pg/default.nix b/pkgs/development/perl-modules/DBD-Pg/default.nix index 29a1da9c7ac..0d0cb1accc5 100644 --- a/pkgs/development/perl-modules/DBD-Pg/default.nix +++ b/pkgs/development/perl-modules/DBD-Pg/default.nix @@ -1,15 +1,17 @@ -{ fetchurl, buildPerlPackage, DBI, postgresql }: +{ stdenv, fetchurl, buildPerlPackage, DBI, postgresql }: buildPerlPackage rec { - name = "DBD-Pg-2.18.1"; - + name = "DBD-Pg-2.19.2"; + src = fetchurl { url = "mirror://cpan/modules/by-module/DBD/${name}.tar.gz"; - sha256 = "10nrmi0hgc9h8c0jbpd9bbbzkdb1riymnlk7a86537c0d4gfqcpm"; + sha256 = "0scnhbp0lfclbppbsfzmcyw32z8jhb9calvbg9q3gk4kli1119j9"; }; - - buildInputs = [postgresql] ; - propagatedBuildInputs = [DBI]; - + + buildInputs = [ postgresql ]; + propagatedBuildInputs = [ DBI ]; + makeMakerFlags = "POSTGRES_HOME=${postgresql}"; + + meta.platforms = stdenv.lib.platforms.linux; } diff --git a/pkgs/development/perl-modules/DBD-SQLite/default.nix b/pkgs/development/perl-modules/DBD-SQLite/default.nix index 8e1faf900a0..bbe50182b90 100644 --- a/pkgs/development/perl-modules/DBD-SQLite/default.nix +++ b/pkgs/development/perl-modules/DBD-SQLite/default.nix @@ -1,15 +1,15 @@ -{fetchurl, buildPerlPackage, DBI, sqlite}: +{ stdenv, fetchurl, buildPerlPackage, DBI, sqlite }: buildPerlPackage rec { name = "DBD-SQLite-1.35"; - + src = fetchurl { url = "mirror://cpan/authors/id/A/AD/ADAMK/${name}.tar.gz"; sha256 = "0zdwnj0jmkaqb2grkh451g1jc8nsdy4sf6lhn8xd0my0a3pd227z"; }; - + propagatedBuildInputs = [ DBI ]; - + makeMakerFlags = "SQLITE_LOCATION=${sqlite}"; patches = [ @@ -17,10 +17,18 @@ buildPerlPackage rec { ./external-sqlite.patch ]; - # Prevent warnings from `strip'. - postInstall = "chmod -R u+w $out"; + postInstall = + '' + # Prevent warnings from `strip'. + chmod -R u+w $out + + # Get rid of a pointless copy of the SQLite sources. + rm -rf $out/lib/perl5/site_perl/*/*/auto/share + ''; # Disabled because the tests can randomly fail due to timeouts # (e.g. "database is locked(5) at dbdimp.c line 402 at t/07busy.t"). doCheck = false; + + meta.platforms = stdenv.lib.platforms.linux; } diff --git a/pkgs/development/perl-modules/DB_File/default.nix b/pkgs/development/perl-modules/DB_File/default.nix index 858d459f5ca..f6396af8b65 100644 --- a/pkgs/development/perl-modules/DB_File/default.nix +++ b/pkgs/development/perl-modules/DB_File/default.nix @@ -1,11 +1,11 @@ {fetchurl, buildPerlPackage, db4}: -buildPerlPackage { - name = "DB_File-1.820"; - +buildPerlPackage rec { + name = "DB_File-1.826"; + src = fetchurl { - url = mirror://cpan/authors/id/P/PM/PMQS/DB_File-1.820.tar.gz; - sha256 = "0jnz5lsrad67j42sdw5bqpkmgiyj45rpiqgkff3i21252k9d5s7a"; + url = "mirror://cpan/authors/id/P/PM/PMQS/${name}.tar.gz"; + sha256 = "c39828ef3cfecff8197ff057cb1c6127b87107c051d182b87c6b9ac79d23f09c"; }; preConfigure = '' diff --git a/pkgs/development/python-modules/pyqt/default.nix b/pkgs/development/python-modules/pyqt/default.nix index 358254dd013..9b1d74ff616 100644 --- a/pkgs/development/python-modules/pyqt/default.nix +++ b/pkgs/development/python-modules/pyqt/default.nix @@ -4,7 +4,10 @@ stdenv.mkDerivation rec { name = "PyQt-x11-gpl-4.9.1"; src = fetchurl { - url = "http://www.riverbankcomputing.co.uk/static/Downloads/PyQt4/${name}.tar.gz"; + urls = [ + "http://www.riverbankcomputing.co.uk/static/Downloads/PyQt4/${name}.tar.gz" + "http://pkgs.fedoraproject.org/lookaside/pkgs/PyQt4/PyQt-x11-gpl-4.9.1.tar.gz/7f495dc49f71e3bfb64bf942e0d8bb3c/PyQt-x11-gpl-4.9.1.tar.gz" + ]; sha256 = "1ccvc80z8a0k0drvba9ngivsnv2k2nn5317yf86w1zwh45zmb0zj"; }; diff --git a/pkgs/development/tools/analysis/valgrind/default.nix b/pkgs/development/tools/analysis/valgrind/default.nix index a625de6ffdc..a5042ffc7d4 100644 --- a/pkgs/development/tools/analysis/valgrind/default.nix +++ b/pkgs/development/tools/analysis/valgrind/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perl, gdb }: stdenv.mkDerivation (rec { - name = "valgrind-3.7.0"; + name = "valgrind-3.8.0"; src = fetchurl { url = "http://valgrind.org/downloads/${name}.tar.bz2"; - sha256 = "1xnb4jiimscwriw3jd1lkk0m9x4glqpijj9jb4ngx08l1wrw0qjx"; + sha256 = "1310lxmzidrbv0l3hrf45ampkf61gv2vb8msnqm684lp41gmh5px"; }; # Perl is needed for `cg_annotate'. diff --git a/pkgs/development/tools/boomerang/default.nix b/pkgs/development/tools/boomerang/default.nix new file mode 100644 index 00000000000..eadeb51d1b3 --- /dev/null +++ b/pkgs/development/tools/boomerang/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchgit, cmake, boehmgc, expat, cppunit }: + +stdenv.mkDerivation { + name = "boomerang-1.0pre"; + + buildInputs = [ cmake boehmgc expat cppunit ]; + + installPhase = '' + for loaderfile in loader/*.so + do + install -vD "$loaderfile" "$out/lib/$(basename "$loaderfile")" + done + + install -vD boomerang "$out/bin/boomerang" + ''; + + patches = [ ./dlopen_path.patch ]; + + src = fetchgit { + url = "git://github.com/aszlig/boomerang.git"; + rev = "d0b147a5dfc915a5fa8fe6c517e66a049a37bf22"; + sha256 = "6cfd95a3539ff45c18b17de76407568b0d0c17fde4e45dda54486c7eac113969"; + }; + + meta = { + homepage = http://boomerang.sourceforge.net/; + license = stdenv.lib.licenses.bsd3; + description = "A general, open source, retargetable decompiler"; + }; +} diff --git a/pkgs/development/tools/boomerang/dlopen_path.patch b/pkgs/development/tools/boomerang/dlopen_path.patch new file mode 100644 index 00000000000..1e4bf3c75a3 --- /dev/null +++ b/pkgs/development/tools/boomerang/dlopen_path.patch @@ -0,0 +1,13 @@ +diff --git a/loader/BinaryFileFactory.cpp b/loader/BinaryFileFactory.cpp +index 889a4ed..ca86765 100644 +--- a/loader/BinaryFileFactory.cpp ++++ b/loader/BinaryFileFactory.cpp +@@ -109,7 +109,7 @@ BinaryFile* BinaryFileFactory::getInstanceFor( const char *sName ) { + + // Load the specific loader library + #ifndef _WIN32 // Cygwin, Unix/Linux +- libName = std::string("lib/lib") + libName; ++ libName = std::string("lib") + libName; + #ifdef __CYGWIN__ + libName += ".dll"; // Cygwin wants .dll, but is otherwise like Unix + #else diff --git a/pkgs/development/tools/documentation/haddock/2.11.0.nix b/pkgs/development/tools/documentation/haddock/2.11.0.nix new file mode 100644 index 00000000000..92dccbf05a6 --- /dev/null +++ b/pkgs/development/tools/documentation/haddock/2.11.0.nix @@ -0,0 +1,18 @@ +{ cabal, alex, Cabal, filepath, ghcPaths, happy, xhtml }: + +cabal.mkDerivation (self: { + pname = "haddock"; + version = "2.11.0"; + sha256 = "0a29n6y9lmk5w78f6j8s7pg0m0k3wm7bx5r2lhk7bnzkr5f7rkcd"; + isLibrary = true; + isExecutable = true; + buildDepends = [ Cabal filepath ghcPaths xhtml ]; + buildTools = [ alex happy ]; + meta = { + homepage = "http://www.haskell.org/haddock/"; + description = "A documentation-generation tool for Haskell libraries"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/tools/documentation/haddock/2.12.0.nix b/pkgs/development/tools/documentation/haddock/2.12.0.nix new file mode 100644 index 00000000000..39610f9a08c --- /dev/null +++ b/pkgs/development/tools/documentation/haddock/2.12.0.nix @@ -0,0 +1,18 @@ +{ cabal, alex, Cabal, deepseq, filepath, ghcPaths, happy, xhtml }: + +cabal.mkDerivation (self: { + pname = "haddock"; + version = "2.12.0"; + sha256 = "00kdmpa6vhn6x790641ln40v3pn7aj4ws6pq854n1iyg5ly3ridn"; + isLibrary = true; + isExecutable = true; + buildDepends = [ Cabal deepseq filepath ghcPaths xhtml ]; + buildTools = [ alex happy ]; + meta = { + homepage = "http://www.haskell.org/haddock/"; + description = "A documentation-generation tool for Haskell libraries"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/tools/haskell/BNFC/default.nix b/pkgs/development/tools/haskell/BNFC/default.nix index c06b5eacc24..e737a02a4ac 100644 --- a/pkgs/development/tools/haskell/BNFC/default.nix +++ b/pkgs/development/tools/haskell/BNFC/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "BNFC"; - version = "2.4.2.0"; - sha256 = "0nnalzsql1k5y3s93g5y2hy2gcdsrbi8r7cwzmdcy4vyy589pin0"; + version = "2.4.2.1"; + sha256 = "0a6ic9mqkxk2gql7dzik2bhm5iikgx035wxlz8iafxf45159dl14"; isLibrary = false; isExecutable = true; buildDepends = [ mtl ]; diff --git a/pkgs/development/tools/haskell/SourceGraph/default.nix b/pkgs/development/tools/haskell/SourceGraph/default.nix index 731722126ca..382a940408f 100644 --- a/pkgs/development/tools/haskell/SourceGraph/default.nix +++ b/pkgs/development/tools/haskell/SourceGraph/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "SourceGraph"; - version = "0.7.0.2"; - sha256 = "0cdspzsz15r83fjry9467z67h6vvnjh31fip6gf64k74gdjkfisl"; + version = "0.7.0.3"; + sha256 = "04bx7przxha38n9vckcxz3mbcxcws5ifbc1xfm0rg6bn8rym78yb"; isLibrary = false; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/tools/haskell/cabal2nix/default.nix b/pkgs/development/tools/haskell/cabal2nix/default.nix index 091417cb8a3..72c032342d9 100644 --- a/pkgs/development/tools/haskell/cabal2nix/default.nix +++ b/pkgs/development/tools/haskell/cabal2nix/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "cabal2nix"; - version = "1.37"; - sha256 = "0gd20nzr3bqscd4pn0j3vsmnhxiypbv5ppncmi0ck5n4ii8c6m94"; + version = "1.39"; + sha256 = "0q2kgzjbcrqxml12hncsrkjdwjiq52dp00v6i3qdgiyj460iy60d"; isLibrary = false; isExecutable = true; buildDepends = [ Cabal filepath hackageDb HTTP mtl regexPosix ]; diff --git a/pkgs/development/tools/haskell/hlint/default.nix b/pkgs/development/tools/haskell/hlint/default.nix index 3b2afdd791e..bb61bbaa7dc 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.29"; - sha256 = "07l281106kkahdzgilhh2njjirll0mhr318i3zmhn2ygcb9dvkdr"; + version = "1.8.31"; + sha256 = "0d7m7viqf1cawbafiy4nj67hkavlxkv537qypy2vlhr502fispa4"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/tools/haskell/hslogger/default.nix b/pkgs/development/tools/haskell/hslogger/default.nix index b181f164ed9..4128f6b7d09 100644 --- a/pkgs/development/tools/haskell/hslogger/default.nix +++ b/pkgs/development/tools/haskell/hslogger/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "hslogger"; - version = "1.1.5"; - sha256 = "0lk966csxxyjjdg5jg4pzzl5118zj8ms78vn1n9imb7f4vcs8vk7"; + version = "1.2.0"; + sha256 = "17ipnz7zd403x2gi2086chrgcnk76304hdxr5mv4phg4rm8w226y"; isLibrary = true; isExecutable = true; buildDepends = [ mtl network time ]; diff --git a/pkgs/development/tools/haskell/jailbreak-cabal/default.nix b/pkgs/development/tools/haskell/jailbreak-cabal/default.nix new file mode 100644 index 00000000000..303e7ceb2c3 --- /dev/null +++ b/pkgs/development/tools/haskell/jailbreak-cabal/default.nix @@ -0,0 +1,17 @@ +{ cabal, Cabal }: + +cabal.mkDerivation (self: { + pname = "jailbreak-cabal"; + version = "1.0"; + sha256 = "10vq592fx1i3fdqiij7daf3dmqq5c8c29ihr2y1rn2pjhkyiy4kk"; + isLibrary = false; + isExecutable = true; + buildDepends = [ Cabal ]; + meta = { + homepage = "http://github.com/peti/jailbreak-cabal"; + description = "Strip version restrictions from build dependencies in Cabal files"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.simons ]; + }; +}) diff --git a/pkgs/development/tools/misc/autobuild/default.nix b/pkgs/development/tools/misc/autobuild/default.nix index 872dcb6c84c..f8497b5dece 100644 --- a/pkgs/development/tools/misc/autobuild/default.nix +++ b/pkgs/development/tools/misc/autobuild/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "autobuild-3.5"; src = fetchurl { - url = "http://josefsson.org/autobuild/releases/${name}.tar.gz"; + url = "http://savannah.spinellicreations.com/autobuild/${name}.tar.gz"; sha256 = "0ik13913x1yj8lsaf65chpiw13brl3q6kx7s1fa41a7s2krl1xvi"; }; diff --git a/pkgs/development/tools/misc/autoconf/default.nix b/pkgs/development/tools/misc/autoconf/default.nix index ce18fd1a377..b4de66d9baf 100644 --- a/pkgs/development/tools/misc/autoconf/default.nix +++ b/pkgs/development/tools/misc/autoconf/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, m4, perl }: stdenv.mkDerivation rec { - name = "autoconf-2.68"; + name = "autoconf-2.69"; src = fetchurl { - url = "mirror://gnu/autoconf/${name}.tar.bz2"; - sha256 = "1j1j8d2p3r9mzx8b2hnmfqy2683r2wyyvki6bs9cmm6n7wkzp4f4"; + url = "mirror://gnu/autoconf/${name}.tar.xz"; + sha256 = "113nlmidxy9kjr45kg9x3ngar4951mvag1js2a3j8nxcz34wxsv4"; }; buildInputs = [ m4 perl ]; @@ -14,13 +14,19 @@ stdenv.mkDerivation rec { # http://thread.gmane.org/gmane.comp.sysutils.autoconf.bugs/6822 for # details. # There are many test failures on `i386-pc-solaris2.11'. - doCheck = (stdenv.system != "i686-cygwin" - && stdenv.system != "i686-solaris"); + doCheck = ((!stdenv.isCygwin) && (!stdenv.isSunOS)); # Don't fixup "#! /bin/sh" in Autoconf, otherwise it will use the # "fixed" path in generated files! dontPatchShebangs = true; + enableParallelBuilding = true; + + preCheck = + # Make the Autotest test suite run in parallel. + '' export TESTSUITEFLAGS="-j$NIX_BUILD_CORES" + ''; + meta = { homepage = http://www.gnu.org/software/autoconf/; description = "GNU Autoconf, a part of the GNU Build System"; diff --git a/pkgs/development/tools/misc/automake/automake-1.11.x.nix b/pkgs/development/tools/misc/automake/automake-1.11.x.nix index 65ef3a9a146..7c9d06baa54 100644 --- a/pkgs/development/tools/misc/automake/automake-1.11.x.nix +++ b/pkgs/development/tools/misc/automake/automake-1.11.x.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, perl, autoconf, makeWrapper, doCheck ? true}: stdenv.mkDerivation rec { - name = "automake-1.11.2"; + name = "automake-1.11.6"; # TODO: Remove the `aclocal' wrapper when $ACLOCAL_PATH support is # available upstream; see @@ -11,10 +11,12 @@ stdenv.mkDerivation rec { setupHook = ./setup-hook.sh; src = fetchurl { - url = "mirror://gnu/automake/${name}.tar.bz2"; - sha256 = "06476qbd16dlasz29drmljqmr4gwx4qgcl075033b2hc73wx2ijg"; + url = "mirror://gnu/automake/${name}.tar.xz"; + sha256 = "1ffbc6cc41f0ea6c864fbe9485b981679dc5e350f6c4bc6c3512f5a4226936b5"; }; + patches = [ ./fix-test-autoconf-2.69.patch ]; + buildInputs = [perl autoconf makeWrapper]; inherit doCheck; @@ -27,6 +29,9 @@ stdenv.mkDerivation rec { # "fixed" path in generated files! dontPatchShebangs = true; + # Run the test suite in parallel. + enableParallelBuilding = true; + meta = { homepage = http://www.gnu.org/software/automake/; description = "GNU Automake, a GNU standard-compliant makefile generator"; diff --git a/pkgs/development/tools/misc/automake/automake-1.12.x.nix b/pkgs/development/tools/misc/automake/automake-1.12.x.nix new file mode 100644 index 00000000000..e2db84d2fc3 --- /dev/null +++ b/pkgs/development/tools/misc/automake/automake-1.12.x.nix @@ -0,0 +1,53 @@ +{stdenv, fetchurl, perl, autoconf, makeWrapper, doCheck ? true}: + +stdenv.mkDerivation rec { + name = "automake-1.12.2"; + + # TODO: Remove the `aclocal' wrapper when $ACLOCAL_PATH support is + # available upstream; see + # . + builder = ./builder.sh; + + setupHook = ./setup-hook.sh; + + src = fetchurl { + url = "mirror://gnu/automake/${name}.tar.xz"; + sha256 = "5fb56e918189b377a22368e19baaf70252bd85a9969ed5f8a8373f49e8faf07f"; + }; + + buildInputs = [perl autoconf makeWrapper]; + + # This test succeeds on my machine, but fails on Hydra (for reasons + # not yet understood). + patchPhase = '' + sed -i -e 's|t/aclocal7.sh||' Makefile.in + ''; + + inherit doCheck; + + # The test suite can run in parallel. + enableParallelBuilding = true; + + # Disable indented log output from Make, otherwise "make.test" will + # fail. + preCheck = "unset NIX_INDENT_MAKE"; + + # Don't fixup "#! /bin/sh" in Libtool, otherwise it will use the + # "fixed" path in generated files! + dontPatchShebangs = true; + + meta = { + homepage = http://www.gnu.org/software/automake/; + description = "GNU Automake, a GNU standard-compliant makefile generator"; + + longDescription = '' + GNU Automake is a tool for automatically generating + `Makefile.in' files compliant with the GNU Coding + Standards. Automake requires the use of Autoconf. + ''; + + license = "GPLv2+"; + + maintainers = [ stdenv.lib.maintainers.ludo ]; + }; +} diff --git a/pkgs/development/tools/misc/automake/automake-1.7.x.nix b/pkgs/development/tools/misc/automake/automake-1.7.x.nix deleted file mode 100644 index e0d8e516d3b..00000000000 --- a/pkgs/development/tools/misc/automake/automake-1.7.x.nix +++ /dev/null @@ -1,18 +0,0 @@ -{stdenv, fetchurl, perl, autoconf, makeWrapper}: - -stdenv.mkDerivation { - name = "automake-1.7.9"; - - builder = ./builder.sh; - - src = fetchurl { - url = http://nixos.org/tarballs/automake-1.7.9.tar.bz2; - md5 = "571fd0b0598eb2a27dcf68adcfddfacb"; - }; - - buildInputs = [perl autoconf makeWrapper]; - - # Don't fixup "#! /bin/sh" in Libtool, otherwise it will use the - # "fixed" path in generated files! - dontPatchShebangs = true; -} diff --git a/pkgs/development/tools/misc/automake/automake-1.9.x.nix b/pkgs/development/tools/misc/automake/automake-1.9.x.nix deleted file mode 100644 index 5ca279d23ad..00000000000 --- a/pkgs/development/tools/misc/automake/automake-1.9.x.nix +++ /dev/null @@ -1,33 +0,0 @@ -{stdenv, fetchurl, perl, autoconf, makeWrapper}: - -stdenv.mkDerivation { - name = "automake-1.9.6"; - - builder = ./builder.sh; - - setupHook = ./setup-hook.sh; - - src = fetchurl { - url = ftp://ftp.gnu.org/gnu/automake/automake-1.9.6.tar.gz; - md5 = "c60f77a42f103606981d456f1615f5b4"; - }; - - buildInputs = [perl autoconf makeWrapper]; - - # Don't fixup "#! /bin/sh" in Libtool, otherwise it will use the - # "fixed" path in generated files! - dontPatchShebangs = true; - - meta = { - homepage = http://www.gnu.org/software/automake/; - description = "GNU Automake, a GNU standard-compliant makefile generator"; - - longDescription = '' - GNU Automake is a tool for automatically generating - `Makefile.in' files compliant with the GNU Coding - Standards. Automake requires the use of Autoconf. - ''; - - license = "GPLv2+"; - }; -} diff --git a/pkgs/development/tools/misc/automake/builder.sh b/pkgs/development/tools/misc/automake/builder.sh index 7f9e9219de3..e54a2acca67 100644 --- a/pkgs/development/tools/misc/automake/builder.sh +++ b/pkgs/development/tools/misc/automake/builder.sh @@ -36,10 +36,12 @@ postInstall() { # global directory, while callers of `aclocal' do not need to pass # `-I' options explicitly. - for prog in $out/bin/aclocal*; do + for prog in $out/bin/aclocal*; do wrapAclocal "$prog" done + + ln -s aclocal-1.11 $out/share/aclocal + ln -s automake-1.11 $out/share/automake } - genericBuild diff --git a/pkgs/development/tools/misc/automake/fix-test-autoconf-2.69.patch b/pkgs/development/tools/misc/automake/fix-test-autoconf-2.69.patch new file mode 100644 index 00000000000..2ffa91f24ed --- /dev/null +++ b/pkgs/development/tools/misc/automake/fix-test-autoconf-2.69.patch @@ -0,0 +1,13 @@ +With Autoconf 2.69 (instead of 2.68), config.{guess,sub} are needed. + +--- automake-1.11.2/tests/compile_f90_c_cxx.test 2011-12-20 21:56:29.000000000 +0100 ++++ automake-1.11.2/tests/compile_f90_c_cxx.test 2012-07-07 13:35:58.000000000 +0200 +@@ -41,7 +41,7 @@ END + : > baz.cc + + $ACLOCAL +-$AUTOMAKE ++$AUTOMAKE --add-missing + + # Look for the macros at the beginning of rules. Be careful, as there + # are literal tabs at the beginning of the search strings. diff --git a/pkgs/development/tools/misc/coccinelle/default.nix b/pkgs/development/tools/misc/coccinelle/default.nix index 0b5fa4b8d61..044ae8f93a0 100644 --- a/pkgs/development/tools/misc/coccinelle/default.nix +++ b/pkgs/development/tools/misc/coccinelle/default.nix @@ -1,9 +1,9 @@ -{ fetchurl, stdenv, python, ncurses, ocamlPackages, makeWrapper }: +{ fetchurl, stdenv, python, ncurses, ocamlPackages, pkgconfig }: let - name = "coccinelle-1.0.0-rc12"; - sha256 = "03b8930a53623ec79dc2486e9b6a569e373958cf46074c5f1d0028c70708498d"; + name = "coccinelle-1.0.0-rc15"; + sha256 = "07fab4e17512925b958890bb13c0809797074f2e44a1107b0074bdcc156b9596"; in stdenv.mkDerivation { inherit name; @@ -15,12 +15,14 @@ in stdenv.mkDerivation { buildInputs = with ocamlPackages; [ ocaml findlib menhir - ocaml_pcre ocaml_sexplib pycaml - python ncurses makeWrapper + ocaml_pcre pycaml + python ncurses pkgconfig ]; - configureFlagsArray = [ "--enable-release" ]; - + # TODO: is the generation of this wrapper truly/still needed? + # I don't have a non-NixOS system, so I cannot verify this, but shouldn't + # libpython know where to find its modules? (the path is for example in + # its Sys-module). postInstall = # On non-NixOS systems, Coccinelle would end up looking up Python modules # in the wrong directory. @@ -31,6 +33,8 @@ in stdenv.mkDerivation { done ''; + configureFlags = "--enable-release"; + meta = { description = "Coccinelle, a program to apply C code semantic patches"; diff --git a/pkgs/development/tools/misc/cpphs/default.nix b/pkgs/development/tools/misc/cpphs/default.nix index fe20037cb95..4fbce76474c 100644 --- a/pkgs/development/tools/misc/cpphs/default.nix +++ b/pkgs/development/tools/misc/cpphs/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "cpphs"; - version = "1.13.3"; - sha256 = "1dnz4992hr662ys1lkf6iyqmi2a3bksim8dlryqwd9wx9h24lhq2"; + version = "1.14"; + sha256 = "1lscgylcbbny60lx36xwm8y22jmbv23159pfn8n87kbskq6cpk0z"; isLibrary = true; isExecutable = true; meta = { diff --git a/pkgs/development/tools/misc/cscope/default.nix b/pkgs/development/tools/misc/cscope/default.nix index 3cba5cd2e76..b9d2c10f537 100644 --- a/pkgs/development/tools/misc/cscope/default.nix +++ b/pkgs/development/tools/misc/cscope/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, ncurses, pkgconfig, emacs}: stdenv.mkDerivation rec { - name = "cscope-15.7a"; + name = "cscope-15.8a"; src = fetchurl { - url = "mirror://sourceforge/cscope/${name}.tar.bz2"; - sha256 = "0dv0r66x31y2xxvad54x0wal8yb1krwbx3gjc82qpg4hlz5qnqq2"; + url = "mirror://sourceforge/cscope/${name}.tar.gz"; + sha256 = "07jdhxvp3dv7acvp0pwsdab1g2ncxjlcf838lj7vxgjs1p26lwzb"; }; preConfigure = '' diff --git a/pkgs/development/tools/misc/frama-c/0007-Port-to-OCamlgraph-1.8.2.patch b/pkgs/development/tools/misc/frama-c/0007-Port-to-OCamlgraph-1.8.2.patch new file mode 100644 index 00000000000..1c16e1794ab --- /dev/null +++ b/pkgs/development/tools/misc/frama-c/0007-Port-to-OCamlgraph-1.8.2.patch @@ -0,0 +1,64 @@ +From: Mehdi Dogguy +Date: Wed, 16 May 2012 14:48:40 +0200 +Subject: Port to OCamlgraph 1.8.2 + + o Graph.Topological: as of OCamlgraph 1.8.2, the input graph must + implement Sig.COMPARABLE instead of Sig.HASHABLE +--- + src/misc/service_graph.ml | 2 +- + src/misc/service_graph.mli | 2 +- + src/semantic_callgraph/register.ml | 1 + + src/syntactic_callgraph/register.ml | 1 + + 4 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/src/misc/service_graph.ml b/src/misc/service_graph.ml +index f30a1be..567698f 100644 +--- a/src/misc/service_graph.ml ++++ b/src/misc/service_graph.ml +@@ -24,7 +24,7 @@ module Make + (G: sig + type t + module V: sig +- include Graph.Sig.HASHABLE ++ include Graph.Sig.COMPARABLE + val id: t -> int + val name: t -> string + val attributes: t -> Graph.Graphviz.DotAttributes.vertex list +diff --git a/src/misc/service_graph.mli b/src/misc/service_graph.mli +index 5ebb570..8006977 100644 +--- a/src/misc/service_graph.mli ++++ b/src/misc/service_graph.mli +@@ -28,7 +28,7 @@ module Make + (G: sig + type t + module V: sig +- include Graph.Sig.HASHABLE ++ include Graph.Sig.COMPARABLE + val id: t -> int + (** assume is >= 0 and unique for each vertices of the graph *) + val name: t -> string +diff --git a/src/semantic_callgraph/register.ml b/src/semantic_callgraph/register.ml +index 0b3b4df..064dca8 100644 +--- a/src/semantic_callgraph/register.ml ++++ b/src/semantic_callgraph/register.ml +@@ -107,6 +107,7 @@ module Service = + (if Kernel_function.is_definition v then `Bold + else `Dotted) ] + let equal = Kernel_function.equal ++ let compare v1 v2 = Datatype.Int.compare (id v1) (id v2) + let hash = Kernel_function.hash + let entry_point () = + try Some (fst (Globals.entry_point ())) +diff --git a/src/syntactic_callgraph/register.ml b/src/syntactic_callgraph/register.ml +index 4efb594..d9d78b9 100644 +--- a/src/syntactic_callgraph/register.ml ++++ b/src/syntactic_callgraph/register.ml +@@ -41,6 +41,7 @@ module Service = + | NIVar (_,b) when not !b -> `Style `Dotted + | _ -> `Style `Bold ] + let equal v1 v2 = id v1 = id v2 ++ let compare v1 v2 = Datatype.Int.compare (id v1) (id v2) + let hash = id + let entry_point () = !entry_point_ref + end +-- diff --git a/pkgs/development/tools/misc/frama-c/default.nix b/pkgs/development/tools/misc/frama-c/default.nix new file mode 100644 index 00000000000..ede316b4b7b --- /dev/null +++ b/pkgs/development/tools/misc/frama-c/default.nix @@ -0,0 +1,67 @@ +# Note on a potential dependency-bloat: +# Frama-c ships with several plugins that have dependencies on other +# software. Not providing the dependencies has as effect that certain +# plugins will not be available. +# I've included the dependencies that are well-supported by nixpkgs +# and seem useful in general. Not included are: +# alt-ergo, ltl2ba, otags, why-dp + +{ stdenv, fetchurl, ncurses, ocamlPackages, coq, graphviz }: + +let + + version = "20111001"; + sha256 = "8afad848321c958fab265045cd152482e77ce7c175ee7c9af2d4bec57a1bc671"; + +in stdenv.mkDerivation { + name = "frama-c-${version}"; + + src = fetchurl { + url = "http://frama-c.com/download/frama-c-Nitrogen-${version}.tar.gz"; + inherit sha256; + }; + + buildInputs = with ocamlPackages; [ + ncurses ocaml findlib ocamlgraph + lablgtk coq graphviz # optional dependencies + ]; + + patches = [ + # this patch comes from the debian frama-c package, and was + # posted on the frama-c issue tracker. + ./0007-Port-to-OCamlgraph-1.8.2.patch + ]; + + postPatch = '' + # strip absolute paths to /usr/bin + for file in ./configure ./share/Makefile.common ./src/*/configure; do + substituteInPlace $file --replace '/usr/bin/' "" + done + + # find library paths + OCAMLGRAPH_HOME=`ocamlfind query ocamlgraph` + LABLGTK_HOME=`ocamlfind query lablgtk2` + + # patch search paths + # ensure that the tests against the ocamlgraph version succeeds + # filter out the additional search paths from ocamldep + substituteInPlace ./configure \ + --replace '$OCAMLLIB/ocamlgraph' "$OCAMLGRAPH_HOME" \ + --replace '$OCAMLLIB/lablgtk2' "$LABLGTK_HOME" \ + --replace '+ocamlgraph' "$OCAMLGRAPH_HOME" \ + --replace '1.8)' '*)' + substituteInPlace ./Makefile --replace '+lablgtk2' "$LABLGTK_HOME" \ + --replace '$(patsubst +%,.,$(INCLUDES) $(GUI_INCLUDES))' \ + '$(patsubst /%,.,$(patsubst +%,.,$(INCLUDES) $(GUI_INCLUDES)))' + ''; + + meta = { + description = "Frama-C is an extensible tool for source-code analysis of C software"; + + homepage = http://frama-c.com/; + license = "GPLv2"; + + maintainers = [ stdenv.lib.maintainers.amiddelk ]; + platforms = stdenv.lib.platforms.gnu; + }; +} diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix index 1bc908185be..08fde14eb53 100644 --- a/pkgs/development/tools/misc/gdb/default.nix +++ b/pkgs/development/tools/misc/gdb/default.nix @@ -8,7 +8,7 @@ let - basename = "gdb-7.4.1"; + basename = "gdb-7.5"; # Whether (cross-)building for GNU/Hurd. This is an approximation since # having `stdenv ? cross' doesn't tell us if we're building `hostDrv' and @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnu/gdb/${basename}.tar.bz2"; - md5 = "8854d34691087ec127d934692639855f"; + md5 = "24a6779a9fe0260667710de1b082ef61"; }; # I think python is not a native input, but I leave it diff --git a/pkgs/development/tools/misc/gdb/pstack.nix b/pkgs/development/tools/misc/gdb/pstack.nix new file mode 100644 index 00000000000..12cdc654260 --- /dev/null +++ b/pkgs/development/tools/misc/gdb/pstack.nix @@ -0,0 +1,11 @@ +{ stdenv, gdb }: +stdenv.mkDerivation { + name = "pstack-20120823"; + buildCommand = '' + mkdir -p $out/bin + cat > $out/bin/pstack <" stdenv.lib.maintainers.shlevy ]; + maintainers = [ stdenv.lib.maintainers.page stdenv.lib.maintainers.shlevy ]; license = "unfree-redistributable"; }; } diff --git a/pkgs/games/speed-dreams/default.nix b/pkgs/games/speed-dreams/default.nix index 2a6b239608f..e14b9b26a4f 100644 --- a/pkgs/games/speed-dreams/default.nix +++ b/pkgs/games/speed-dreams/default.nix @@ -16,9 +16,10 @@ stdenv.mkDerivation rec { cd */ ''; - buildInputs = [ mesa freeglut libX11 plib openal freealut libXrandr xproto - libXext libSM libICE libXi libXt libXrender libXxf86vm libpng zlib bash - p7zip SDL enet libjpeg cmake]; + # Order important; it wants libpng12 and some x libs propagate libpng15 + buildInputs = [ libpng mesa freeglut libX11 plib openal freealut libXrandr xproto + libXext libSM libICE libXi libXt libXrender libXxf86vm zlib bash + p7zip SDL enet libjpeg cmake ]; installTargets = "install"; diff --git a/pkgs/games/ufoai/default.nix b/pkgs/games/ufoai/default.nix index 80f527e26e1..85440f88901 100644 --- a/pkgs/games/ufoai/default.nix +++ b/pkgs/games/ufoai/default.nix @@ -22,7 +22,8 @@ stdenv.mkDerivation rec { # for the xvidcore static lib NIX_CFLAGS_COMPILE = "-pthread -lm"; - buildInputs = [ SDL mesa SDL_image SDL_ttf SDL_mixer libpng libjpeg zlib curl libvorbis + # Order is important, x libs include a libpng version that fails for ufoai + buildInputs = [ libpng SDL mesa SDL_image SDL_ttf SDL_mixer libjpeg zlib curl libvorbis libtheora xvidcore pkgconfig glib gtk gtkglext gtksourceview libxml2 openal gettext p7zip ]; diff --git a/pkgs/lib/attrsets.nix b/pkgs/lib/attrsets.nix index 5e4e9df3711..63448847a15 100644 --- a/pkgs/lib/attrsets.nix +++ b/pkgs/lib/attrsets.nix @@ -5,12 +5,12 @@ with { inherit (import ./trivial.nix) or; inherit (import ./default.nix) fold; inherit (import ./strings.nix) concatStringsSep; - inherit (import ./lists.nix) concatMap; - inherit (import ./misc.nix) eqStrict; + inherit (import ./lists.nix) concatMap concatLists all; + inherit (import ./misc.nix) maybeAttr; }; rec { - inherit (builtins) attrNames listToAttrs hasAttr isAttrs; + inherit (builtins) attrNames listToAttrs hasAttr isAttrs getAttr; /* Return an attribute from nested attribute sets. For instance @@ -33,15 +33,6 @@ rec { nameValuePair (head attrPath) (setAttrByPath (tail attrPath) value) )]; - - /* Backwards compatibility hack: lib.attrByPath used to be called - lib.getAttr, which was confusing given that there was also a - builtins.getAttr. Eventually we'll drop this hack and - lib.getAttr will just be an alias for builtins.getAttr. */ - getAttr = a: b: if isString a - then builtins.getAttr a b - else c: builtins.trace "Deprecated use of lib.getAttr!" (attrByPath a b c); - getAttrFromPath = attrPath: set: let errorMsg = "cannot find attribute `" + concatStringsSep "." attrPath + "'"; @@ -75,7 +66,7 @@ rec { catAttrs "a" [{a = 1;} {b = 0;} {a = 2;}] => [1 2] */ - catAttrs = attr: l: fold (s: l: if hasAttr attr s then [(getAttr attr s)] ++ l else l) [] l; + catAttrs = attr: l: concatLists (map (s: if hasAttr attr s then [(getAttr attr s)] else []) l); /* Filter an attribute set by removing all attributes for which the @@ -88,6 +79,16 @@ rec { filterAttrs = pred: set: listToAttrs (fold (n: ys: let v = getAttr n set; in if pred n v then [(nameValuePair n v)] ++ ys else ys) [] (attrNames set)); + /* foldAttrs: apply fold functions to values grouped by key. Eg accumulate values as list: + foldAttrs (n: a: [n] ++ a) [] [{ a = 2; } { a = 3; }] + => { a = [ 2 3 ]; } + */ + foldAttrs = op: nul: list_of_attrs: + fold (n: a: + fold (name: o: + o // (listToAttrs [{inherit name; value = op (getAttr name n) (maybeAttr name nul a); }]) + ) a (attrNames n) + ) {} list_of_attrs; /* Recursively collect sets that verify a given predicate named `pred' from the set `attrs'. The recursion is stopped when the predicate is @@ -301,9 +302,9 @@ rec { matchAttrs = pattern: attrs: fold or false (attrValues (zipAttrsWithNames (attrNames pattern) (n: values: let pat = head values; val = head (tail values); in - if tail values == [] then false + if length values == 1 then false else if isAttrs pat then isAttrs val && matchAttrs head values - else eqStrict pat val + else pat == val ) [pattern attrs])); # override only the attributes that are already present in the old set diff --git a/pkgs/lib/debug.nix b/pkgs/lib/debug.nix index e452151add6..b78f946c5d4 100644 --- a/pkgs/lib/debug.nix +++ b/pkgs/lib/debug.nix @@ -66,7 +66,7 @@ rec { let testsToRun = if tests ? tests then tests.tests else []; in if (substring 0 4 name == "test" || elem name testsToRun) && ((testsToRun == []) || elem name tests.tests) - && (!lib.eqStrict test.expr test.expected) + && (test.expr != test.expected) then [ { inherit name; expected = test.expected; result = test.expr; } ] else [] ) tests)); diff --git a/pkgs/lib/licenses.nix b/pkgs/lib/licenses.nix index dc88f887cc7..87f9298706e 100644 --- a/pkgs/lib/licenses.nix +++ b/pkgs/lib/licenses.nix @@ -175,6 +175,12 @@ shortName = "Proprietary"; fullName = "Proprietary (non redistributable) license"; }; + + tcltk = { + shortName = "Tcl/Tk"; + fullName = "Tcl/Tk license"; + url = http://www.tcl.tk/software/tcltk/license.html; + }; zlib = { shortName = "zlib"; diff --git a/pkgs/lib/lists.nix b/pkgs/lib/lists.nix index 67b0add50dc..b9eba9ab478 100644 --- a/pkgs/lib/lists.nix +++ b/pkgs/lib/lists.nix @@ -1,33 +1,59 @@ # General list operations. rec { - inherit (builtins) head tail length isList; + inherit (builtins) head tail length isList add sub lessThan; # Create a list consisting of a single element. `singleton x' is # sometimes more convenient with respect to indentation than `[x]' # when x spans multiple lines. singleton = x: [x]; - + # "Fold" a binary function `op' between successive elements of # `list' with `nul' as the starting value, i.e., `fold op nul [x_1 # x_2 ... x_n] == op x_1 (op x_2 ... (op x_n nul))'. (This is # Haskell's foldr). - fold = op: nul: list: - if list == [] - then nul - else op (head list) (fold op nul (tail list)); + fold = + if builtins ? elemAt + then op: nul: list: + let + len = length list; + fold' = n: + if n == len + then nul + else op (builtins.elemAt list n) (fold' (add n 1)); + in fold' 0 + else op: nul: + let fold' = list: + if list == [] + then nul + else op (head list) (fold' (tail list)); + in fold'; # Left fold: `fold op nul [x_1 x_2 ... x_n] == op (... (op (op nul # x_1) x_2) ... x_n)'. - foldl = op: nul: list: - if list == [] - then nul - else foldl op (op nul (head list)) (tail list); + foldl = + if builtins ? elemAt + then op: nul: list: + let + len = length list; + foldl' = n: + if n == minus1 + then nul + else op (foldl' (sub n 1)) (builtins.elemAt list n); + in foldl' (sub (length list) 1) + else op: + let foldl' = nul: list: + if list == [] + then nul + else foldl' (op nul (head list)) (tail list); + in foldl'; + + minus1 = sub 0 1; + - # map with index: `imap (i: v: "${v}-${toString i}") ["a" "b"] == # ["a-1" "b-2"]' imap = f: list: @@ -35,7 +61,7 @@ rec { # Concatenate a list of lists. - concatLists = fold (x: y: x ++ y) []; + concatLists = builtins.concatLists or (fold (x: y: x ++ y) []); # Map and concatenate the result. @@ -53,20 +79,24 @@ rec { # Filter a list using a predicate; that is, return a list containing # every element from `list' for which `pred' returns true. - filter = pred: list: - fold (x: y: if pred x then [x] ++ y else y) [] list; + filter = + builtins.filter or + (pred: list: + fold (x: y: if pred x then [x] ++ y else y) [] list); - # Remove elements 'e' from a list. Useful for buildInputs + # Remove elements equal to 'e' from a list. Useful for buildInputs. remove = e: filter (x: x != e); # Given two lists, removes all elements of the first list from the second list removeList = l: filter (x: elem x l); - - # Return true if `list' has an element `x': - elem = x: list: fold (a: bs: x == a || bs) false list; + + # Return true if `list' has an element `x'. + elem = + builtins.elem or + (x: list: fold (a: bs: x == a || bs) false list); # Find the sole element in the list matching the specified @@ -88,27 +118,14 @@ rec { # Return true iff function `pred' returns true for at least element # of `list'. - any = pred: list: - if list == [] then false - else if pred (head list) then true - else any pred (tail list); + any = pred: fold (x: y: if pred x then true else y) false; # Return true iff function `pred' returns true for all elements of # `list'. - all = pred: list: - if list == [] then true - else if pred (head list) then all pred (tail list) - else false; + all = pred: fold (x: y: if pred x then y else false) true; - # Return true if each element of a list is equal, false otherwise. - eqLists = xs: ys: - if xs == [] && ys == [] then true - else if xs == [] || ys == [] then false - else head xs == head ys && eqLists (tail xs) (tail ys); - - # Return a singleton list or an empty list, depending on a boolean # value. Useful when building lists with optional elements # (e.g. `++ optional (system == "i686-linux") flashplayer'). @@ -165,11 +182,11 @@ rec { # order. The implementation does a quick-sort. sort = strictLess: list: let - # This implementation only have one element lists on the left hand + # This implementation only has one element list on the left hand # side of the concatenation operator. qs = l: concat: if l == [] then concat - else if tail l == [] then l ++ concat + else if length l == 1 then l ++ concat else let part = partition (strictLess (head l)) (tail l); in @@ -195,7 +212,7 @@ rec { let loop = l: if tail l == [] then head l else loop (tail l); in loop list; - + # Zip two lists together. zipTwoLists = xs: ys: if xs != [] && ys != [] then diff --git a/pkgs/lib/maintainers.nix b/pkgs/lib/maintainers.nix index aab4d685361..127295a2feb 100644 --- a/pkgs/lib/maintainers.nix +++ b/pkgs/lib/maintainers.nix @@ -23,6 +23,7 @@ marcweber = "Marc Weber "; mornfall = "Petr Ročkai "; neznalek = "Vladimír Čunát "; + page = "Carles Pagès "; phreedom = "Evgeny Egorochkin "; pierron = "Nicolas B. Pierron "; piotr = "Piotr Pietraszkiewicz "; diff --git a/pkgs/lib/misc.nix b/pkgs/lib/misc.nix index d3b236f73e5..39a3ad258b0 100644 --- a/pkgs/lib/misc.nix +++ b/pkgs/lib/misc.nix @@ -158,14 +158,15 @@ rec { (tail x))))) condList)) ; - # !!! This function has O(n^2) performance, so you probably don't want to use it! - uniqList = {inputList, outputList ? []}: - if (inputList == []) then outputList else - let x=head inputList; - newOutputList = outputList ++ - (if elem x outputList then [] else [x]); - in uniqList {outputList=newOutputList; - inputList = (tail inputList);}; + # This function has O(n^2) performance. + uniqList = {inputList, acc ? []} : + let go = xs : acc : + if xs == [] + then [] + else let x = head xs; + y = if elem x acc then [] else [x]; + in y ++ go (tail xs) (y ++ acc); + in go inputList acc; uniqListExt = {inputList, outputList ? [], getter ? (x : x), compare ? (x: y: x==y)}: @@ -214,16 +215,22 @@ rec { modifySumArgs = f: x: innerModifySumArgs f x {}; - innerClosePropagation = ready: list: if list == [] then ready else - if ! isAttrs (head list) then - /* builtins.trace ("not an attrSet: ${lib.showVal (head list)}") */ - innerClosePropagation ready (tail list) - else - innerClosePropagation - (ready ++ [(head list)]) - ((tail list) - ++ (maybeAttrNullable "propagatedBuildInputs" [] (head list)) - ++ (maybeAttrNullable "propagatedBuildNativeInputs" [] (head list))); + innerClosePropagation = acc : xs : + if xs == [] + then acc + else let y = head xs; + ys = tail xs; + in if ! isAttrs y + then innerClosePropagation acc ys + else let acc' = [y] ++ acc; + in innerClosePropagation + acc' + (uniqList { inputList = (maybeAttrNullable "propagatedBuildInputs" [] y) + ++ (maybeAttrNullable "propagatedBuildNativeInputs" [] y) + ++ ys; + acc = acc'; + } + ); closePropagation = list: (uniqList {inputList = (innerClosePropagation [] list);}); @@ -315,10 +322,6 @@ rec { // listToAttrs (map (n : nameValuePair n (a: b: "${a}\n${b}") ) [ "preConfigure" "postInstall" ]) ; - # returns atribute values as a list - flattenAttrs = set : map ( attr : builtins.getAttr attr set) (attrNames set); - mapIf = cond : f : fold ( x : l : if (cond x) then [(f x)] ++ l else l) []; - # prepareDerivationArgs tries to make writing configurable derivations easier # example: # prepareDerivationArgs { @@ -358,7 +361,7 @@ rec { flagName = name : "${name}Support"; cfgWithDefaults = (listToAttrs (map (n : nameValuePair (flagName n) false) (attrNames args2.flags))) // args2.cfg; - opts = flattenAttrs (mapAttrs (a : v : + opts = attrValues (mapAttrs (a : v : let v2 = if (v ? set || v ? unset) then v else { set = v; }; n = if (getAttr (flagName a) cfgWithDefaults) then "set" else "unset"; attr = maybeAttr n {} v2; in @@ -383,18 +386,4 @@ rec { else if isInt x then "int" else "string"; - # deep, strict equality testing. This should be implemented as primop - eqStrict = a : b : - let eqListStrict = a : b : - if (a == []) != (b == []) then false - else if a == [] then true - else eqStrict (head a) (head b) && eqListStrict (tail a) (tail b); - in - if nixType a != nixType b then false - else if isList a then eqListStrict a b - else if isAttrs a then - (eqListStrict (attrNames a) (attrNames b)) - && (eqListStrict (lib.attrValues a) (lib.attrValues b)) - else a == b; # FIXME ! - } diff --git a/pkgs/lib/modules.nix b/pkgs/lib/modules.nix index eb528f141fe..25cb956a0ea 100644 --- a/pkgs/lib/modules.nix +++ b/pkgs/lib/modules.nix @@ -2,7 +2,7 @@ let lib = import ./default.nix; in -with { inherit (builtins) head tail; }; +with { inherit (builtins) head; }; with import ./trivial.nix; with import ./lists.nix; with import ./misc.nix; @@ -44,9 +44,9 @@ rec { delayedModule = delayProperties m; getImports = if m ? config || m ? options then - attrByPath ["imports"] [] m + m.imports or [] else - toList (rmProperties (attrByPath ["require"] [] delayedModule)); + toList (rmProperties (delayedModule.require or [])); getImportedPaths = filter isPath getImports; getImportedSets = filter (x: !isPath x) getImports; @@ -64,7 +64,7 @@ rec { config = getConfig; } // ( if getImportedSets != [] then - assert tail getImportedSets == []; + assert length getImportedSets == 1; { options = head getImportedSets; } else {} @@ -92,7 +92,7 @@ rec { else newModuleName origin index; }; - getImports = m: attrByPath ["imports"] [] m; + getImports = m: m.imports or []; newModuleName = origin: index: "${origin.key}:"; @@ -110,8 +110,8 @@ rec { selectDeclsAndDefs = modules: lib.concatMap (m: if m ? config || m ? options then - [ (attrByPath ["options"] {} m) ] - ++ [ (attrByPath ["config"] {} m) ] + [ (m.options or {}) ] + ++ [ (m.config or {}) ] else [ m ] ) modules; diff --git a/pkgs/lib/options.nix b/pkgs/lib/options.nix index cd60b8f3b88..59bda41a623 100644 --- a/pkgs/lib/options.nix +++ b/pkgs/lib/options.nix @@ -2,7 +2,7 @@ let lib = import ./default.nix; in -with { inherit (builtins) head tail; }; +with { inherit (builtins) head length; }; with import ./trivial.nix; with import ./lists.nix; with import ./misc.nix; @@ -133,7 +133,7 @@ rec { # separate the merge & apply fields from the interface. mergeOptionDecls = opts: if opts == [] then {} - else if tail opts == [] then + else if length opts == 1 then let opt = head opts; in if opt ? options then opt // { options = toList opt.options; } @@ -152,13 +152,11 @@ rec { opt1 // opt2 // optionalAttrs (opt1 ? options || opt2 ? options) { options = - (toList (attrByPath ["options"] [] opt1)) - ++ (toList (attrByPath ["options"] [] opt2)); + (toList (opt1.options or [])) + ++ (toList (opt2.options or [])); } // optionalAttrs (opt1 ? extraConfigs || opt2 ? extraConfigs) { - extraConfigs = - (attrByPath ["extraConfigs"] [] opt1) - ++ (attrByPath ["extraConfigs"] [] opt2); + extraConfigs = opt1.extraConfigs or [] ++ opt2.extraConfigs or []; } )) {} opts; @@ -189,7 +187,7 @@ rec { ) (attrNames defs)); mergeDefaultOption = list: - if list != [] && tail list == [] then head list + if length list == 1 then head list else if all builtins.isFunction list then x: mergeDefaultOption (map (f: f x) list) else if all isList list then concatLists list else if all isAttrs list then fold lib.mergeAttrs {} list @@ -214,7 +212,7 @@ rec { mergeOneOption = list: if list == [] then abort "This case should never happen." - else if tail list != [] then throw "Multiple definitions. Only one is allowed for this option." + else if length list != 1 then throw "Multiple definitions. Only one is allowed for this option." else head list; diff --git a/pkgs/lib/strings.nix b/pkgs/lib/strings.nix index 071bb2c995b..fb2752d97c1 100644 --- a/pkgs/lib/strings.nix +++ b/pkgs/lib/strings.nix @@ -2,12 +2,12 @@ let lib = import ./default.nix; -inherit (builtins) add sub lessThan; +inherit (builtins) add sub lessThan length; in rec { - inherit (builtins) stringLength substring head tail lessThan sub; + inherit (builtins) stringLength substring head tail; # Concatenate a list of strings. @@ -22,7 +22,7 @@ rec { # Place an element between each element of a list, e.g., # `intersperse "," ["a" "b" "c"]' returns ["a" "," "b" "," "c"]. intersperse = separator: list: - if list == [] || tail list == [] + if list == [] || length list == 1 then list else [(head list) separator] ++ (intersperse separator (tail list)); diff --git a/pkgs/lib/tests.nix b/pkgs/lib/tests.nix index 646de7c0e49..04acb7632ea 100644 --- a/pkgs/lib/tests.nix +++ b/pkgs/lib/tests.nix @@ -50,19 +50,6 @@ runTests { expected = 5050; }; - testEqStrict = { - expr = all id [ - (eqStrict 2 2) - (!eqStrict 3 2) - (eqStrict [2 1] [2 1]) - (!eqStrict [1 3] [1 2]) - (eqStrict {a = 7; b = 20;} {b= 20; a = 7;}) - (eqStrict [{a = 7; b = 20;}] [{b= 20; a = 7;}]) - (eqStrict {a = [7 8]; b = 20;} {b= 20; a = [7 8];}) - ]; - expected = true; - }; - testTake = testAllTrue [ ([] == (take 0 [ 1 2 3 ])) ([1] == (take 1 [ 1 2 3 ])) @@ -71,6 +58,13 @@ runTests { ([ 1 2 3 ] == (take 4 [ 1 2 3 ])) ]; + testFoldAttrs = { + expr = foldAttrs (n: a: [n] ++ a) [] [ + { a = 2; b = 7; } + { a = 3; c = 8; } + ]; + expected = { a = [ 2 3 ]; b = [7]; c = [8];}; + }; testOverridableDelayableArgsTest = { expr = @@ -99,14 +93,14 @@ runTests { in (y.merge) { b = 10; }; strip = attrs : removeAttrs attrs ["merge" "replace"]; in all id - [ (eqStrict (strip res1) { }) - (eqStrict (strip res2) { a = 7; }) - (eqStrict (strip res3) { a = 7; b = 10; }) - (eqStrict (strip res4) { a = 7; b = 10; }) - (eqStrict (strip res5) { a = 10; }) - (eqStrict (strip res6) { a = 17; }) - (eqStrict (strip resRem7) {}) - (eqStrict (strip resFixed1) { a = 7; b = 10; c =10; name = "name-10"; }) + [ ((strip res1) == { }) + ((strip res2) == { a = 7; }) + ((strip res3) == { a = 7; b = 10; }) + ((strip res4) == { a = 7; b = 10; }) + ((strip res5) == { a = 10; }) + ((strip res6) == { a = 17; }) + ((strip resRem7) == {}) + ((strip resFixed1) == { a = 7; b = 10; c =10; name = "name-10"; }) ]; expected = true; }; diff --git a/pkgs/lib/types.nix b/pkgs/lib/types.nix index 2c85ee0077a..38ae7b43630 100644 --- a/pkgs/lib/types.nix +++ b/pkgs/lib/types.nix @@ -89,7 +89,7 @@ rec { path = mkOptionType { name = "path"; # Hacky: there is no ‘isPath’ primop. - check = lib.traceValIfNot (x: builtins.substring 0 1 (toString x) == "/"); + check = lib.traceValIfNot (x: builtins.unsafeDiscardStringContext (builtins.substring 0 1 (toString x)) == "/"); }; listOf = types.list; @@ -157,7 +157,7 @@ rec { uniq = elemType: mkOptionType { inherit (elemType) name check iter fold docPath hasOptions; merge = list: - if tail list == [] then + if length list == 1 then head list else throw "Multiple definitions. Only one is allowed for this option."; diff --git a/pkgs/misc/emulators/wine/default.nix b/pkgs/misc/emulators/wine/default.nix index acfe794dc4f..b35660daf5e 100644 --- a/pkgs/misc/emulators/wine/default.nix +++ b/pkgs/misc/emulators/wine/default.nix @@ -7,11 +7,11 @@ assert stdenv.isLinux; assert stdenv.gcc.gcc != null; stdenv.mkDerivation rec { - name = "wine-1.5.5"; + name = "wine-1.5.10"; src = fetchurl { url = "mirror://sourceforge/wine/${name}.tar.bz2"; - sha256 = "e7d5ba716d2ac47193fa31eff66cc179145ddcb453c6923eaea70596a82b084e"; + sha256 = "04wydwc8q49bw8brlklx2nbgr453lx7bbfass5zn88xbz997lppk"; }; gecko = fetchurl { diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix index 0a028660f7f..ac171b2ff81 100644 --- a/pkgs/misc/ghostscript/default.nix +++ b/pkgs/misc/ghostscript/default.nix @@ -9,7 +9,7 @@ assert cupsSupport -> cups != null; let meta = { - homepage = http://www.gnu.org/software/ghostscript/; + homepage = "http://www.gnu.org/software/ghostscript/"; description = "GNU Ghostscript, a PostScript interpreter"; longDescription = '' @@ -27,7 +27,7 @@ let maintainers = [ stdenv.lib.maintainers.ludo stdenv.lib.maintainers.viric ]; }; - gnuForkData = rec { + gnuForkSrc = rec { name = "ghostscript-9.04.1"; src = fetchurl { url = "mirror://gnu/ghostscript/gnu-${name}.tar.bz2"; @@ -38,14 +38,14 @@ let patches = [ ./purity.patch ]; }; - mainlineData = { + mainlineSrc = { name = "ghostscript-9.05"; src = fetchurl { - url = http://downloads.ghostscript.com/public/ghostscript-9.05.tar.bz2; + url = "http://downloads.ghostscript.com/public/ghostscript-9.05.tar.bz2"; sha256 = "1b6fi76x6pn9dmr9k9lh8kimn968dmh91k824fmm59d5ycm22h8g"; }; meta = meta // { - homepage = http://www.ghostscript.com/; + homepage = "http://www.ghostscript.com/"; description = "GPL Ghostscript, a PostScript interpreter"; }; @@ -55,7 +55,7 @@ let patches = [ ./purity-9.05.patch ]; }; - variant = if gnuFork then gnuForkData else mainlineData; + variant = if gnuFork then gnuForkSrc else mainlineSrc; in @@ -64,11 +64,11 @@ stdenv.mkDerivation rec { fonts = [ (fetchurl { - url = mirror://gnu/ghostscript/gnu-gs-fonts-std-6.0.tar.gz; + url = "mirror://gnu/ghostscript/gnu-gs-fonts-std-6.0.tar.gz"; sha256 = "1lxr1y52r26qjif8kdqkfhsb5llakdcx3f5b9ppdyn59bb83ivsc"; }) (fetchurl { - url = mirror://gnu/ghostscript/gnu-gs-fonts-other-6.0.tar.gz; + url = "mirror://gnu/ghostscript/gnu-gs-fonts-other-6.0.tar.gz"; sha256 = "1cxaah3r52qq152bbkiyj2f7dx1rf38vsihlhjmrvzlr8v6cqil1"; }) # ... add other fonts here diff --git a/pkgs/misc/lilypond/default.nix b/pkgs/misc/lilypond/default.nix index b3a9bec2972..65575af4c39 100644 --- a/pkgs/misc/lilypond/default.nix +++ b/pkgs/misc/lilypond/default.nix @@ -1,24 +1,36 @@ { stdenv, fetchurl, ghostscript, texinfo, imagemagick, texi2html, guile -, python, gettext, flex, perl, bison, pkgconfig, texLive -, fontconfig, freetype, pango, fontforge, help2man }: +, python, gettext, flex, perl, bison, pkgconfig, texLive, dblatex +, fontconfig, freetype, pango, fontforge, help2man, zip, netpbm, groff +, fetchsvn }: stdenv.mkDerivation rec{ - majorVersion="2.13"; - minorVersion="46"; + majorVersion="2.14"; + minorVersion="2"; version="${majorVersion}.${minorVersion}"; name = "lilypond-${version}"; - src = fetchurl { - url = "http://download.linuxaudio.org/lilypond/sources/v${majorVersion}/lilypond-${version}.tar.gz"; - sha256 = "370f59d10a3fc74c5790111f7a69e04304eda5384513c95838dda3cc087904e6"; + urwfonts = fetchsvn { + url = "http://svn.ghostscript.com/ghostscript/tags/urw-fonts-1.0.7pre44"; + sha256 = "0al5vdsb66db6yzwi0qgs1dnd1i1fb77cigdjxg8zxhhwf6hhwpn"; }; - configureFlags = [ "--disable-documentation" "--with-ncsb-dir=${ghostscript}/share/ghostscript/fonts"]; + src = fetchurl { + url = "http://download.linuxaudio.org/lilypond/sources/v${majorVersion}/lilypond-${version}.tar.gz"; + # 2.15.42 + # sha256 = "0cm2fq1cr9d24w5xkz6ik6qnby516dfahz4cw47xx8mb5qsa4drd"; + sha256 = "15i6k3fjc29wvchayn31khxhpppzd4g6ivbk7l43fakj8lw6nfi4"; + }; + + preConfigure='' + sed -e "s@mem=mf2pt1@mem=$PWD/mf/mf2pt1@" -i scripts/build/mf2pt1.pl + ''; + + configureFlags = [ "--disable-documentation" "--with-ncsb-dir=${urwfonts}"]; buildInputs = - [ ghostscript texinfo imagemagick texi2html guile + [ ghostscript texinfo imagemagick texi2html guile dblatex zip netpbm python gettext flex perl bison pkgconfig texLive fontconfig freetype pango - fontforge help2man + fontforge help2man groff ]; meta = { diff --git a/pkgs/misc/maven/3.0.nix b/pkgs/misc/maven/3.0.nix deleted file mode 100644 index 3d14a064a94..00000000000 --- a/pkgs/misc/maven/3.0.nix +++ /dev/null @@ -1,15 +0,0 @@ -{stdenv, fetchurl, jdk, makeWrapper}: - -assert jdk != null; - -stdenv.mkDerivation { - name = "apache-maven-3.0.3"; - builder = ./builder.sh; - src = fetchurl { - url = mirror://apache/maven/binaries/apache-maven-3.0.3-bin.tar.gz; - sha256 = "b845479bd5d6d821210d3530c65da628a118abedd176492741e1d9bc5e400e2a"; - }; - - buildInputs = [makeWrapper]; - inherit jdk; -} diff --git a/pkgs/misc/maven/default.nix b/pkgs/misc/maven/default.nix index 85794901650..ec2b57e222a 100644 --- a/pkgs/misc/maven/default.nix +++ b/pkgs/misc/maven/default.nix @@ -3,11 +3,11 @@ assert jdk != null; stdenv.mkDerivation { - name = "apache-maven-2.2.1"; + name = "apache-maven-3.0.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://apache/maven/binaries/apache-maven-2.2.1-bin.tar.gz; - sha256 = "0xnk08ndf1jx458sr5dfr8rh7wi92kyn887vqyzjm1ka91cnb8xr"; + url = mirror://apache/maven/binaries/apache-maven-3.0.4-bin.tar.gz; + sha256 = "0bxa7x8ifm8590nxifhsh3sxzm6aicbczyx21vibg3606ih8fnnk"; }; buildInputs = [makeWrapper]; diff --git a/pkgs/misc/maven/maven-1.0.nix b/pkgs/misc/maven/maven-1.0.nix deleted file mode 100644 index 2c84b6f006c..00000000000 --- a/pkgs/misc/maven/maven-1.0.nix +++ /dev/null @@ -1,16 +0,0 @@ -{stdenv, fetchurl, jdk}: - -assert jdk != null; - -stdenv.mkDerivation { - name = "maven-1.0.2"; - mavenBinary = "maven"; - builder = ./builder.sh; - src = fetchurl { - url = http://apache.cs.uu.nl/dist/maven/binaries/maven-1.0.2.tar.bz2; - md5 = "81a6b4393e550635efe19e95cea38718"; - }; - makeWrapper = ../../build-support/make-wrapper/make-wrapper.sh; - - inherit jdk; -} diff --git a/pkgs/misc/screensavers/xscreensaver/default.nix b/pkgs/misc/screensavers/xscreensaver/default.nix index 2cd915c498e..cf4f81ea407 100644 --- a/pkgs/misc/screensavers/xscreensaver/default.nix +++ b/pkgs/misc/screensavers/xscreensaver/default.nix @@ -1,16 +1,15 @@ -{ stdenv, fetchurl, pkgconfig, bc, perl, pam -, libXext, libXScrnSaver, libX11, libXrandr, libXmu, libXxf86vm, libXrender -, libXxf86misc -, libjpeg, mesa, gtk, libxml2, libglade +{ stdenv, fetchurl, pkgconfig, bc, perl, pam, libXext, libXScrnSaver, libX11 +, libXrandr, libXmu, libXxf86vm, libXrender, libXxf86misc, libjpeg, mesa, gtk +, libxml2, libglade }: stdenv.mkDerivation rec { - version = "5.15"; + version = "5.18"; name = "xscreensaver-${version}"; src = fetchurl { url = "http://www.jwz.org/xscreensaver/${name}.tar.gz"; - sha256 = "4f6d1f1e4c15dbb74e2296f8fe57a73d47d602515178c248bbc838f779d5082d"; + sha256 = "3d70edb8f46511f5427f21b4ba4d8323f336888f60268d16731f5231c6883db9"; }; buildInputs = @@ -19,6 +18,16 @@ stdenv.mkDerivation rec { libXxf86misc ]; + patchPhase = + '' + # Fix build error in version 5.18. Remove this patch when updating + # to a later version. + sed -i -e '/AF_LINK/d' hacks/glx/sonar-icmp.c + # Fix path to GTK. + sed -e 's%@GTK_DATADIR@%@datadir@% ; s%@PO_DATADIR@%@datadir@%' \ + -i driver/Makefile.in po/Makefile.in.in + ''; + configureFlags = [ "--with-gl" "--with-pam" "--with-pixbuf" "--with-proc-interrupts" "--with-dpms-ext" "--with-randr-ext" "--with-xinerama-ext" @@ -27,12 +36,6 @@ stdenv.mkDerivation rec { "--with-x-app-defaults=\${out}/share/xscreensaver/app-defaults" ]; - preConfigure = - '' - sed -e 's%@GTK_DATADIR@%@datadir@% ; s%@PO_DATADIR@%@datadir@%' \ - -i driver/Makefile.in po/Makefile.in.in - ''; - meta = { homepage = "http://www.jwz.org/xscreensaver/"; description = "A set of screensavers"; diff --git a/pkgs/os-specific/linux/acpi-call/default.nix b/pkgs/os-specific/linux/acpi-call/default.nix index 301a8054557..0689663832e 100644 --- a/pkgs/os-specific/linux/acpi-call/default.nix +++ b/pkgs/os-specific/linux/acpi-call/default.nix @@ -5,21 +5,22 @@ stdenv.mkDerivation { src = fetchgit { url = "git://github.com/mkottman/acpi_call.git"; - rev = "4f71ce83392bc52b3497"; - sha256 = "1f20516dc7d42bc7d9d71eaa54f48f38cd56b8683062f81d6f3857990056bdd3"; + rev = "b570c3b6c7016174107558464e864391d8bbd176"; + sha256 = "a89c62d391b721bb87a094f81cefc77d9c80de4bb314bb6ea449c3ef2decad5e"; }; preBuild = '' sed -e 's/break/true/' -i test_off.sh sed -e 's@/bin/bash@.bin/sh@' -i test_off.sh - sed -e "s@/lib/modules/\$(.*)@${kernel}/lib/modules/${kernel.version}@" -i Makefile + sed -e "s@/lib/modules/\$(.*)@${kernel}/lib/modules/${kernel.modDirVersion}@" -i Makefile ''; installPhase = '' - mkdir -p $out/lib/modules/${kernel.version}/misc - cp acpi_call.ko $out/lib/modules/${kernel.version}/misc + mkdir -p $out/lib/modules/${kernel.modDirVersion}/misc + cp acpi_call.ko $out/lib/modules/${kernel.modDirVersion}/misc mkdir -p $out/bin cp test_off.sh $out/bin/test_discrete_video_off.sh + chmod a+x $out/bin/test_discrete_video_off.sh ''; meta = { diff --git a/pkgs/os-specific/linux/atop/default.nix b/pkgs/os-specific/linux/atop/default.nix new file mode 100644 index 00000000000..0e2df1e25fb --- /dev/null +++ b/pkgs/os-specific/linux/atop/default.nix @@ -0,0 +1,39 @@ +{stdenv, fetchurl, zlib, ncurses}: + +stdenv.mkDerivation rec { + version = "1.27-3"; + name = "atop-${version}"; + + src = fetchurl { + url = "http://www.atoptool.nl/download/atop-${version}.tar.gz"; + sha256 = "bce36e0b50f0e03995d86d25dbc9ab4a289f6755ce3558844f96d41b0bba563f"; + }; + + buildInputs = [zlib ncurses]; + + makeFlags = [ + ''SCRPATH=$out/etc/atop'' + ''LOGPATH=/var/log/atop'' + ''INIPATH=$out/etc/rc.d/init.d'' + ''CRNPATH=$out/etc/cron.d'' + ''ROTPATH=$out/etc/logrotate.d'' + ]; + + preConfigure = '' + sed -e "s@/usr/@$out/@g" -i $(find . -type f ) + sed -e "/mkdir.*LOGPATH/s@mkdir@echo missing dir @" -i Makefile + sed -e "/touch.*LOGPATH/s@touch@echo should have created @" -i Makefile + sed -e 's/chown/true/g' -i Makefile + sed -e '/chkconfig/d' -i Makefile + ''; + + meta = { + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [raskin]; + description = ''Console system performance monitor''; + + longDescription = '' + Atop is an ASCII full-screen performance monitor that is capable of reporting the activity of all processes (even if processes have finished during the interval), daily logging of system and process activity for long-term analysis, highlighting overloaded system resources by using colors, etc. At regular intervals, it shows system-level activity related to the CPU, memory, swap, disks and network layers, and for every active process it shows the CPU utilization, memory growth, disk utilization, priority, username, state, and exit code. + ''; + }; +} diff --git a/pkgs/os-specific/linux/broadcom-sta/default.nix b/pkgs/os-specific/linux/broadcom-sta/default.nix index ff21b5d5254..041141cdad2 100644 --- a/pkgs/os-specific/linux/broadcom-sta/default.nix +++ b/pkgs/os-specific/linux/broadcom-sta/default.nix @@ -7,7 +7,7 @@ in stdenv.mkDerivation { name = "broadcom-sta-${version}-${kernel.version}"; - + src = fetchurl { url = "http://www.broadcom.com/docs/linux_sta/hybrid-portsrc_x86_${bits}-v${version}.tar.gz"; sha256 = if bits == "32" @@ -16,12 +16,10 @@ stdenv.mkDerivation { }; buildInputs = [ kernel ]; - patches = [ ./makefile.patch ./linux-2.6.39.patch ./linux-3.2.patch ]; - #++ stdenv.lib.optional - #(! builtins.lessThan (builtins.compareVersions kernel.version "2.6.37") 0) - #[ ./mutex-sema.patch ]; - - NIX_CFLAGS_COMPILE = "-I${kernel}/lib/modules/${kernel.modDirVersion}/build/include/generated"; + patches = + [ ./makefile.patch ./linux-2.6.39.patch ./linux-3.2.patch + ./linux-3.4.patch ./license.patch + ]; makeFlags = "KDIR=${kernel}/lib/modules/${kernel.modDirVersion}/build"; diff --git a/pkgs/os-specific/linux/broadcom-sta/license.patch b/pkgs/os-specific/linux/broadcom-sta/license.patch new file mode 100644 index 00000000000..b320d977e8b --- /dev/null +++ b/pkgs/os-specific/linux/broadcom-sta/license.patch @@ -0,0 +1,12 @@ +diff -Naur hybrid-portsrc-x86_32-v5_10_91_9.orig/src/wl/sys/wl_linux.c hybrid-portsrc-x86_32-v5_10_91_9/src/wl/sys/wl_linux.c +--- hybrid-portsrc-x86_32-v5_10_91_9.orig/src/wl/sys/wl_linux.c 2009-04-23 02:48:59.000000000 +0900 ++++ hybrid-portsrc-x86_32-v5_10_91_9/src/wl/sys/wl_linux.c 2009-05-08 00:48:20.000000000 +0900 +@@ -163,6 +163,8 @@ + static void wl_free_if(wl_info_t *wl, wl_if_t *wlif); + static void wl_get_driver_info(struct net_device *dev, struct ethtool_drvinfo *info); + ++MODULE_LICENSE("MIXED/Proprietary"); ++ + static struct pci_device_id wl_id_table[] = { + { PCI_VENDOR_ID_BROADCOM, 0x4311, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, + { PCI_VENDOR_ID_BROADCOM, 0x4312, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, diff --git a/pkgs/os-specific/linux/broadcom-sta/linux-3.4.patch b/pkgs/os-specific/linux/broadcom-sta/linux-3.4.patch new file mode 100644 index 00000000000..854131c641b --- /dev/null +++ b/pkgs/os-specific/linux/broadcom-sta/linux-3.4.patch @@ -0,0 +1,12 @@ +--- broadcom-sta.orig/src/wl/sys/wl_linux.c ++++ broadcom-sta.new/src/wl/sys/wl_linux.c +@@ -40,7 +40,9 @@ + #include + #define WLC_MAXBSSCFG 1 + ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 4, 0) + #include ++#endif + #include + #include + #include diff --git a/pkgs/os-specific/linux/broadcom-sta/mutex-sema.patch b/pkgs/os-specific/linux/broadcom-sta/mutex-sema.patch deleted file mode 100644 index 922c8f2d22d..00000000000 --- a/pkgs/os-specific/linux/broadcom-sta/mutex-sema.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -aur old/src/wl/sys/wl_linux.c new/src/wl/sys/wl_linux.c ---- old/src/wl/sys/wl_linux.c 2010-12-25 18:17:33.333343048 +0100 -+++ new/src/wl/sys/wl_linux.c 2010-12-25 18:21:05.856676376 +0100 -@@ -483,7 +483,7 @@ - #ifdef WL_ALL_PASSIVE - spin_lock_init(&wl->txq_lock); - #endif -- init_MUTEX(&wl->sem); -+ sema_init(&wl->sem, 1); - } - - if (!(wl->wlc = wlc_attach((void *) wl, vendor, device, unit, wl->piomode, diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix index ab0873e7ddc..0848cb33253 100644 --- a/pkgs/os-specific/linux/busybox/default.nix +++ b/pkgs/os-specific/linux/busybox/default.nix @@ -37,11 +37,11 @@ let in stdenv.mkDerivation rec { - name = "busybox-1.20.1"; + name = "busybox-1.20.2"; src = fetchurl { url = "http://busybox.net/downloads/${name}.tar.bz2"; - sha256 = "1jb8xh9a0mc73nmnjz7g5k7ym39vrg7grp7zmgmq71gxps55sl9y"; + sha256 = "10k8kgrprll9hxfm9gc3jl7kkq79g6l2pygn5snqwqg5v80zy4zb"; }; configurePhase = '' diff --git a/pkgs/os-specific/linux/cifs-utils/default.nix b/pkgs/os-specific/linux/cifs-utils/default.nix index 63eafb93e30..9e761b90a05 100644 --- a/pkgs/os-specific/linux/cifs-utils/default.nix +++ b/pkgs/os-specific/linux/cifs-utils/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: - + stdenv.mkDerivation rec { - name = "cifs-utils-5.3"; - + name = "cifs-utils-5.6"; + src = fetchurl { url = "ftp://ftp.samba.org/pub/linux-cifs/cifs-utils/${name}.tar.bz2"; - sha256 = "68e969c4107a872e2848992732dc11eafc7bdf084bec894c0ba677572de49b32"; + sha256 = "0f619nw1163bcmfc83mmqj31qdkl68wfm81vynx3d8q0m0k1ll7i"; }; makeFlags = "root_sbindir=$(out)/sbin"; @@ -13,6 +13,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.samba.org/linux-cifs/cifs-utils/; description = "Tools for managing Linux CIFS client filesystems"; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/conky/curl-types-h.patch b/pkgs/os-specific/linux/conky/curl-types-h.patch deleted file mode 100644 index ba99da23b46..00000000000 --- a/pkgs/os-specific/linux/conky/curl-types-h.patch +++ /dev/null @@ -1,25 +0,0 @@ -curl removed header -diff --git a/src/ccurl_thread.c b/src/ccurl_thread.c -index 10e73a6..9bea299 100644 ---- a/src/ccurl_thread.c -+++ b/src/ccurl_thread.c -@@ -33,7 +33,6 @@ - #endif /* DEBUG */ - - #include --#include - #include - - /* -diff --git a/src/eve.c b/src/eve.c -index dc07264..f62a5f6 100644 ---- a/src/eve.c -+++ b/src/eve.c -@@ -37,7 +37,6 @@ - #include - - #include --#include - #include - - #include diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix index fda361d6c74..086b792b4cd 100644 --- a/pkgs/os-specific/linux/conky/default.nix +++ b/pkgs/os-specific/linux/conky/default.nix @@ -1,24 +1,26 @@ -{stdenv, fetchurl, pkgconfig, libxml2, curl, wirelesstools, glib, openssl}: +{ stdenv, fetchurl, pkgconfig, libxml2, curl, wirelesstools, glib, openssl +, ncurses }: stdenv.mkDerivation rec { - name = "conky-1.8.1"; + name = "conky-1.9.0"; src = fetchurl { url = "mirror://sourceforge/conky/${name}.tar.bz2"; - sha256 = "0hsybra4qzaqzny6n66m7768vbwkikajcvcbsqgnnnb9527jfnpq"; + sha256 = "0vxvjmi3cdvnp994sv5zcdyncfn0mlxa71p2wm9zpyrmy58bbwds"; }; - buildInputs = [ pkgconfig libxml2 curl wirelesstools glib openssl ]; - configureFlags = - (map (x: "--disable-${x}") [ "x11" "xdamage" "own-window" "xft" "lua" "ncurses" ]) - ++ (map (x: "--enable-${x}") [ "mpd" "double-buffer" "wlan" "rss" ]); + patches = [ ./stdbool.patch ]; - patches = [ ./curl-types-h.patch ]; + buildInputs = [ pkgconfig libxml2 curl wirelesstools glib openssl ncurses ]; + configureFlags = + (map (x: "--disable-${x}") [ "x11" "xdamage" "own-window" "xft" "lua" ]) + ++ (map (x: "--enable-${x}") [ "mpd" "double-buffer" "wlan" "rss" + "weather-metar" "weather-xoap" ]); meta = { homepage = http://conky.sourceforge.net/; description = "Conky is an advanced, highly configurable system monitor complied without X based on torsmo"; maintainers = [ stdenv.lib.maintainers.guibert ]; + license = stdenv.lib.licenses.gpl3Plus; }; } - diff --git a/pkgs/os-specific/linux/conky/stdbool.patch b/pkgs/os-specific/linux/conky/stdbool.patch new file mode 100644 index 00000000000..3f0b714a1f0 --- /dev/null +++ b/pkgs/os-specific/linux/conky/stdbool.patch @@ -0,0 +1,12 @@ +diff --git a/src/conky.c b/src/conky.c +index 5848b61..69a3d45 100644 +--- a/src/conky.c ++++ b/src/conky.c +@@ -34,6 +34,7 @@ + #include "common.h" + #include "timed_thread.h" + #include ++#include + #include + #include + #include diff --git a/pkgs/os-specific/linux/cryptsetup/default.nix b/pkgs/os-specific/linux/cryptsetup/default.nix index 89a9d2b8506..9e762f64904 100644 --- a/pkgs/os-specific/linux/cryptsetup/default.nix +++ b/pkgs/os-specific/linux/cryptsetup/default.nix @@ -1,13 +1,15 @@ -{ stdenv, fetchurl, devicemapper, libgcrypt, libuuid, pkgconfig, popt, udev }: +{ stdenv, fetchurl, devicemapper, libgcrypt, libuuid, pkgconfig, popt }: stdenv.mkDerivation rec { - name = "cryptsetup-1.4.2"; - + name = "cryptsetup-1.5.0"; + src = fetchurl { url = "http://cryptsetup.googlecode.com/files/${name}.tar.bz2"; - sha256 = "1ryzc36wfbfqi69c3xzx2x6jr7l5xp7xwip4s9jkyjyj35xhvs0z"; + sha256 = "1l7qcmaq092k28k8sbw845hs6jwn0f05h68rmb7iwh52232m8wa0"; }; + configureFlags = "--enable-cryptsetup-reencrypt"; + buildInputs = [ devicemapper libgcrypt libuuid pkgconfig popt ]; meta = { diff --git a/pkgs/os-specific/linux/dmraid/default.nix b/pkgs/os-specific/linux/dmraid/default.nix index aa78a517196..35efa8533ab 100644 --- a/pkgs/os-specific/linux/dmraid/default.nix +++ b/pkgs/os-specific/linux/dmraid/default.nix @@ -1,33 +1,26 @@ -a : -let - s = import ./src-for-default.nix; - buildInputs = with a; [ - devicemapper - ]; -in -rec { - src = a.fetchUrlFromSrcInfo s; +{ stdenv, fetchurl, devicemapper }: - inherit (s) name; - inherit buildInputs; - configureFlags = []; +stdenv.mkDerivation rec { + name = "dmraid-1.0.0.rc15"; + + src = fetchurl { + url = "http://people.redhat.com/~heinzm/sw/dmraid/src/old/${name}.tar.bz2"; + sha256 = "01bcaq0sc329ghgj7f182xws7jgjpdc41bvris8fsiprnxc7511h"; + }; + + preConfigure = "cd */"; + + buildInputs = [ devicemapper ]; - /* doConfigure should be removed if not needed */ - phaseNames = ["doConfigure" "doMakeInstall"]; - goSrcDir = "cd */"; - meta = { - description = "Old-style RAID configuration utility."; + description = "Old-style RAID configuration utility"; longDescritipn = '' Old RAID configuration utility (still under development, though). It is fully compatible with modern kernels and mdadm recognizes its volumes. May be needed for rescuing an older system or nuking the metadata when reformatting. ''; - maintainers = [ - a.lib.maintainers.raskin - ]; - platforms = with a.lib.platforms; - linux; + maintainers = [ stdenv.lib.maintainers.raskin ]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/dmraid/src-for-default.nix b/pkgs/os-specific/linux/dmraid/src-for-default.nix deleted file mode 100644 index b8f29ce4b5c..00000000000 --- a/pkgs/os-specific/linux/dmraid/src-for-default.nix +++ /dev/null @@ -1,9 +0,0 @@ -rec { - version="1.0.0.rc15"; - name="dmraid-1.0.0.rc15"; - hash="01bcaq0sc329ghgj7f182xws7jgjpdc41bvris8fsiprnxc7511h"; - url="http://people.redhat.com/~heinzm/sw/dmraid/src/old/dmraid-${version}.tar.bz2"; - advertisedUrl="http://people.redhat.com/~heinzm/sw/dmraid/src/old/dmraid-1.0.0.rc15.tar.bz2"; - - -} diff --git a/pkgs/os-specific/linux/dmraid/src-info-for-default.nix b/pkgs/os-specific/linux/dmraid/src-info-for-default.nix deleted file mode 100644 index 12c4ab1e9a7..00000000000 --- a/pkgs/os-specific/linux/dmraid/src-info-for-default.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ - downloadPage = "http://people.redhat.com/~heinzm/sw/dmraid/src/old/?C=M;O=D"; - baseName = "dmraid"; - sourceRegexp = "^.*[.]tar[.]bz2\$"; - versionExtractorSedScript = ''s/.*-(.*)[.]tar[.]bz2/\1/''; -} diff --git a/pkgs/os-specific/linux/dstat/default.nix b/pkgs/os-specific/linux/dstat/default.nix new file mode 100644 index 00000000000..fb454c78788 --- /dev/null +++ b/pkgs/os-specific/linux/dstat/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, python }: + +stdenv.mkDerivation rec { + name = "dstat-0.7.2"; + + src = fetchurl { + url = "http://dag.wieers.com/home-made/dstat/${name}.tar.bz2"; + sha256 = "1bivnciwlamnl9q6i5ygr7jhs8pp833z2bkbrffvsa60szcqda9l"; + }; + + buildInputs = [ ]; + + patchPhase = '' + sed -i -e 's|/usr/bin/env python|${python}/bin/python|' \ + -e "s|/usr/share/dstat|$out/share/dstat|" dstat + ''; + + makeFlags = "prefix=$(out)"; + + meta = { + homepage = http://dag.wieers.com/home-made/dstat/; + description = "Versatile resource statistics tool."; + license = "GPLv2"; + platforms = stdenv.lib.platforms.linux; + maintainers = [ ]; + }; +} diff --git a/pkgs/os-specific/linux/ffado/default.nix b/pkgs/os-specific/linux/ffado/default.nix index 3755bbe80bb..a78599c6a20 100644 --- a/pkgs/os-specific/linux/ffado/default.nix +++ b/pkgs/os-specific/linux/ffado/default.nix @@ -26,6 +26,8 @@ stdenv.mkDerivation rec { scons PREFIX=$out LIBDIR=$out/lib SHAREDIR=$out/share/libffado \ PYPKGDIR=$out/$PYLIBSUFFIX install + sed -e "s#/usr/local#$out#g" -i $out/bin/ffado-diag + PYDIR=$out/$PYLIBSUFFIX wrapProgram $out/bin/ffado-mixer --prefix PYTHONPATH : \ $PYTHONPATH:$PYDIR:${pyqt4}/$LIBSUFFIX:${pythonDBus}/$LIBSUFFIX: diff --git a/pkgs/os-specific/linux/firmware/b43-firmware-cutter/default.nix b/pkgs/os-specific/linux/firmware/b43-firmware-cutter/default.nix new file mode 100644 index 00000000000..b6465c0d794 --- /dev/null +++ b/pkgs/os-specific/linux/firmware/b43-firmware-cutter/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "b43-fwcutter-015"; + + src = fetchurl { + url = "http://bues.ch/b43/fwcutter/${name}.tar.bz2"; + sha256 = "1sznw1jrhyfbx0ilwzrj6mzlgc96fzjbx56j4ji8lsypyp8m6sjc"; + }; + + patches = [ ./no-root-install.patch ]; + + makeFlags = [ "PREFIX=$(out)" ]; + + meta = { + description = "Firmware extractor for cards supported by the b43 kernel module"; + homepage = http://wireless.kernel.org/en/users/Drivers/b43; + license = "free-non-copyleft"; + maintainers = [ stdenv.lib.maintainers.shlevy ]; + }; +} + diff --git a/pkgs/os-specific/linux/firmware/b43-firmware-cutter/no-root-install.patch b/pkgs/os-specific/linux/firmware/b43-firmware-cutter/no-root-install.patch new file mode 100644 index 00000000000..578812e0ad0 --- /dev/null +++ b/pkgs/os-specific/linux/firmware/b43-firmware-cutter/no-root-install.patch @@ -0,0 +1,18 @@ +diff -Naur b43-fwcutter-015-orig/Makefile b43-fwcutter-015/Makefile +--- b43-fwcutter-015-orig/Makefile 2011-08-21 08:17:01.000000000 -0400 ++++ b43-fwcutter-015/Makefile 2012-07-13 17:57:53.002154557 -0400 +@@ -51,10 +51,10 @@ + $(QUIET_CC) $(CFLAGS) -o $(BIN) $(call OBJS,$(SRCS)) $(LDFLAGS) + + install: all +- install -d -o 0 -g 0 -m 755 $(PREFIX)/bin/ +- install -o 0 -g 0 -m 755 $(BIN) $(PREFIX)/bin/ +- install -d -o 0 -g 0 -m 755 $(PREFIX)/man/man1/ +- install -o 0 -g 0 -m 644 $(BIN).1 $(PREFIX)/man/man1/ ++ install -d -m 755 $(PREFIX)/bin/ ++ install -m 755 $(BIN) $(PREFIX)/bin/ ++ install -d -m 755 $(PREFIX)/man/man1/ ++ install -m 644 $(BIN).1 $(PREFIX)/man/man1/ + + clean: + -rm -Rf obj dep *.orig *.rej *~ diff --git a/pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix b/pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix new file mode 100644 index 00000000000..1c4173c72fd --- /dev/null +++ b/pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, b43FirmwareCutter }: + +let version = "5.100.138"; in + +stdenv.mkDerivation { + name = "b43-firmware-${version}"; + + src = fetchurl { + url = "http://www.lwfinger.com/b43-firmware/broadcom-wl-${version}.tar.bz2"; + sha256 = "0vz4ka8gycf72gmnaq61k8rh8y17j1wm2k3fidxvcqjvmix0drzi"; + }; + + buildInputs = [ b43FirmwareCutter ]; + + phases = [ "unpackPhase" "installPhase" ]; + + installPhase = '' + mkdir $out + b43-fwcutter -w $out linux/wl_apsta.o + ''; + + meta = { + description = "Firmware for cards supported by the b43 kernel module"; + homepage = http://wireless.kernel.org/en/users/Drivers/b43; + license = stdenv.lib.licenses.proprietary; + maintainers = [ stdenv.lib.maintainers.shlevy ]; + }; +} + diff --git a/pkgs/os-specific/linux/firmware/ipw2100/default.nix b/pkgs/os-specific/linux/firmware/ipw2100/default.nix index 617a6cc38dd..abc6bf08dac 100644 --- a/pkgs/os-specific/linux/firmware/ipw2100/default.nix +++ b/pkgs/os-specific/linux/firmware/ipw2100/default.nix @@ -1,7 +1,8 @@ -{stdenv, fetchurl}: +{ stdenv, fetchurl }: stdenv.mkDerivation { name = "ipw2100-fw-1.3"; + src = fetchurl { url = http://pkgs.fedoraproject.org/repo/pkgs/ipw2100-firmware/ipw2100-fw-1.3.tgz/46aa75bcda1a00efa841f9707bbbd113/ipw2100-fw-1.3.tgz; sha256 = "18m7wgd062qwfdr6y0kjrvf1715wjcjn4yml2sk29ls8br2pq471"; @@ -13,7 +14,7 @@ stdenv.mkDerivation { # says: "Your rights to redistribute the Software shall be # contingent upon your installation of this Agreement in its # entirety in the same directory as the Software." - installPhase = "mkdir -p $out; cp * $out"; + installPhase = "mkdir -p $out; cp ipw* LICENSE $out"; meta = { # "... you may transfer a copy of the Software ... provided such diff --git a/pkgs/os-specific/linux/firmware/ipw2200/default.nix b/pkgs/os-specific/linux/firmware/ipw2200/default.nix index ec1607ff2f7..5c4989b878a 100644 --- a/pkgs/os-specific/linux/firmware/ipw2200/default.nix +++ b/pkgs/os-specific/linux/firmware/ipw2200/default.nix @@ -1,7 +1,8 @@ -{stdenv, fetchurl}: +{ stdenv, fetchurl }: stdenv.mkDerivation { name = "ipw2200-fw-3.1"; + src = fetchurl { url = http://pkgs.fedoraproject.org/repo/pkgs/ipw2200-firmware/ipw2200-fw-3.1.tgz/eaba788643c7cc7483dd67ace70f6e99/ipw2200-fw-3.1.tgz; sha256 = "1gaqc8d827d6ji7zhhkpbr4fzznqpar68gzqbzak1h4cq48qr0f6"; diff --git a/pkgs/os-specific/linux/firmware/iwlwifi-2030-ucode/default.nix b/pkgs/os-specific/linux/firmware/iwlwifi-2030-ucode/default.nix new file mode 100644 index 00000000000..162423dbc05 --- /dev/null +++ b/pkgs/os-specific/linux/firmware/iwlwifi-2030-ucode/default.nix @@ -0,0 +1,29 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation rec { + name = "iwlwifi-2030-ucode-18.168.6.1"; + + src = fetchurl { + url = "http://intellinuxwireless.org/iwlwifi/downloads/${name}.tgz"; + sha256 = "0b69jpb46fk63ybyyb8lbh99j1d29ayp8fl98l18iqy3q7mx4ry8"; + }; + + buildPhase = "true"; + + installPhase = '' + mkdir -p "$out" + chmod -x * + cp * "$out" + ''; + + meta = { + description = "Firmware for the Intel 2030 Series wireless card"; + + longDescription = '' + This package provides the Intel 2030 Series wireless card + firmware. It contains the `iwlwifi-2030-6.ucode' file. + ''; + + homepage = http://intellinuxwireless.org/; + }; +} diff --git a/pkgs/os-specific/linux/firmware/rt73/default.nix b/pkgs/os-specific/linux/firmware/rt73/default.nix deleted file mode 100644 index 95393100139..00000000000 --- a/pkgs/os-specific/linux/firmware/rt73/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{stdenv, fetchurl, unzip}: - -stdenv.mkDerivation rec { - name = "rt73-fw-1.8"; - src = fetchurl { - url = "http://www.ralinktech.com/download.php?t=U0wyRnpjMlYwY3k4eU1EQTVMekF6THpNeEwyUnZkMjVzYjJGa056YzVPVE13TmpZMk9TNTZhWEE5UFQxU1ZEY3hWMTlHYVhKdGQyRnlaVjlXTVM0NEM%3D"; - name = "rt73-fw-1.8.zip"; - sha256 = "1gskm6wqp8nnz3qk44rmab6h81pkarzzphqvag4y05a8mwdarlz2"; - }; - - buildInputs = [ unzip ]; - - buildPhase = "true"; - - # Installation copies the firmware AND the license. The license - # says: "Your rights to redistribute the Software shall be - # contingent upon your installation of this Agreement in its - # entirety in the same directory as the Software." - installPhase = "mkdir -p $out/${name}; cp *.bin $out; cp *.txt $out/${name}"; - - meta = { - description = "Firmware for the Ralink RT73 wireless card"; - homepage = http://www.ralinktech.com/; - license = "non-free"; - }; -} diff --git a/pkgs/os-specific/linux/gogoclient/default.nix b/pkgs/os-specific/linux/gogoclient/default.nix index d1a4bf9feb6..4328eb36b6d 100644 --- a/pkgs/os-specific/linux/gogoclient/default.nix +++ b/pkgs/os-specific/linux/gogoclient/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { name = "${baseName}-${version}"; src = fetchurl { - url = http://gogo6.com/downloads/gogoc-1_2-RELEASE.tar.gz; + #url = http://gogo6.com/downloads/gogoc-1_2-RELEASE.tar.gz; + url = http://pkgs.fedoraproject.org/repo/pkgs/gogoc/gogoc-1_2-RELEASE.tar.gz/41177ed683cf511cc206c7782c37baa9/gogoc-1_2-RELEASE.tar.gz; sha256 = "a0ef45c0bd1fc9964dc8ac059b7d78c12674bf67ef641740554e166fa99a2f49"; }; patches = [./gcc46-include-fix.patch ./config-paths.patch ]; @@ -28,6 +29,7 @@ stdenv.mkDerivation rec { --replace "/sbin/route" "${nettools}/sbin/route" \ --replace "/sbin/ip" "${iproute}/sbin/ip" \ --replace "/sbin/sysctl" "${procps}/sbin/sysctl" + sed -i -e 's/^.*Exec \$route -A.*$/& metric 128/' $out/template/linux.sh ''; meta = { diff --git a/pkgs/os-specific/linux/hostapd/default.nix b/pkgs/os-specific/linux/hostapd/default.nix index 39f92d99b7f..f13a1033f8b 100644 --- a/pkgs/os-specific/linux/hostapd/default.nix +++ b/pkgs/os-specific/linux/hostapd/default.nix @@ -1,21 +1,22 @@ -{ stdenv, fetchurl, libnl1, openssl }: +{ stdenv, fetchurl, libnl, openssl, pkgconfig }: stdenv.mkDerivation rec { name = "hostapd-${version}"; - version = "0.7.3"; + version = "1.0"; src = fetchurl { - url = http://w1.fi/releases/hostapd-0.7.3.tar.gz; - sha256 = "0rqmjs4k50qjp2d0k71lg5vsh34w07w985cxjqklq6kyyf0jgsri"; + url = "http://w1.fi/releases/${name}.tar.gz"; + sha256 = "1k6z2g0g324593a7ybd76bywvj0gnf9cybqaj2sq5ks6gv5rsbh0"; }; - buildInputs = [ libnl1 openssl ]; + buildInputs = [ libnl openssl pkgconfig ]; configurePhase = '' cd hostapd - substituteInPlace defconfig --replace "#CONFIG_DRIVER_NL80211" "CONFIG_DRIVER_NL80211" - substituteInPlace Makefile --replace "/usr/local/bin/" "$out/bin/" + substituteInPlace Makefile --replace "/usr/local/bin" "$out/bin" mv defconfig .config + echo CONFIG_LIBNL32=y | tee -a .config + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags libnl-3.0)" ''; preInstall = "mkdir -p $out/bin"; diff --git a/pkgs/os-specific/linux/iw/default.nix b/pkgs/os-specific/linux/iw/default.nix new file mode 100644 index 00000000000..7110754357c --- /dev/null +++ b/pkgs/os-specific/linux/iw/default.nix @@ -0,0 +1,24 @@ +{stdenv, fetchurl, libnl, pkgconfig}: + +stdenv.mkDerivation { + name = "iw-3.6"; + + src = fetchurl { + url = http://wireless.kernel.org/download/iw/iw-3.6.tar.bz2; + sha256 = "0my8nv6liya0b15nqn8wq2kxwjy7x6k65a9x1121zwqxq5m064fz"; + }; + + buildInputs = [ libnl pkgconfig ]; + + preBuild = " + makeFlagsArray=(PREFIX=$out) + "; + + meta = { + description = "Tool to use nl80211"; + homepage = http://wireless.kernel.org/en/users/Documentation/iw; + license = "BSD"; + maintainers = with stdenv.lib.maintainers; [viric]; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/os-specific/linux/kbd/default.nix b/pkgs/os-specific/linux/kbd/default.nix index da45b39cee1..4d04b75b3b0 100644 --- a/pkgs/os-specific/linux/kbd/default.nix +++ b/pkgs/os-specific/linux/kbd/default.nix @@ -1,25 +1,28 @@ -{ stdenv, fetchurl, bison, flex, autoconf, automake }: +{ stdenv, fetchurl, gzip, bzip2 }: stdenv.mkDerivation rec { - name = "kbd-1.15.2"; + name = "kbd-1.15.3"; src = fetchurl { url = "ftp://ftp.altlinux.org/pub/people/legion/kbd/${name}.tar.gz"; - sha256 = "0ff674y6d3b6ix08b9l2yzv8igns768biyp5y92vip7iz4xv2p2j"; + sha256 = "1vcl2791xshjdpi4w88iy87gkb7zv0dbvi83f98v30dvqc9mfl46"; }; - buildNativeInputs = [ bison flex autoconf automake ]; + configureFlags = "--disable-nls"; - # We get a warning in armv5tel-linux and the fuloong2f, - # so we disable -Werror in it - patchPhase = if (stdenv.isArm || - stdenv.system == "mips64el-linux") - then '' - sed -i s/-Werror// src/Makefile.am - '' else ""; - - # Grrr, kbd 1.15.1 doesn't include a configure script. - preConfigure = "autoreconf"; + patchPhase = + '' + # Fix the path to gzip/bzip2. + substituteInPlace src/findfile.c \ + --replace gzip ${gzip}/bin/gzip \ + --replace bzip2 ${bzip2}/bin/bzip2 \ + + # We get a warning in armv5tel-linux and the fuloong2f, so we + # disable -Werror in it. + ${stdenv.lib.optionalString (stdenv.isArm || stdenv.system == "mips64el-linux") '' + sed -i s/-Werror// src/Makefile.am + ''} + ''; makeFlags = "setowner= "; diff --git a/pkgs/os-specific/linux/kernel/linux-3.2.nix b/pkgs/os-specific/linux/kernel/linux-3.2.nix index aa5ef29a609..bea68decf64 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.2.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.2.nix @@ -237,7 +237,7 @@ in import ./generic.nix ( rec { - version = "3.2.21"; + version = "3.2.28"; testing = false; modDirVersion = version; @@ -248,7 +248,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.0/${if testing then "testing/" else ""}linux-${version}.tar.xz"; - sha256 = "0m3jn3nr1ghlhxch06hv9naidfy1kiwyabyzdl6k5lwkbqi7l1gi"; + sha256 = "0v4mbqf0mgnshhkq3symlliaz1jwa7vx7195r3qls390plc9g0nl"; }; config = configWithPlatform stdenv.platform; diff --git a/pkgs/os-specific/linux/kernel/linux-3.3.nix b/pkgs/os-specific/linux/kernel/linux-3.3.nix index 956e55014e5..c56df955b79 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.3.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.3.nix @@ -236,7 +236,7 @@ in import ./generic.nix ( rec { - version = "3.3.6"; + version = "3.3.8"; testing = false; preConfigure = '' @@ -245,7 +245,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz"; - sha256 = "04hplilmy9ks6nxi4292mcqwil6b5vinx90w23m41bll1x32gbq8"; + sha256 = "0bgppngf711mlxp0jcsnv5xc0xxc8vs5rzc1czkv2igrfb1kvrnz"; }; config = configWithPlatform stdenv.platform; diff --git a/pkgs/os-specific/linux/kernel/linux-3.4.nix b/pkgs/os-specific/linux/kernel/linux-3.4.nix index b643de8bff6..8b0e3e0d8a2 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix @@ -76,6 +76,8 @@ let HOSTAP_FIRMWARE_NVRAM y ATH9K_PCI y # Detect Atheros AR9xxx cards on PCI(e) bus ATH9K_AHB y # Ditto, AHB bus + B43_PHY_HT y + BCMA_HOST_PCI y # Some settings to make sure that fbcondecor works - in particular, # disable tileblitting and the drivers that need it. @@ -200,6 +202,7 @@ let THERMAL_HWMON y # Hardware monitoring support USB_DEBUG n USB_EHCI_ROOT_HUB_TT y # Root Hub Transaction Translators + USB_EHCI_TT_NEWSCHED y # Improved transaction translator scheduling X86_CHECK_BIOS_CORRUPTION y X86_MCE y @@ -236,7 +239,7 @@ in import ./generic.nix ( rec { - version = "3.4.4"; + version = "3.4.10"; testing = false; preConfigure = '' @@ -245,7 +248,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz"; - sha256 = "0l4h7amhsmgpnii8rgwi32nd7ajsifk2xckjd39pfzwdifacw5yw"; + sha256 = "03xfiyhv6zl3wn78bgm7a30w4hs2p328s447slilp0z2w09jqn4q"; }; config = configWithPlatform stdenv.platform; @@ -253,6 +256,7 @@ import ./generic.nix ( features.iwlwifi = true; features.efiBootStub = true; + features.needsCifsUtils = true; } // removeAttrs args ["extraConfig"] diff --git a/pkgs/os-specific/linux/kernel/linux-3.5.nix b/pkgs/os-specific/linux/kernel/linux-3.5.nix new file mode 100644 index 00000000000..61d6b0aeba5 --- /dev/null +++ b/pkgs/os-specific/linux/kernel/linux-3.5.nix @@ -0,0 +1,264 @@ +args @ { stdenv, fetchurl, userModeLinux ? false, extraConfig ? "" +, perl, mktemp, module_init_tools +, ... }: + +let + configWithPlatform = kernelPlatform : + '' + # Power management and debugging for powertop. + DEBUG_KERNEL y + PM_ADVANCED_DEBUG y + PM_RUNTIME y + TIMER_STATS y + USB_SUSPEND y + BACKTRACE_SELF_TEST n + CPU_NOTIFIER_ERROR_INJECT? n + DEBUG_DEVRES n + DEBUG_NX_TEST n + DEBUG_STACK_USAGE n + DEBUG_STACKOVERFLOW n + RCU_TORTURE_TEST n + SCHEDSTATS n + + # Support drivers that need external firmware. + STANDALONE n + + # Make /proc/config.gz available. + IKCONFIG_PROC y + + # Optimize with -O2, not -Os. + CC_OPTIMIZE_FOR_SIZE n + + # Enable the kernel's built-in memory tester. + MEMTEST y + + # Include the CFQ I/O scheduler in the kernel, rather than as a + # module, so that the initrd gets a good I/O scheduler. + IOSCHED_CFQ y + BLK_CGROUP y # required by CFQ + + # Enable NUMA. + NUMA? y + + # Disable some expensive (?) features. + FTRACE n + KPROBES n + PM_TRACE_RTC n + + # Enable various subsystems. + ACCESSIBILITY y # Accessibility support + AUXDISPLAY y # Auxiliary Display support + DONGLE y # Serial dongle support + HIPPI? y + MTD_COMPLEX_MAPPINGS y # needed for many devices + SCSI_LOWLEVEL y # enable lots of SCSI devices + SCSI_LOWLEVEL_PCMCIA y + SPI y # needed for many devices + SPI_MASTER y + WAN y + + # Networking options. + IP_PNP n + IPV6_PRIVACY y + NETFILTER_ADVANCED y + IP_VS_PROTO_TCP y + IP_VS_PROTO_UDP y + IP_VS_PROTO_ESP y + IP_VS_PROTO_AH y + IP_DCCP_CCID3 n # experimental + CLS_U32_PERF y + CLS_U32_MARK y + + # Wireless networking. + IPW2100_MONITOR y # support promiscuous mode + IPW2200_MONITOR y # support promiscuous mode + HOSTAP_FIRMWARE y # Support downloading firmware images with Host AP driver + HOSTAP_FIRMWARE_NVRAM y + ATH9K_PCI y # Detect Atheros AR9xxx cards on PCI(e) bus + ATH9K_AHB y # Ditto, AHB bus + B43_PHY_HT y + BCMA_HOST_PCI y + + # Some settings to make sure that fbcondecor works - in particular, + # disable tileblitting and the drivers that need it. + + # Enable various FB devices. + FB y + FB_EFI y + FB_NVIDIA_I2C y # Enable DDC Support + FB_RIVA_I2C y + FB_ATY_CT y # Mach64 CT/VT/GT/LT (incl. 3D RAGE) support + FB_ATY_GX y # Mach64 GX support + FB_SAVAGE_I2C y + FB_SAVAGE_ACCEL y + FB_SIS_300 y + FB_SIS_315 y + FB_3DFX_ACCEL y + FB_GEODE y + + # Video configuration + # Enable KMS for devices whose X.org driver supports it. + DRM_I915_KMS y + DRM_RADEON_KMS y + # Hybrid graphics support + VGA_SWITCHEROO y + + # Sound. + SND_AC97_POWER_SAVE y # AC97 Power-Saving Mode + SND_HDA_INPUT_BEEP y # Support digital beep via input layer + SND_USB_CAIAQ_INPUT y + PSS_MIXER y # Enable PSS mixer (Beethoven ADSP-16 and other compatible) + + # USB serial devices. + USB_SERIAL_GENERIC y # USB Generic Serial Driver + USB_SERIAL_KEYSPAN_MPR y # include firmware for various USB serial devices + USB_SERIAL_KEYSPAN_USA28 y + USB_SERIAL_KEYSPAN_USA28X y + USB_SERIAL_KEYSPAN_USA28XA y + USB_SERIAL_KEYSPAN_USA28XB y + USB_SERIAL_KEYSPAN_USA19 y + USB_SERIAL_KEYSPAN_USA18X y + USB_SERIAL_KEYSPAN_USA19W y + USB_SERIAL_KEYSPAN_USA19QW y + USB_SERIAL_KEYSPAN_USA19QI y + USB_SERIAL_KEYSPAN_USA49W y + USB_SERIAL_KEYSPAN_USA49WLC y + + # Filesystem options - in particular, enable extended attributes and + # ACLs for all filesystems that support them. + EXT2_FS_XATTR y # Ext2 extended attributes + EXT2_FS_POSIX_ACL y # Ext2 POSIX Access Control Lists + EXT2_FS_SECURITY y # Ext2 Security Labels + EXT2_FS_XIP y # Ext2 execute in place support + EXT4_FS_POSIX_ACL y + EXT4_FS_SECURITY y + REISERFS_FS_XATTR y + REISERFS_FS_POSIX_ACL y + REISERFS_FS_SECURITY y + JFS_POSIX_ACL y + JFS_SECURITY y + XFS_QUOTA y + XFS_POSIX_ACL y + XFS_RT y # XFS Realtime subvolume support + OCFS2_DEBUG_MASKLOG n + BTRFS_FS_POSIX_ACL y + UBIFS_FS_XATTR? y + UBIFS_FS_ADVANCED_COMPR y + NFSD_V2_ACL y + NFSD_V3 y + NFSD_V3_ACL y + NFSD_V4 y + CIFS_XATTR y + CIFS_POSIX y + + # Security related features. + STRICT_DEVMEM y # Filter access to /dev/mem + SECURITY_SELINUX_BOOTPARAM_VALUE 0 # disable SELinux by default + + # Misc. options. + 8139TOO_8129 y + 8139TOO_PIO n # PIO is slower + AIC79XX_DEBUG_ENABLE n + AIC7XXX_DEBUG_ENABLE n + AIC94XX_DEBUG n + B43_PCMCIA y + BLK_DEV_CMD640_ENHANCED y # CMD640 enhanced support + BLK_DEV_IDEACPI y # IDE ACPI support + BLK_DEV_INTEGRITY y + BSD_PROCESS_ACCT_V3 y + BT_HCIUART_BCSP y + BT_HCIUART_H4 y # UART (H4) protocol support + BT_HCIUART_LL y + BT_RFCOMM m + BT_RFCOMM_TTY y # RFCOMM TTY support + CRASH_DUMP n + DMAR? n # experimental + DVB_DYNAMIC_MINORS y # we use udev + EFI_STUB y # EFI bootloader in the bzImage itself + FUSION y # Fusion MPT device support + IDE_GD_ATAPI y # ATAPI floppy support + IRDA_ULTRA y # Ultra (connectionless) protocol + JOYSTICK_IFORCE_232 y # I-Force Serial joysticks and wheels + JOYSTICK_IFORCE_USB y # I-Force USB joysticks and wheels + JOYSTICK_XPAD_FF y # X-Box gamepad rumble support + JOYSTICK_XPAD_LEDS y # LED Support for Xbox360 controller 'BigX' LED + LDM_PARTITION y # Windows Logical Disk Manager (Dynamic Disk) support + LEDS_TRIGGER_IDE_DISK y # LED IDE Disk Trigger + LOGIRUMBLEPAD2_FF y # Logitech Rumblepad 2 force feedback + LOGO n # not needed + MEDIA_ATTACH y + MEGARAID_NEWGEN y + MICROCODE_AMD y + MODVERSIONS y + MOUSE_PS2_ELANTECH y # Elantech PS/2 protocol extension + MTRR_SANITIZER y + NET_FC y # Fibre Channel driver support + PPP_MULTILINK y # PPP multilink support + REGULATOR y # Voltage and Current Regulator Support + SCSI_LOGGING y # SCSI logging facility + SERIAL_8250 y # 8250/16550 and compatible serial support + SLIP_COMPRESSED y # CSLIP compressed headers + SLIP_SMART y + THERMAL_HWMON y # Hardware monitoring support + USB_DEBUG n + USB_EHCI_ROOT_HUB_TT y # Root Hub Transaction Translators + USB_EHCI_TT_NEWSCHED y # Improved transaction translator scheduling + X86_CHECK_BIOS_CORRUPTION y + X86_MCE y + XEN_DOM0 y + + # Linux Containers + RT_GROUP_SCHED? y + CGROUP_DEVICE? y + CGROUP_MEM_RES_CTLR? y + CGROUP_MEM_RES_CTLR_SWAP? y + DEVPTS_MULTIPLE_INSTANCES? y + + # Enable staging drivers. These are somewhat experimental, but + # they generally don't hurt. + STAGING y + + # PROC_EVENTS requires that the netlink connector is not built + # as a module. This is required by libcgroup's cgrulesengd. + CONNECTOR y + PROC_EVENTS y + + # Tracing + FTRACE y + FUNCTION_TRACER y + FTRACE_SYSCALLS y + SCHED_TRACER y + + # Devtmpfs support. + DEVTMPFS y + + ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""} + ${extraConfig} + ''; +in + +import ./generic.nix ( + + rec { + version = "3.5.3"; + testing = false; + + preConfigure = '' + substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' "" + ''; + + src = fetchurl { + url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz"; + sha256 = "1p8imlvka3mjm74k09535lyqgdrl1jxrldzd7c8k4qlh5s8fz13w"; + }; + + config = configWithPlatform stdenv.platform; + configCross = configWithPlatform stdenv.cross.platform; + + features.iwlwifi = true; + features.efiBootStub = true; + features.needsCifsUtils = true; + } + + // removeAttrs args ["extraConfig"] +) diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix new file mode 100644 index 00000000000..52e284827d0 --- /dev/null +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -0,0 +1,167 @@ +{ stdenv, runCommand, nettools, perl, kmod, writeTextFile }: + +with stdenv.lib; + +let + + # Function to parse the config file into a nix expression + readConfig = configFile: + let + configAttrs = import "${runCommand "config.nix" {} '' + (. ${configFile} + echo "{" + for var in `set`; do + if [[ "$var" =~ ^CONFIG_ ]]; then + IFS="=" + set -- $var + echo "\"$1\" = \"''${*:2}\";" + fi + done + echo "}") > $out + ''}"; + + config = configAttrs // rec { + attrName = attr: "CONFIG_" + attr; + + isSet = attr: hasAttr (attrName attr) config; + + getValue = attr: if isSet attr then getAttr (attrName attr) config else null; + + isYes = attr: (isSet attr) && ((getValue attr) == "y"); + + isNo = attr: (isSet attr) && ((getValue attr) == "n"); + + isModule = attr: (isSet attr) && ((getValue attr) == "m"); + + isEnabled = attr: (isModule attr) || (isYes attr); + + isDisabled = attr: (!(isSet attr)) || (isNo attr); + }; + in + config; + +in + +{ + # The kernel version + version, + # The version of the kernel module directory + modDirVersion ? version, + # The kernel source (tarball, git checkout, etc.) + src, + # Any patches + kernelPatches ? [], + # The kernel .config file + configfile, + # Manually specified nixexpr representing the config + # If unspecified, this will be autodetected from the .config + config ? optionalAttrs allowImportFromDerivation (readConfig configfile), + # Whether to utilize the controversial import-from-derivation feature to parse the config + allowImportFromDerivation ? false +}: + +let + installkernel = name: writeTextFile { name = "installkernel"; executable=true; text = '' + #!/bin/sh + mkdir $4 + cp -av $2 $4/${name} + cp -av $3 $4 + '';}; + + isModular = config.isYes "MODULES"; + + installsFirmware = (config.isEnabled "FW_LOADER") && + (isModular || (config.isDisabled "FIRMWARE_IN_KERNEL")); + + commonMakeFlags = [ + "O=$(buildRoot)" + "INSTALL_PATH=$(out)" + ] ++ (optional isModular "INSTALL_MOD_PATH=$(out)") + ++ optional installsFirmware "INSTALL_FW_PATH=$(out)/lib/firmware"; +in + +stdenv.mkDerivation { + name = "linux-${version}"; + + enableParallelBuilding = true; + + passthru = { + inherit version modDirVersion config kernelPatches src; + }; + + sourceRoot = stdenv.mkDerivation { + name = "linux-${version}-source"; + + inherit src; + + patches = map (p: p.patch) kernelPatches; + + phases = [ "unpackPhase" "patchPhase" "installPhase" ]; + + prePatch = '' + for mf in $(find -name Makefile -o -name Makefile.include -o -name install.sh); do + echo "stripping FHS paths in \`$mf'..." + sed -i "$mf" -e 's|/usr/bin/||g ; s|/bin/||g ; s|/sbin/||g' + done + sed -i Makefile -e 's|= depmod|= ${kmod}/sbin/depmod|' + ''; + + installPhase = '' + cd .. + mv $sourceRoot $out + ''; + }; + + unpackPhase = '' + mkdir build + export buildRoot="$(pwd)/build" + ln -sv ${configfile} $buildRoot/.config + cd $sourceRoot + ''; + + configurePhase = '' + runHook preConfigure + make $makeFlags "''${makeFlagsArray[@]}" oldconfig + runHook postConfigure + ''; + + buildNativeInputs = [ perl nettools ]; + + makeFlags = commonMakeFlags ++ [ + "INSTALLKERNEL=${installkernel stdenv.platform.kernelTarget}" + ]; + + crossAttrs = { + makeFlags = commonMakeFlags ++ [ + "INSTALLKERNEL=${installkernel stdenv.cross.platform.kernelTarget}" + ]; + }; + + postInstall = optionalString installsFirmware '' + mkdir -p $out/lib/firmware + '' + (if isModular then '' + make modules_install $makeFlags "''${makeFlagsArray[@]}" \ + $installFlags "''${installFlagsArray[@]}" + rm -f $out/lib/modules/${modDirVersion}/build + mv $buildRoot $out/lib/modules/${modDirVersion}/build + '' else optionalString installsFirmware '' + make firmware_install $makeFlags "''${makeFlagsArray[@]}" \ + $installFlags "''${installFlagsArray[@]}" + ''); + + postFixup = optionalString isModular '' + if [ -z "$dontStrip" ]; then + find $out -name "*.ko" -print0 | xargs -0 -r strip -S + fi + ''; + + meta = { + description = "The Linux kernel"; + license = "GPLv2"; + homepage = http://www.kernel.org/; + maintainers = [ + maintainers.shlevy + ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 65cd9b3d830..7aa365a67de 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -149,13 +149,13 @@ rec { aufs3_3 = rec { name = "aufs3.3"; - version = "3.3"; + version = "3.3.20120730"; utilRev = "91af15f977d12e02165759620005f6ce1a4d7602"; utilHash = "dda4df89828dcf0e4012d88b4aa3eda8c30af69d6530ff5fedc2411de872c996"; patch = makeAufs3StandalonePatch { inherit version; - rev = "91c3d8c80172db05575ee82c931f3541947a6aff"; - sha256 = "8fe54993b6a7a290649c193aab5a4f7f2dcecaedb5422d951f898d03753b83fb"; + rev = "ff0c9f1c002ef564d7bd52dd56a9b72f4ee7ce0c"; + sha256 = "cfa1a06669c984e1b8755da649aac40152e8018ee87939c5f0825100e45e196e"; }; features.aufsBase = true; features.aufs3 = true; @@ -163,13 +163,27 @@ rec { aufs3_4 = rec { name = "aufs3.4"; - version = "3.4"; + version = "3.4.20120730"; utilRev = "91af15f977d12e02165759620005f6ce1a4d7602"; utilHash = "dda4df89828dcf0e4012d88b4aa3eda8c30af69d6530ff5fedc2411de872c996"; patch = makeAufs3StandalonePatch { inherit version; - rev = "a5f7df8e59d57d6d9d749d49adc7e5a37ce2e342"; - sha256 = "20a8f113bb654f92231726de8177eb51d7be1b900fd42c2b5f48726a7d5d3ce6"; + rev = "8d7338df43d5e5372424813679c7531cf96ec260"; + sha256 = "37880124df88791d51089277230df0816fc5545c9752be3fa5173385489362c6"; + }; + features.aufsBase = true; + features.aufs3 = true; + }; + + aufs3_5 = rec { + name = "aufs3.5"; + version = "3.5.20120813"; + utilRev = "91af15f977d12e02165759620005f6ce1a4d7602"; + utilHash = "dda4df89828dcf0e4012d88b4aa3eda8c30af69d6530ff5fedc2411de872c996"; + patch = makeAufs3StandalonePatch { + inherit version; + rev = "85b5f7059bc8a1759989408a13fc56f92e0d6d31"; + sha256 = "2be13407a2291c7e69658f10a6fb7672751c906a27ac700a2e5e05dbada97cc5"; }; features.aufsBase = true; features.aufs3 = true; @@ -212,6 +226,11 @@ rec { patch = ./dell-rfkill.patch; }; + perf3_5 = + { name = "perf-3.5"; + patch = ./perf-3.5.patch; + }; + sheevaplug_modules_2_6_35 = { name = "sheevaplug_modules-2.6.35"; patch = ./sheevaplug_modules-2.6.35.patch; diff --git a/pkgs/os-specific/linux/kernel/perf-3.5.patch b/pkgs/os-specific/linux/kernel/perf-3.5.patch new file mode 100644 index 00000000000..6d62a1db80e --- /dev/null +++ b/pkgs/os-specific/linux/kernel/perf-3.5.patch @@ -0,0 +1,17 @@ +http://permalink.gmane.org/gmane.linux.kernel.perf.user/960 + +Fix to build perf. + +diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c +index 9f6cebd..d5491f1 100644 +--- a/tools/perf/util/evsel.c ++++ b/tools/perf/util/evsel.c +@@ -15,7 +15,7 @@ + #include "cpumap.h" + #include "thread_map.h" + #include "target.h" +-#include "../../include/linux/perf_event.h" ++#include "../../../include/linux/perf_event.h" + + #define FD(e, x, y) (*(int *)xyarray__entry(e->fd, x, y)) + #define GROUP_FD(group_fd, cpu) (*(int *)xyarray__entry(group_fd, cpu, 0)) diff --git a/pkgs/os-specific/linux/kernel/perf.nix b/pkgs/os-specific/linux/kernel/perf.nix index 669f61556fc..01d989e75b1 100644 --- a/pkgs/os-specific/linux/kernel/perf.nix +++ b/pkgs/os-specific/linux/kernel/perf.nix @@ -7,7 +7,7 @@ assert withGtk -> gtk != null; stdenv.mkDerivation { name = "perf-linux-${kernel.version}"; - inherit (kernel) src; + inherit (kernel) src patches; preConfigure = '' cd tools/perf diff --git a/pkgs/os-specific/linux/kmod/default.nix b/pkgs/os-specific/linux/kmod/default.nix index 89d4c463cc7..afa19491ce5 100644 --- a/pkgs/os-specific/linux/kmod/default.nix +++ b/pkgs/os-specific/linux/kmod/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, xz, zlib, pkgconfig }: stdenv.mkDerivation rec { - name = "kmod-8"; + name = "kmod-9"; src = fetchurl { url = "mirror://kernel/linux/utils/kernel/kmod/${name}.tar.xz"; - sha256 = "0kbkjzcyhkwgcplwa29n0f03ccwpg4df83pdl5nkvsk2rzgx3xrm"; + sha256 = "1kyfplx0gygzxp5dn81yk3cn8zzraqm497vis04r1g1dnry2c1q6"; }; # Disable xz/zlib support to prevent needing them in the initrd. diff --git a/pkgs/os-specific/linux/libcap/default.nix b/pkgs/os-specific/linux/libcap/default.nix index c279393d7a4..667fe63bba7 100644 --- a/pkgs/os-specific/linux/libcap/default.nix +++ b/pkgs/os-specific/linux/libcap/default.nix @@ -1,18 +1,18 @@ -{stdenv, fetchurl, attr, perl}: +{ stdenv, fetchurl, attr, perl }: assert stdenv.isLinux; stdenv.mkDerivation rec { name = "libcap-${version}"; - version = "2.19"; + version = "2.22"; src = fetchurl { - url = "mirror://kernel/linux/libs/security/linux-privs/kernel-2.6/${name}.tar.gz"; - sha256 = "0fdsz9j741npvh222f8p1y6l516z9liibiwdpdr3a4zg53m0pw45"; + url = "mirror://gentoo/distfiles/${name}.tar.bz2"; + sha256 = "03q50j6bg65cc501q87qh328ncav1i8qw2bjig99vxmmfx4bvsvk"; }; - buildNativeInputs = [perl]; - propagatedBuildInputs = [attr]; + buildNativeInputs = [ perl ]; + propagatedBuildInputs = [ attr ]; preConfigure = "cd libcap"; @@ -26,4 +26,9 @@ stdenv.mkDerivation rec { }; postInstall = passthru.postinst name; + + meta = { + description = "Library for working with POSIX capabilities"; + platforms = stdenv.lib.platforms.linux; + }; } diff --git a/pkgs/os-specific/linux/libcap/pam.nix b/pkgs/os-specific/linux/libcap/pam.nix index 4cefa825c8a..b78f32dccbb 100644 --- a/pkgs/os-specific/linux/libcap/pam.nix +++ b/pkgs/os-specific/linux/libcap/pam.nix @@ -3,7 +3,7 @@ assert stdenv.isLinux; stdenv.mkDerivation rec { - name = "cap_pam.so-${libcap.version}"; + name = "libcap-pam-${libcap.version}"; inherit (libcap) src; diff --git a/pkgs/os-specific/linux/libcap/progs.nix b/pkgs/os-specific/linux/libcap/progs.nix index 1b38848e77e..1902b4acb1a 100644 --- a/pkgs/os-specific/linux/libcap/progs.nix +++ b/pkgs/os-specific/linux/libcap/progs.nix @@ -11,5 +11,7 @@ stdenv.mkDerivation rec { preConfigure = "cd progs"; + installFlags = "RAISE_SETFCAP=no"; + postInstall = libcap.postinst name; } diff --git a/pkgs/os-specific/linux/libcgroup/default.nix b/pkgs/os-specific/linux/libcgroup/default.nix index aa73867122f..0246f6729b1 100644 --- a/pkgs/os-specific/linux/libcgroup/default.nix +++ b/pkgs/os-specific/linux/libcgroup/default.nix @@ -1,17 +1,17 @@ { stdenv, fetchurl, pam, yacc, flex }: stdenv.mkDerivation rec { - name = "libcgroup-0.37.1"; + name = "libcgroup-0.38"; src = fetchurl { url = "mirror://sourceforge/libcg/${name}.tar.bz2"; - sha256 = "03awrn49bb84a9vaha1kjdbpwdnrfwmd08mlajjilr6kwlnn620b"; + sha256 = "0zw6144jlvzx0hasl4b07vjfa4lm12jaax6zzkljzxlmifjd2djx"; }; buildInputs = [ pam ]; buildNativeInputs = [ yacc flex ]; - + meta = { description = "Library and tools to manage Linux's cgroup resource management system"; homepage = http://libcg.sourceforge.net/; diff --git a/pkgs/os-specific/linux/libnl/default.nix b/pkgs/os-specific/linux/libnl/default.nix index 35f05e9d009..6fe31c63178 100644 --- a/pkgs/os-specific/linux/libnl/default.nix +++ b/pkgs/os-specific/linux/libnl/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, bison, flex}: stdenv.mkDerivation rec { - name = "libnl-3.0"; + name = "libnl-3.2.13"; src = fetchurl { url = "${meta.homepage}files/${name}.tar.gz"; - sha256 = "1vac10m3w0m5lsypjcrhs2dzwng82nkbzqz8g8kyzkxb3qz5ql3s"; + sha256 = "1ydw42lsd572qwrfgws97n76hyvjdpanwrxm03lysnhfxkna1ssd"; }; buildInputs = [ bison flex ]; diff --git a/pkgs/os-specific/linux/lvm2/default.nix b/pkgs/os-specific/linux/lvm2/default.nix index 3411bc83d8a..1ebebfd634b 100644 --- a/pkgs/os-specific/linux/lvm2/default.nix +++ b/pkgs/os-specific/linux/lvm2/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, pkgconfig, udev }: +{ stdenv, fetchurl, pkgconfig, udev, utillinux, coreutils }: let - v = "2.02.95"; + v = "2.02.97"; in stdenv.mkDerivation { @@ -9,7 +9,7 @@ stdenv.mkDerivation { src = fetchurl { url = "ftp://sources.redhat.com/pub/lvm2/old/LVM2.${v}.tgz"; - sha256 = "09cixpdrbzjybf8k8f0rsgkriyvbaj2acmfsg1bzxnjil4vayd83"; + sha256 = "0azwa555dgvixbdw055yj8cj1q6kd0a36nms005iz7la5q0q5npd"; }; configureFlags = @@ -17,11 +17,28 @@ stdenv.mkDerivation { buildInputs = [ pkgconfig udev ]; - patches = [ ./purity.patch ]; + preConfigure = + '' + substituteInPlace scripts/lvmdump.sh \ + --replace /usr/bin/tr ${coreutils}/bin/tr + substituteInPlace scripts/lvm2_activation_generator_systemd_red_hat.c \ + --replace /usr/sbin/lvm $out/sbin/lvm + ''; + + #patches = [ ./purity.patch ]; # To prevent make install from failing. preInstall = "installFlags=\"OWNER= GROUP= confdir=$out/etc\""; + # Install systemd stuff. + #installTargets = "install install_systemd_generators install_systemd_units install_tmpfiles_configuration"; + + postInstall = + '' + substituteInPlace $out/lib/udev/rules.d/13-dm-disk.rules \ + --replace $out/sbin/blkid ${utillinux}/sbin/blkid + ''; + meta = { homepage = http://sourceware.org/lvm2/; descriptions = "Tools to support Logical Volume Management (LVM) on Linux"; diff --git a/pkgs/os-specific/linux/microcode/converter.nix b/pkgs/os-specific/linux/microcode/converter.nix index ea00c7a6ae4..7b1ff08be0c 100644 --- a/pkgs/os-specific/linux/microcode/converter.nix +++ b/pkgs/os-specific/linux/microcode/converter.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "microcode2ucode-20120205"; src = fetchurl { - url = "http://gentoo-overlays.zugaina.org/gentoo/portage/sys-apps/microcode-data/files/intel-microcode2ucode.c"; + url = "sources.gentoo.org/sys-apps/microcode-data/files/intel-microcode2ucode.c"; sha256 = "c51b1b1d8b4b28e7d5d007917c1e444af1a2ff04a9408aa9067c0e57d70164de"; }; @@ -26,4 +26,4 @@ stdenv.mkDerivation { homepage = http://www.intel.com; description = "Microcode converter for Intel .dat files"; }; -} \ No newline at end of file +} diff --git a/pkgs/os-specific/linux/microcode/intel.nix b/pkgs/os-specific/linux/microcode/intel.nix index d17663b7a65..e85ab29078b 100644 --- a/pkgs/os-specific/linux/microcode/intel.nix +++ b/pkgs/os-specific/linux/microcode/intel.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, microcode2ucode }: -let version = "20111110"; - num = "20728"; +let version = "20120606"; + num = "21385"; in stdenv.mkDerivation { name = "microcode-intel-${version}"; src = fetchurl { url = "http://downloadmirror.intel.com/${num}/eng/microcode-${version}.tgz"; - sha256 = "16f532cdf9cce03e01e714619ad9406a465aa965bbd1288035398db79921cbc1"; + sha256 = "0hs95lj24zx3jscc64zg3hf8xc95vrnsyqlid66h453ib0wf8fg1"; }; buildInputs = [ microcode2ucode ]; @@ -25,4 +25,4 @@ in stdenv.mkDerivation { homepage = http://www.intel.com/; description = "Microcode for Intel processors"; }; -} \ No newline at end of file +} diff --git a/pkgs/os-specific/linux/mountall/default.nix b/pkgs/os-specific/linux/mountall/default.nix index b563b80f9a9..67d7801fdb2 100644 --- a/pkgs/os-specific/linux/mountall/default.nix +++ b/pkgs/os-specific/linux/mountall/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, pkgconfig, libnih, dbus, udev, autoconf, automake, libtool, gettext }: - + stdenv.mkDerivation { name = "mountall-2.35"; - + src = fetchurl { url = https://launchpad.net/ubuntu/+archive/primary/+files/mountall_2.35.tar.gz; sha256 = "1k52d4x75balnwcsqgznvzrdqgbp2dqnrzw0n25kajdcwr192wwy"; @@ -15,10 +15,10 @@ stdenv.mkDerivation { buildInputs = [ pkgconfig libnih dbus.libs udev autoconf automake libtool gettext ]; makeFlags = "initramfshookdir=$(out)/share/initramfs-tools/hooks upstart_jobs_initramfs_configdir=$(out)/share/initramfs-tools/event-driven/upstart-jobs"; - + meta = { homepage = https://launchpad.net/ubuntu/+source/mountall; description = "Utility to mount all filesystems and emit Upstart events"; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 99e5ebe7be7..8714c342f1a 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -8,7 +8,7 @@ with stdenv.lib; -let versionNumber = "295.53"; in +let versionNumber = "304.37"; in stdenv.mkDerivation { name = "nvidia-x11-${versionNumber}${optionalString (!libsOnly) "-${kernel.version}"}"; @@ -19,12 +19,12 @@ stdenv.mkDerivation { if stdenv.system == "i686-linux" then fetchurl { url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run"; - sha256 = "185hy1d4yixc9drz4r3wgya30zbqcyh2949wfjaqcvxc2ri0jh00"; + sha256 = "0dxka66vp15xgm7z9v6x01gdvyvj3l9c33sa7zyahdxbr6h78cdb"; } else if stdenv.system == "x86_64-linux" then fetchurl { url = "http://us.download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run"; - sha256 = "06fdx3iwqcscwkl14rdb5n1wzscm0gvdxfywr5bzf7y591w4yl7y"; + sha256 = "1xjg91sh7zyn6djdm78wdfas8j7cqn96nyy5zavsnd9jh7v1i0gp"; } else throw "nvidia-x11 does not support platform ${stdenv.system}"; diff --git a/pkgs/os-specific/linux/nvidia-x11/legacy173.nix b/pkgs/os-specific/linux/nvidia-x11/legacy173.nix index 4b30137f5b6..0112270f3bf 100644 --- a/pkgs/os-specific/linux/nvidia-x11/legacy173.nix +++ b/pkgs/os-specific/linux/nvidia-x11/legacy173.nix @@ -1,8 +1,8 @@ -{stdenv, fetchurl, kernel, xlibs, zlib, gtk, atk, pango, glib}: +{stdenv, fetchurl, kernel, xlibs, zlib, gtk, atk, pango, glib, gdk_pixbuf}: let - versionNumber = "173.14.31"; + versionNumber = "173.14.35"; in @@ -15,12 +15,12 @@ stdenv.mkDerivation { if stdenv.system == "i686-linux" then fetchurl { url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}-pkg0.run"; - sha256 = "090rkl1psmcsx3mxb6lnirqipka8vp78y2j7pzqyzl592qpscmg8"; + sha256 = "16kjxj2bn78cgyb4xq39zajjv1hx1z5dw50n9r17w14ifq7i09id"; } else if stdenv.system == "x86_64-linux" then fetchurl { url = "http://us.download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-pkg0.run"; - sha256 = "0hs4fd61iha7b2936wj5w5fj3rxmw60jnkgf6l1pl3va7sfw30d2"; + sha256 = "0mk7pj7in090dx2v5yzkd7qkaf0qvz3jv4cmpiflpmzmg9p15x8n"; } else throw "nvidia-x11 does not support platform ${stdenv.system}"; @@ -32,7 +32,7 @@ stdenv.mkDerivation { cudaPath = stdenv.lib.makeLibraryPath [zlib stdenv.gcc.gcc]; - programPath = stdenv.lib.makeLibraryPath [ gtk atk pango glib xlibs.libXv ]; + programPath = stdenv.lib.makeLibraryPath [ gtk atk pango glib gdk_pixbuf xlibs.libXv ]; meta = { homepage = http://www.nvidia.com/object/unix.html; diff --git a/pkgs/os-specific/linux/powertop/default.nix b/pkgs/os-specific/linux/powertop/default.nix index d175c5f0478..68075d115a4 100644 --- a/pkgs/os-specific/linux/powertop/default.nix +++ b/pkgs/os-specific/linux/powertop/default.nix @@ -1,13 +1,13 @@ -{ stdenv, fetchurl, gettext, libnl1, ncurses, pciutils, pkgconfig, zlib }: +{ stdenv, fetchurl, gettext, libnl, ncurses, pciutils, pkgconfig, zlib }: stdenv.mkDerivation rec { - name = "powertop-2.0"; + name = "powertop-2.1"; src = fetchurl { - url = "https://01.org/powertop/sites/default/files/downloads/${name}.tar.bz2"; - sha256 = "7af51d320856b3446bcc314c9414385f3b05b9360f650883b0210cd3b12c5c1c"; + url = "https://01.org/powertop/sites/default/files/downloads/${name}.tar.gz"; + sha256 = "16161nlah4i4hq8vyx7ds1vq7icdzwm7gmyjg0xhcrs1r9n83m1x"; }; - buildInputs = [ gettext libnl1 ncurses pciutils pkgconfig zlib ]; + buildInputs = [ gettext libnl ncurses pciutils pkgconfig zlib ]; meta = { description = "Analyze power consumption on Intel-based laptops"; diff --git a/pkgs/os-specific/linux/qemu-kvm/default.nix b/pkgs/os-specific/linux/qemu-kvm/default.nix index f6709bb439f..39b7074e299 100644 --- a/pkgs/os-specific/linux/qemu-kvm/default.nix +++ b/pkgs/os-specific/linux/qemu-kvm/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, attr, zlib, SDL, alsaLib, pkgconfig, pciutils, libuuid, vde2 -, libjpeg, libpng, ncurses, python, glib, libaio, mesa }: +, libjpeg, libpng, ncurses, python, glib, libaio, mesa +, spice, spiceProtocol, spiceSupport ? false }: assert stdenv.isLinux; @@ -23,19 +24,24 @@ stdenv.mkDerivation rec { s|/usr/bin/python|${python}/bin/python|g ; s|/bin/rm|rm|g' done + '' + stdenv.lib.optionalString spiceSupport '' + for i in configure spice-qemu-char.c ui/spice-input.c ui/spice-core.c ui/qemu-spice.h + do + substituteInPlace $i --replace '#include ' '#include ' + done ''; configureFlags = [ "--audio-drv-list=alsa" "--smbd=smbd" # use `smbd' from $PATH - ]; + ] ++ stdenv.lib.optional spiceSupport "--enable-spice"; enableParallelBuilding = true; buildInputs = [ attr zlib SDL alsaLib pkgconfig pciutils libuuid vde2 libjpeg libpng ncurses python glib libaio mesa - ]; + ] ++ stdenv.lib.optionals spiceSupport [ spiceProtocol spice ]; postInstall = '' diff --git a/pkgs/os-specific/linux/shadow/default.nix b/pkgs/os-specific/linux/shadow/default.nix index f14b249d514..d401a04e6b9 100644 --- a/pkgs/os-specific/linux/shadow/default.nix +++ b/pkgs/os-specific/linux/shadow/default.nix @@ -1,21 +1,25 @@ { stdenv, fetchurl, pam ? null, glibcCross ? null }: let - glibc = if stdenv ? cross - then glibcCross - else assert stdenv ? glibc; stdenv.glibc; + + glibc = + if stdenv ? cross + then glibcCross + else assert stdenv ? glibc; stdenv.glibc; + in + stdenv.mkDerivation rec { - name = "shadow-4.1.4.2"; + name = "shadow-4.1.5.1"; src = fetchurl { url = "http://pkg-shadow.alioth.debian.org/releases/${name}.tar.bz2"; - sha256 = "1449ny7pdnwkavg92wvibapnkgdq5pas38nvl1m5xa37g5m7z64p"; + sha256 = "1yvqx57vzih0jdy3grir8vfbkxp0cl0myql37bnmi2yn90vk6cma"; }; buildInputs = stdenv.lib.optional (pam != null && stdenv.isLinux) pam; - patches = [ ./no-sanitize-env.patch ./su-name.patch ./keep-path.patch ]; + patches = [ ./keep-path.patch ]; # Assume System V `setpgrp (void)', which is the default on GNU variants # (`AC_FUNC_SETPGRP' is not cross-compilation capable.) @@ -26,6 +30,12 @@ stdenv.mkDerivation rec { substituteInPlace lib/nscd.c --replace /usr/sbin/nscd ${glibc}/sbin/nscd ''; + # Don't install ‘groups’, since coreutils already provides it. + postInstall = + '' + rm $out/bin/groups $out/share/man/man1/groups.* + ''; + meta = { homepage = http://pkg-shadow.alioth.debian.org/; description = "Suite containing authentication-related tools such as passwd and su"; diff --git a/pkgs/os-specific/linux/shadow/keep-path.patch b/pkgs/os-specific/linux/shadow/keep-path.patch index 4b8406b53b0..99fd17c27bc 100644 --- a/pkgs/os-specific/linux/shadow/keep-path.patch +++ b/pkgs/os-specific/linux/shadow/keep-path.patch @@ -1,18 +1,15 @@ -Don't reset $PATH to /bin:/usr/bin. This is consistent with `su' in -coreutils and important on NixOS. - -diff -ru -x '*~' shadow-4.1.4.2-orig/src/su.c shadow-4.1.4.2/src/su.c ---- shadow-4.1.4.2-orig/src/su.c 2009-07-23 22:38:56.000000000 +0200 -+++ shadow-4.1.4.2/src/su.c 2010-06-04 13:23:11.000000000 +0200 -@@ -827,6 +827,7 @@ - (void) signal (SIGINT, SIG_DFL); - (void) signal (SIGQUIT, SIG_DFL); +diff -ru shadow-4.1.5.1-orig/src/su.c shadow-4.1.5.1/src/su.c +--- shadow-4.1.5.1-orig/src/su.c 2012-05-25 07:51:55.000000000 -0400 ++++ shadow-4.1.5.1/src/su.c 2012-07-25 17:22:57.013547930 -0400 +@@ -879,6 +879,7 @@ + } + } +#if 0 - cp = getdef_str ((pwent.pw_uid == 0) ? "ENV_SUPATH" : "ENV_PATH"); + cp = getdef_str ((pw->pw_uid == 0) ? "ENV_SUPATH" : "ENV_PATH"); if (NULL == cp) { - addenv ("PATH=/bin:/usr/bin", NULL); -@@ -835,6 +836,7 @@ + addenv ((pw->pw_uid == 0) ? "PATH=/sbin:/bin:/usr/sbin:/usr/bin" : "PATH=/bin:/usr/bin", NULL); +@@ -887,6 +888,7 @@ } else { addenv ("PATH", cp); } diff --git a/pkgs/os-specific/linux/shadow/no-sanitize-env.patch b/pkgs/os-specific/linux/shadow/no-sanitize-env.patch deleted file mode 100644 index 902706d137e..00000000000 --- a/pkgs/os-specific/linux/shadow/no-sanitize-env.patch +++ /dev/null @@ -1,16 +0,0 @@ -Don't remove environment variables such as PATH or SHELL. - -http://bugs.gentoo.org/show_bug.cgi?id=301957 -https://alioth.debian.org/scm/browser.php?group_id=30580 - ---- a/src/su.c -+++ b/src/su.c -@@ -342,7 +342,7 @@ - #endif - #endif /* !USE_PAM */ - -- sanitize_env (); -+ /* sanitize_env (); */ - - (void) setlocale (LC_ALL, ""); - (void) bindtextdomain (PACKAGE, LOCALEDIR); diff --git a/pkgs/os-specific/linux/shadow/su-name.patch b/pkgs/os-specific/linux/shadow/su-name.patch deleted file mode 100644 index 5873c934274..00000000000 --- a/pkgs/os-specific/linux/shadow/su-name.patch +++ /dev/null @@ -1,20 +0,0 @@ -When su is invoked with command line arguments for the shell (e.g. "su -- -c 'cmd'"), set argv[0] in the shell to "-su" or "-" (as -determined by the SU_NAME option in /etc/login.defs). This is -necessary to make Bash compiled with the NON_INTERACTIVE_LOGIN_SHELLS -option to read startup files. It is also consistent with the -behaviour of `su' in coreutils, and with the case where there are no -arguments ("su -"). - -diff -ru -x '*~' shadow-4.1.4.2-orig/src/su.c shadow-4.1.4.2/src/su.c ---- shadow-4.1.4.2-orig/src/su.c 2009-07-23 22:38:56.000000000 +0200 -+++ shadow-4.1.4.2/src/su.c 2010-06-04 13:02:24.000000000 +0200 -@@ -983,7 +983,7 @@ - * Use the shell and create an argv - * with the rest of the command line included. - */ -- argv[-1] = shellstr; -+ argv[-1] = cp; - #ifndef USE_PAM - execve_shell (shellstr, &argv[-1], environ); - err = errno; diff --git a/pkgs/os-specific/linux/sysklogd/builder.sh b/pkgs/os-specific/linux/sysklogd/builder.sh deleted file mode 100644 index d466f075652..00000000000 --- a/pkgs/os-specific/linux/sysklogd/builder.sh +++ /dev/null @@ -1,13 +0,0 @@ -source $stdenv/setup - -prefix=$out -export prefix - -installFlags="BINDIR=$out/sbin MANDIR=$out/share/man INSTALL=install" -patchPhase="sed -e 's@-o \${MAN_USER} -g \${MAN_GROUP} -m \${MAN_PERMS} @@' -i Makefile" - -mkdir -p "$out/share/man/man8/" -mkdir -p "$out/share/man/man5/" -mkdir -p "$out/sbin" - -genericBuild diff --git a/pkgs/os-specific/linux/sysklogd/default.nix b/pkgs/os-specific/linux/sysklogd/default.nix index 2fe27add5bf..979bfa1d0bf 100644 --- a/pkgs/os-specific/linux/sysklogd/default.nix +++ b/pkgs/os-specific/linux/sysklogd/default.nix @@ -2,9 +2,24 @@ stdenv.mkDerivation { name = "sysklogd-1.5"; - builder = ./builder.sh; + src = fetchurl { url = http://www.infodrom.org/projects/sysklogd/download/sysklogd-1.5.tar.gz; sha256 = "0wxpkrznqwz4dy11k90s2sqszwp7d4mlc0ag8288wa193plvhsb1"; }; + + patches = [ ./systemd.patch ]; + + installFlags = "BINDIR=$(out)/sbin MANDIR=$(out)/share/man INSTALL=install"; + + preConfigure = + '' + sed -e 's@-o \''${MAN_USER} -g \''${MAN_GROUP} -m \''${MAN_PERMS} @@' -i Makefile + ''; + + preInstall = "mkdir -p $out/share/man/man5/ $out/share/man/man8/ $out/sbin"; + + meta = { + description = "A system logging daemon"; + }; } diff --git a/pkgs/os-specific/linux/sysklogd/systemd.patch b/pkgs/os-specific/linux/sysklogd/systemd.patch new file mode 100644 index 00000000000..ecdf2b57ebf --- /dev/null +++ b/pkgs/os-specific/linux/sysklogd/systemd.patch @@ -0,0 +1,850 @@ +Based on http://ftp.free.org/mirrors/rsync.frugalware.org/frugalware-testing/source/apps-extra/sysklogd/sysklogd-1.5-systemd.diff + +diff --git a/Makefile b/Makefile +index 9a114b8..aef1fd6 100644 +--- a/Makefile ++++ b/Makefile +@@ -20,7 +20,7 @@ + CC= gcc + #SKFLAGS= -g -DSYSV -Wall + #LDFLAGS= -g +-SKFLAGS= $(RPM_OPT_FLAGS) -O3 -DSYSV -fomit-frame-pointer -Wall -fno-strength-reduce ++SKFLAGS= $(RPM_OPT_FLAGS) -O3 -DSYSV -fomit-frame-pointer -Wall -fno-strength-reduce -I. + # -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE + # -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE + # $(shell getconf LFS_SKFLAGS) +@@ -79,8 +79,8 @@ test: syslog_tst ksym oops.ko tsyslogd + + install: install_man install_exec + +-syslogd: syslogd.o pidfile.o +- ${CC} ${LDFLAGS} -o syslogd syslogd.o pidfile.o ${LIBS} ++syslogd: syslogd.o pidfile.o sd-daemon.o ++ ${CC} ${LDFLAGS} -o syslogd syslogd.o pidfile.o sd-daemon.o ${LIBS} + + klogd: klogd.o syslog.o pidfile.o ksym.o ksym_mod.o + ${CC} ${LDFLAGS} -o klogd klogd.o syslog.o pidfile.o ksym.o \ +@@ -101,6 +101,9 @@ syslogd.o: syslogd.c version.h + syslog.o: syslog.c + ${CC} ${SKFLAGS} ${SYSLOG_FLAGS} -c syslog.c + ++sd-daemon.o: sd-daemon.c sd-daemon.h ++ ${CC} ${SKFLAGS} ${SYSLOG_FLAGS} -c sd-daemon.c ++ + klogd.o: klogd.c klogd.h version.h + ${CC} ${SKFLAGS} ${KLOGD_FLAGS} $(DEB) -c klogd.c + +diff --git a/sd-daemon.c b/sd-daemon.c +new file mode 100644 +index 0000000..6d1eebf +--- /dev/null ++++ b/sd-daemon.c +@@ -0,0 +1,436 @@ ++/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ ++ ++/*** ++ Copyright 2010 Lennart Poettering ++ ++ Permission is hereby granted, free of charge, to any person ++ obtaining a copy of this software and associated documentation files ++ (the "Software"), to deal in the Software without restriction, ++ including without limitation the rights to use, copy, modify, merge, ++ publish, distribute, sublicense, and/or sell copies of the Software, ++ and to permit persons to whom the Software is furnished to do so, ++ subject to the following conditions: ++ ++ The above copyright notice and this permission notice shall be ++ included in all copies or substantial portions of the Software. ++ ++ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, ++ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF ++ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND ++ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS ++ BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ++ ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN ++ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE ++ SOFTWARE. ++***/ ++ ++#ifndef _GNU_SOURCE ++#define _GNU_SOURCE ++#endif ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include "sd-daemon.h" ++ ++int sd_listen_fds(int unset_environment) { ++ ++#if defined(DISABLE_SYSTEMD) || !defined(__linux__) ++ return 0; ++#else ++ int r, fd; ++ const char *e; ++ char *p = NULL; ++ unsigned long l; ++ ++ if (!(e = getenv("LISTEN_PID"))) { ++ r = 0; ++ goto finish; ++ } ++ ++ errno = 0; ++ l = strtoul(e, &p, 10); ++ ++ if (errno != 0) { ++ r = -errno; ++ goto finish; ++ } ++ ++ if (!p || *p || l <= 0) { ++ r = -EINVAL; ++ goto finish; ++ } ++ ++ /* Is this for us? */ ++ if (getpid() != (pid_t) l) { ++ r = 0; ++ goto finish; ++ } ++ ++ if (!(e = getenv("LISTEN_FDS"))) { ++ r = 0; ++ goto finish; ++ } ++ ++ errno = 0; ++ l = strtoul(e, &p, 10); ++ ++ if (errno != 0) { ++ r = -errno; ++ goto finish; ++ } ++ ++ if (!p || *p) { ++ r = -EINVAL; ++ goto finish; ++ } ++ ++ for (fd = SD_LISTEN_FDS_START; fd < SD_LISTEN_FDS_START + (int) l; fd ++) { ++ int flags; ++ ++ if ((flags = fcntl(fd, F_GETFD)) < 0) { ++ r = -errno; ++ goto finish; ++ } ++ ++ if (flags & FD_CLOEXEC) ++ continue; ++ ++ if (fcntl(fd, F_SETFD, flags | FD_CLOEXEC) < 0) { ++ r = -errno; ++ goto finish; ++ } ++ } ++ ++ r = (int) l; ++ ++finish: ++ if (unset_environment) { ++ unsetenv("LISTEN_PID"); ++ unsetenv("LISTEN_FDS"); ++ } ++ ++ return r; ++#endif ++} ++ ++int sd_is_fifo(int fd, const char *path) { ++ struct stat st_fd; ++ ++ if (fd < 0) ++ return -EINVAL; ++ ++ memset(&st_fd, 0, sizeof(st_fd)); ++ if (fstat(fd, &st_fd) < 0) ++ return -errno; ++ ++ if (!S_ISFIFO(st_fd.st_mode)) ++ return 0; ++ ++ if (path) { ++ struct stat st_path; ++ ++ memset(&st_path, 0, sizeof(st_path)); ++ if (stat(path, &st_path) < 0) { ++ ++ if (errno == ENOENT || errno == ENOTDIR) ++ return 0; ++ ++ return -errno; ++ } ++ ++ return ++ st_path.st_dev == st_fd.st_dev && ++ st_path.st_ino == st_fd.st_ino; ++ } ++ ++ return 1; ++} ++ ++static int sd_is_socket_internal(int fd, int type, int listening) { ++ struct stat st_fd; ++ ++ if (fd < 0 || type < 0) ++ return -EINVAL; ++ ++ if (fstat(fd, &st_fd) < 0) ++ return -errno; ++ ++ if (!S_ISSOCK(st_fd.st_mode)) ++ return 0; ++ ++ if (type != 0) { ++ int other_type = 0; ++ socklen_t l = sizeof(other_type); ++ ++ if (getsockopt(fd, SOL_SOCKET, SO_TYPE, &other_type, &l) < 0) ++ return -errno; ++ ++ if (l != sizeof(other_type)) ++ return -EINVAL; ++ ++ if (other_type != type) ++ return 0; ++ } ++ ++ if (listening >= 0) { ++ int accepting = 0; ++ socklen_t l = sizeof(accepting); ++ ++ if (getsockopt(fd, SOL_SOCKET, SO_ACCEPTCONN, &accepting, &l) < 0) ++ return -errno; ++ ++ if (l != sizeof(accepting)) ++ return -EINVAL; ++ ++ if (!accepting != !listening) ++ return 0; ++ } ++ ++ return 1; ++} ++ ++union sockaddr_union { ++ struct sockaddr sa; ++ struct sockaddr_in in4; ++ struct sockaddr_in6 in6; ++ struct sockaddr_un un; ++ struct sockaddr_storage storage; ++}; ++ ++int sd_is_socket(int fd, int family, int type, int listening) { ++ int r; ++ ++ if (family < 0) ++ return -EINVAL; ++ ++ if ((r = sd_is_socket_internal(fd, type, listening)) <= 0) ++ return r; ++ ++ if (family > 0) { ++ union sockaddr_union sockaddr; ++ socklen_t l; ++ ++ memset(&sockaddr, 0, sizeof(sockaddr)); ++ l = sizeof(sockaddr); ++ ++ if (getsockname(fd, &sockaddr.sa, &l) < 0) ++ return -errno; ++ ++ if (l < sizeof(sa_family_t)) ++ return -EINVAL; ++ ++ return sockaddr.sa.sa_family == family; ++ } ++ ++ return 1; ++} ++ ++int sd_is_socket_inet(int fd, int family, int type, int listening, uint16_t port) { ++ union sockaddr_union sockaddr; ++ socklen_t l; ++ int r; ++ ++ if (family != 0 && family != AF_INET && family != AF_INET6) ++ return -EINVAL; ++ ++ if ((r = sd_is_socket_internal(fd, type, listening)) <= 0) ++ return r; ++ ++ memset(&sockaddr, 0, sizeof(sockaddr)); ++ l = sizeof(sockaddr); ++ ++ if (getsockname(fd, &sockaddr.sa, &l) < 0) ++ return -errno; ++ ++ if (l < sizeof(sa_family_t)) ++ return -EINVAL; ++ ++ if (sockaddr.sa.sa_family != AF_INET && ++ sockaddr.sa.sa_family != AF_INET6) ++ return 0; ++ ++ if (family > 0) ++ if (sockaddr.sa.sa_family != family) ++ return 0; ++ ++ if (port > 0) { ++ if (sockaddr.sa.sa_family == AF_INET) { ++ if (l < sizeof(struct sockaddr_in)) ++ return -EINVAL; ++ ++ return htons(port) == sockaddr.in4.sin_port; ++ } else { ++ if (l < sizeof(struct sockaddr_in6)) ++ return -EINVAL; ++ ++ return htons(port) == sockaddr.in6.sin6_port; ++ } ++ } ++ ++ return 1; ++} ++ ++int sd_is_socket_unix(int fd, int type, int listening, const char *path, size_t length) { ++ union sockaddr_union sockaddr; ++ socklen_t l; ++ int r; ++ ++ if ((r = sd_is_socket_internal(fd, type, listening)) <= 0) ++ return r; ++ ++ memset(&sockaddr, 0, sizeof(sockaddr)); ++ l = sizeof(sockaddr); ++ ++ if (getsockname(fd, &sockaddr.sa, &l) < 0) ++ return -errno; ++ ++ if (l < sizeof(sa_family_t)) ++ return -EINVAL; ++ ++ if (sockaddr.sa.sa_family != AF_UNIX) ++ return 0; ++ ++ if (path) { ++ if (length <= 0) ++ length = strlen(path); ++ ++ if (length <= 0) ++ /* Unnamed socket */ ++ return l == offsetof(struct sockaddr_un, sun_path); ++ ++ if (path[0]) ++ /* Normal path socket */ ++ return ++ (l >= offsetof(struct sockaddr_un, sun_path) + length + 1) && ++ memcmp(path, sockaddr.un.sun_path, length+1) == 0; ++ else ++ /* Abstract namespace socket */ ++ return ++ (l == offsetof(struct sockaddr_un, sun_path) + length) && ++ memcmp(path, sockaddr.un.sun_path, length) == 0; ++ } ++ ++ return 1; ++} ++ ++int sd_notify(int unset_environment, const char *state) { ++#if defined(DISABLE_SYSTEMD) || !defined(__linux__) || !defined(SOCK_CLOEXEC) ++ return 0; ++#else ++ int fd = -1, r; ++ struct msghdr msghdr; ++ struct iovec iovec; ++ union sockaddr_union sockaddr; ++ const char *e; ++ ++ if (!state) { ++ r = -EINVAL; ++ goto finish; ++ } ++ ++ if (!(e = getenv("NOTIFY_SOCKET"))) ++ return 0; ++ ++ /* Must be an abstract socket, or an absolute path */ ++ if ((e[0] != '@' && e[0] != '/') || e[1] == 0) { ++ r = -EINVAL; ++ goto finish; ++ } ++ ++ if ((fd = socket(AF_UNIX, SOCK_DGRAM|SOCK_CLOEXEC, 0)) < 0) { ++ r = -errno; ++ goto finish; ++ } ++ ++ memset(&sockaddr, 0, sizeof(sockaddr)); ++ sockaddr.sa.sa_family = AF_UNIX; ++ strncpy(sockaddr.un.sun_path, e, sizeof(sockaddr.un.sun_path)); ++ ++ if (sockaddr.un.sun_path[0] == '@') ++ sockaddr.un.sun_path[0] = 0; ++ ++ memset(&iovec, 0, sizeof(iovec)); ++ iovec.iov_base = (char*) state; ++ iovec.iov_len = strlen(state); ++ ++ memset(&msghdr, 0, sizeof(msghdr)); ++ msghdr.msg_name = &sockaddr; ++ msghdr.msg_namelen = offsetof(struct sockaddr_un, sun_path) + strlen(e); ++ ++ if (msghdr.msg_namelen > sizeof(struct sockaddr_un)) ++ msghdr.msg_namelen = sizeof(struct sockaddr_un); ++ ++ msghdr.msg_iov = &iovec; ++ msghdr.msg_iovlen = 1; ++ ++ if (sendmsg(fd, &msghdr, MSG_NOSIGNAL) < 0) { ++ r = -errno; ++ goto finish; ++ } ++ ++ r = 1; ++ ++finish: ++ if (unset_environment) ++ unsetenv("NOTIFY_SOCKET"); ++ ++ if (fd >= 0) ++ close(fd); ++ ++ return r; ++#endif ++} ++ ++int sd_notifyf(int unset_environment, const char *format, ...) { ++#if defined(DISABLE_SYSTEMD) || !defined(__linux__) ++ return 0; ++#else ++ va_list ap; ++ char *p = NULL; ++ int r; ++ ++ va_start(ap, format); ++ r = vasprintf(&p, format, ap); ++ va_end(ap); ++ ++ if (r < 0 || !p) ++ return -ENOMEM; ++ ++ r = sd_notify(unset_environment, p); ++ free(p); ++ ++ return r; ++#endif ++} ++ ++int sd_booted(void) { ++#if defined(DISABLE_SYSTEMD) || !defined(__linux__) ++ return 0; ++#else ++ ++ struct stat a, b; ++ ++ /* We simply test whether the systemd cgroup hierarchy is ++ * mounted */ ++ ++ if (lstat("/sys/fs/cgroup", &a) < 0) ++ return 0; ++ ++ if (lstat("/sys/fs/cgroup/systemd", &b) < 0) ++ return 0; ++ ++ return a.st_dev != b.st_dev; ++#endif ++} +diff --git a/sd-daemon.h b/sd-daemon.h +new file mode 100644 +index 0000000..d0a0a94 +--- /dev/null ++++ b/sd-daemon.h +@@ -0,0 +1,265 @@ ++/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ ++ ++#ifndef foosddaemonhfoo ++#define foosddaemonhfoo ++ ++/*** ++ Copyright 2010 Lennart Poettering ++ ++ Permission is hereby granted, free of charge, to any person ++ obtaining a copy of this software and associated documentation files ++ (the "Software"), to deal in the Software without restriction, ++ including without limitation the rights to use, copy, modify, merge, ++ publish, distribute, sublicense, and/or sell copies of the Software, ++ and to permit persons to whom the Software is furnished to do so, ++ subject to the following conditions: ++ ++ The above copyright notice and this permission notice shall be ++ included in all copies or substantial portions of the Software. ++ ++ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, ++ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF ++ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND ++ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS ++ BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ++ ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN ++ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE ++ SOFTWARE. ++***/ ++ ++#include ++#include ++ ++#ifdef __cplusplus ++extern "C" { ++#endif ++ ++/* ++ Reference implementation of a few systemd related interfaces for ++ writing daemons. These interfaces are trivial to implement. To ++ simplify porting we provide this reference implementation. ++ Applications are welcome to reimplement the algorithms described ++ here if they do not want to include these two source files. ++ ++ The following functionality is provided: ++ ++ - Support for logging with log levels on stderr ++ - File descriptor passing for socket-based activation ++ - Daemon startup and status notification ++ - Detection of systemd boots ++ ++ You may compile this with -DDISABLE_SYSTEMD to disable systemd ++ support. This makes all those calls NOPs that are directly related to ++ systemd (i.e. only sd_is_xxx() will stay useful). ++ ++ Since this is drop-in code we don't want any of our symbols to be ++ exported in any case. Hence we declare hidden visibility for all of ++ them. ++ ++ You may find an up-to-date version of these source files online: ++ ++ http://cgit.freedesktop.org/systemd/plain/src/sd-daemon.h ++ http://cgit.freedesktop.org/systemd/plain/src/sd-daemon.c ++ ++ This should compile on non-Linux systems, too, but with the ++ exception of the sd_is_xxx() calls all functions will become NOPs. ++ ++ See sd-daemon(7) for more information. ++*/ ++ ++#ifndef _sd_printf_attr_ ++#if __GNUC__ >= 4 ++#define _sd_printf_attr_(a,b) __attribute__ ((format (printf, a, b))) ++#else ++#define _sd_printf_attr_(a,b) ++#endif ++#endif ++ ++#ifndef _sd_hidden_ ++#if (__GNUC__ >= 4) && !defined(SD_EXPORT_SYMBOLS) ++#define _sd_hidden_ __attribute__ ((visibility("hidden"))) ++#else ++#define _sd_hidden_ ++#endif ++#endif ++ ++/* ++ Log levels for usage on stderr: ++ ++ fprintf(stderr, SD_NOTICE "Hello World!\n"); ++ ++ This is similar to printk() usage in the kernel. ++*/ ++#define SD_EMERG "<0>" /* system is unusable */ ++#define SD_ALERT "<1>" /* action must be taken immediately */ ++#define SD_CRIT "<2>" /* critical conditions */ ++#define SD_ERR "<3>" /* error conditions */ ++#define SD_WARNING "<4>" /* warning conditions */ ++#define SD_NOTICE "<5>" /* normal but significant condition */ ++#define SD_INFO "<6>" /* informational */ ++#define SD_DEBUG "<7>" /* debug-level messages */ ++ ++/* The first passed file descriptor is fd 3 */ ++#define SD_LISTEN_FDS_START 3 ++ ++/* ++ Returns how many file descriptors have been passed, or a negative ++ errno code on failure. Optionally, removes the $LISTEN_FDS and ++ $LISTEN_PID file descriptors from the environment (recommended, but ++ problematic in threaded environments). If r is the return value of ++ this function you'll find the file descriptors passed as fds ++ SD_LISTEN_FDS_START to SD_LISTEN_FDS_START+r-1. Returns a negative ++ errno style error code on failure. This function call ensures that ++ the FD_CLOEXEC flag is set for the passed file descriptors, to make ++ sure they are not passed on to child processes. If FD_CLOEXEC shall ++ not be set, the caller needs to unset it after this call for all file ++ descriptors that are used. ++ ++ See sd_listen_fds(3) for more information. ++*/ ++int sd_listen_fds(int unset_environment) _sd_hidden_; ++ ++/* ++ Helper call for identifying a passed file descriptor. Returns 1 if ++ the file descriptor is a FIFO in the file system stored under the ++ specified path, 0 otherwise. If path is NULL a path name check will ++ not be done and the call only verifies if the file descriptor ++ refers to a FIFO. Returns a negative errno style error code on ++ failure. ++ ++ See sd_is_fifo(3) for more information. ++*/ ++int sd_is_fifo(int fd, const char *path) _sd_hidden_; ++ ++/* ++ Helper call for identifying a passed file descriptor. Returns 1 if ++ the file descriptor is a socket of the specified family (AF_INET, ++ ...) and type (SOCK_DGRAM, SOCK_STREAM, ...), 0 otherwise. If ++ family is 0 a socket family check will not be done. If type is 0 a ++ socket type check will not be done and the call only verifies if ++ the file descriptor refers to a socket. If listening is > 0 it is ++ verified that the socket is in listening mode. (i.e. listen() has ++ been called) If listening is == 0 it is verified that the socket is ++ not in listening mode. If listening is < 0 no listening mode check ++ is done. Returns a negative errno style error code on failure. ++ ++ See sd_is_socket(3) for more information. ++*/ ++int sd_is_socket(int fd, int family, int type, int listening) _sd_hidden_; ++ ++/* ++ Helper call for identifying a passed file descriptor. Returns 1 if ++ the file descriptor is an Internet socket, of the specified family ++ (either AF_INET or AF_INET6) and the specified type (SOCK_DGRAM, ++ SOCK_STREAM, ...), 0 otherwise. If version is 0 a protocol version ++ check is not done. If type is 0 a socket type check will not be ++ done. If port is 0 a socket port check will not be done. The ++ listening flag is used the same way as in sd_is_socket(). Returns a ++ negative errno style error code on failure. ++ ++ See sd_is_socket_inet(3) for more information. ++*/ ++int sd_is_socket_inet(int fd, int family, int type, int listening, uint16_t port) _sd_hidden_; ++ ++/* ++ Helper call for identifying a passed file descriptor. Returns 1 if ++ the file descriptor is an AF_UNIX socket of the specified type ++ (SOCK_DGRAM, SOCK_STREAM, ...) and path, 0 otherwise. If type is 0 ++ a socket type check will not be done. If path is NULL a socket path ++ check will not be done. For normal AF_UNIX sockets set length to ++ 0. For abstract namespace sockets set length to the length of the ++ socket name (including the initial 0 byte), and pass the full ++ socket path in path (including the initial 0 byte). The listening ++ flag is used the same way as in sd_is_socket(). Returns a negative ++ errno style error code on failure. ++ ++ See sd_is_socket_unix(3) for more information. ++*/ ++int sd_is_socket_unix(int fd, int type, int listening, const char *path, size_t length) _sd_hidden_; ++ ++/* ++ Informs systemd about changed daemon state. This takes a number of ++ newline separated environment-style variable assignments in a ++ string. The following variables are known: ++ ++ READY=1 Tells systemd that daemon startup is finished (only ++ relevant for services of Type=notify). The passed ++ argument is a boolean "1" or "0". Since there is ++ little value in signalling non-readiness the only ++ value daemons should send is "READY=1". ++ ++ STATUS=... Passes a single-line status string back to systemd ++ that describes the daemon state. This is free-from ++ and can be used for various purposes: general state ++ feedback, fsck-like programs could pass completion ++ percentages and failing programs could pass a human ++ readable error message. Example: "STATUS=Completed ++ 66% of file system check..." ++ ++ ERRNO=... If a daemon fails, the errno-style error code, ++ formatted as string. Example: "ERRNO=2" for ENOENT. ++ ++ BUSERROR=... If a daemon fails, the D-Bus error-style error ++ code. Example: "BUSERROR=org.freedesktop.DBus.Error.TimedOut" ++ ++ MAINPID=... The main pid of a daemon, in case systemd did not ++ fork off the process itself. Example: "MAINPID=4711" ++ ++ Daemons can choose to send additional variables. However, it is ++ recommened to prefix variable names not listed above with X_. ++ ++ Returns a negative errno-style error code on failure. Returns > 0 ++ if systemd could be notified, 0 if it couldn't possibly because ++ systemd is not running. ++ ++ Example: When a daemon finished starting up, it could issue this ++ call to notify systemd about it: ++ ++ sd_notify(0, "READY=1"); ++ ++ See sd_notifyf() for more complete examples. ++ ++ See sd_notify(3) for more information. ++*/ ++int sd_notify(int unset_environment, const char *state) _sd_hidden_; ++ ++/* ++ Similar to sd_notify() but takes a format string. ++ ++ Example 1: A daemon could send the following after initialization: ++ ++ sd_notifyf(0, "READY=1\n" ++ "STATUS=Processing requests...\n" ++ "MAINPID=%lu", ++ (unsigned long) getpid()); ++ ++ Example 2: A daemon could send the following shortly before ++ exiting, on failure: ++ ++ sd_notifyf(0, "STATUS=Failed to start up: %s\n" ++ "ERRNO=%i", ++ strerror(errno), ++ errno); ++ ++ See sd_notifyf(3) for more information. ++*/ ++int sd_notifyf(int unset_environment, const char *format, ...) _sd_printf_attr_(2,3) _sd_hidden_; ++ ++/* ++ Returns > 0 if the system was booted with systemd. Returns < 0 on ++ error. Returns 0 if the system was not booted with systemd. Note ++ that all of the functions above handle non-systemd boots just ++ fine. You should NOT protect them with a call to this function. Also ++ note that this function checks whether the system, not the user ++ session is controlled by systemd. However the functions above work ++ for both user and system services. ++ ++ See sd_booted(3) for more information. ++*/ ++int sd_booted(void) _sd_hidden_; ++ ++#ifdef __cplusplus ++} ++#endif ++ ++#endif +diff --git a/syslogd.c b/syslogd.c +index acfd8f1..9bfa8c7 100644 +--- a/syslogd.c ++++ b/syslogd.c +@@ -551,6 +551,7 @@ static char sccsid[] = "@(#)syslogd.c 5.27 (Berkeley) 10/10/88"; + + #if defined(__linux__) + #include ++#include + #endif + + #ifndef UTMP_FILE +@@ -965,8 +966,11 @@ int main(argc, argv) + } + signal (SIGTERM, SIG_DFL); + num_fds = getdtablesize(); +- for (i= 0; i < num_fds; i++) +- (void) close(i); ++#if defined(__linux__) ++ if (sd_listen_fds(0) <= 0) ++#endif ++ for (i = 0; i < num_fds; i++) ++ (void) close(i); + untty(); + } + else +@@ -1253,6 +1257,60 @@ static int create_unix_socket(const char *path) + if (path[0] == '\0') + return -1; + ++#if defined(__linux__) ++ if (strcmp(path, _PATH_LOG) == 0) { ++ int r; ++ ++ /* Check whether an FD was passed in from systemd. If ++ * so, it's the /dev/log socket, so use it. */ ++ ++ r = sd_listen_fds(0); ++ if (r < 0) { ++ logerror("Failed to acquire systemd socket"); ++#ifndef SYSV ++ dienow(); ++#else ++ return -1; ++#endif ++ } ++ ++ ++ if (r > 1) { ++ logerror("Wrong number of systemd sockets passed"); ++#ifndef SYSV ++ dienow(); ++#else ++ return -1; ++#endif ++ } ++ ++ if (r == 1) { ++ fd = SD_LISTEN_FDS_START; ++ r = sd_is_socket_unix(fd, SOCK_DGRAM, -1, "/run/systemd/journal/syslog", 0); ++ if (r < 0) { ++ logerror("Failed to verify systemd socket type"); ++#ifndef SYSV ++ dienow(); ++#else ++ return -1; ++#endif ++ } ++ ++ if (!r) { ++ logerror("Passed systemd socket of wrong type"); ++#ifndef SYSV ++ dienow(); ++#else ++ return -1; ++#endif ++ } ++ ++ dprintf("Using systemd socket (%d).\n", fd); ++ return fd; ++ } ++ } ++#endif ++ + (void) unlink(path); + + memset(&sunx, 0, sizeof(sunx)); +@@ -2254,7 +2311,12 @@ void die(sig) + if (InetInuse) close(inetm); + + /* Clean-up files. */ +- for (i = 0; i < nfunix; i++) ++ i = 0; ++#if defined(__linux__) ++ if (sd_listen_fds(0) > 0) ++ i = 1; ++#endif ++ for (; i < nfunix; i++) + if (funixn[i] && funix[i] != -1) + (void)unlink(funixn[i]); + #ifndef TESTING diff --git a/pkgs/os-specific/linux/sysstat/default.nix b/pkgs/os-specific/linux/sysstat/default.nix index 3f464dbd656..2b4888f89cd 100644 --- a/pkgs/os-specific/linux/sysstat/default.nix +++ b/pkgs/os-specific/linux/sysstat/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, gettext }: stdenv.mkDerivation rec { - name = "sysstat-10.0.3"; + name = "sysstat-10.1.1"; src = fetchurl { url = "http://perso.orange.fr/sebastien.godard/${name}.tar.bz2"; - sha256 = "0z7zr1b4xg9k8rbk2rnghjcycdfi0vb55f117d46ygcdym9ks0i2"; + sha256 = "1ig6k4yjkkazddjr90hykiapl30s9r9c1gy1h8hqzn2c3xgkm7p3"; }; buildInputs = [ gettext ]; @@ -13,9 +13,11 @@ stdenv.mkDerivation rec { preConfigure = '' export PATH_CP=$(type -tp cp) export PATH_CHKCONFIG=/no-such-program - makeFlagsArray=(SA_DIR=$out/var/log/sa SYSCONFIG_DIR=$out/etc CHOWN=true IGNORE_MAN_GROUP=y) + makeFlagsArray=(SA_DIR=/var/log/sa SYSCONFIG_DIR=$out/etc CHOWN=true IGNORE_MAN_GROUP=y) ''; + patches = [ ./no-install-statedir.patch ]; + meta = { homepage = http://sebastien.godard.pagesperso-orange.fr/; description = "A collection of performance monitoring tools for Linux (such as sar, iostat and pidstat)"; diff --git a/pkgs/os-specific/linux/sysstat/no-install-statedir.patch b/pkgs/os-specific/linux/sysstat/no-install-statedir.patch new file mode 100644 index 00000000000..ef81f97217f --- /dev/null +++ b/pkgs/os-specific/linux/sysstat/no-install-statedir.patch @@ -0,0 +1,37 @@ +diff -rc sysstat-10.1.1/Makefile.in sysstat-10.1.1-new/Makefile.in +*** sysstat-10.1.1/Makefile.in 2012-01-02 14:36:00.000000000 +0100 +--- sysstat-10.1.1-new/Makefile.in 2012-08-14 14:11:17.676124739 +0200 +*************** +*** 309,315 **** + install_base: all sa1 sa2 sysstat.sysconfig install_man install_nls \ + contrib/isag/isag + mkdir -p $(DESTDIR)$(SA_LIB_DIR) +! mkdir -p $(DESTDIR)$(SA_DIR) + ifeq ($(CLEAN_SA_DIR),y) + find $(DESTDIR)$(SA_DIR) \( -name 'sar??' -o -name 'sa??' -o -name 'sar??.gz' -o -name 'sa??.gz' \) \ + -exec rm -f {} \; +--- 309,315 ---- + install_base: all sa1 sa2 sysstat.sysconfig install_man install_nls \ + contrib/isag/isag + mkdir -p $(DESTDIR)$(SA_LIB_DIR) +! #mkdir -p $(DESTDIR)$(SA_DIR) + ifeq ($(CLEAN_SA_DIR),y) + find $(DESTDIR)$(SA_DIR) \( -name 'sar??' -o -name 'sa??' -o -name 'sar??.gz' -o -name 'sa??.gz' \) \ + -exec rm -f {} \; +*************** +*** 344,350 **** + + install_all: install_base cron/crontab sysstat \ + cron/sysstat.crond cron/sysstat.cron.daily cron/sysstat.cron.hourly +! $(CHOWN) $(CRON_OWNER) $(DESTDIR)$(SA_DIR) + if [ -d $(DESTDIR)/etc/cron.d ]; then \ + $(INSTALL_DATA) cron/sysstat.crond $(DESTDIR)/etc/cron.d/sysstat; \ + elif [ -d $(DESTDIR)/etc/cron.hourly -a -d $(DESTDIR)/etc/cron.daily ]; then \ +--- 344,350 ---- + + install_all: install_base cron/crontab sysstat \ + cron/sysstat.crond cron/sysstat.cron.daily cron/sysstat.cron.hourly +! #$(CHOWN) $(CRON_OWNER) $(DESTDIR)$(SA_DIR) + if [ -d $(DESTDIR)/etc/cron.d ]; then \ + $(INSTALL_DATA) cron/sysstat.crond $(DESTDIR)/etc/cron.d/sysstat; \ + elif [ -d $(DESTDIR)/etc/cron.hourly -a -d $(DESTDIR)/etc/cron.daily ]; then \ diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index bc60400146d..e6e5822c9ea 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -1,19 +1,23 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gperf, libcap, udev, dbus, kmod +{ stdenv, fetchurl, pkgconfig, intltool, gperf, libcap, dbus, kmod , xz, pam, acl, cryptsetup, libuuid, m4, utillinux, usbutils, pciutils , glib, kbd }: +assert stdenv.gcc.libc or null != null; + stdenv.mkDerivation rec { - name = "systemd-185"; + name = "systemd-188"; src = fetchurl { url = "http://www.freedesktop.org/software/systemd/${name}.tar.xz"; - sha256 = "1iwp41xvpq0x2flhhs8lpyjbfyg1220ahmy7037zdjy26w9g82br"; + sha256 = "0nr1cg1mizbwcafjcqw3c30mx6xdv596jpbgjlxr6myvc5hfsfg8"; }; + patches = [ ./fail-after-reaching-respawn-limit.patch ]; + buildInputs = - [ pkgconfig intltool gperf libcap udev dbus kmod xz pam acl - cryptsetup libuuid m4 usbutils pciutils glib + [ pkgconfig intltool gperf libcap dbus kmod xz pam acl + /* cryptsetup */ libuuid m4 usbutils pciutils glib ]; configureFlags = @@ -45,7 +49,16 @@ stdenv.mkDerivation rec { done ''; - NIX_CFLAGS_COMPILE = "-DKBD_LOADKEYS=\"${kbd}/bin/loadkeys\" -DKBD_SETFONT=\"${kbd}/bin/setfont\""; + NIX_CFLAGS_COMPILE = + [ "-DKBD_LOADKEYS=\"${kbd}/bin/loadkeys\"" + "-DKBD_SETFONT=\"${kbd}/bin/setfont\"" + # Can't say ${polkit}/bin/pkttyagent here because that would + # lead to a cyclic dependency. + "-DPOLKIT_AGENT_BINARY_PATH=\"/run/current-system/sw/bin/pkttyagent\"" + "-fno-stack-protector" + ]; + + makeFlags = "CPPFLAGS=-I${stdenv.gcc.libc}/include"; installFlags = "localstatedir=$(TMPDIR)/var sysconfdir=$(out)/etc"; @@ -60,12 +73,20 @@ stdenv.mkDerivation rec { mkdir -p $out/sbin ln -s $out/lib/systemd/systemd $out/sbin/telinit for i in init halt poweroff runlevel reboot shutdown; do - ln -s $out/bin/systemctl $out/sbin/$i + ln -s $out/bin/systemctl $out/sbin/$i done ''; enableParallelBuilding = true; - + + # The interface version prevents NixOS from switching to an + # incompatible systemd at runtime. (Switching across reboots is + # fine, of course.) It should be increased whenever systemd changes + # in a backwards-incompatible way. If the interface version of two + # systemd builds is the same, then we can switch between them at + # runtime; otherwise we can't and we need to reboot. + passthru.interfaceVersion = 2; + meta = { homepage = http://www.freedesktop.org/wiki/Software/systemd; description = "A system and service manager for Linux"; diff --git a/pkgs/os-specific/linux/systemd/fail-after-reaching-respawn-limit.patch b/pkgs/os-specific/linux/systemd/fail-after-reaching-respawn-limit.patch new file mode 100644 index 00000000000..7271b5578d5 --- /dev/null +++ b/pkgs/os-specific/linux/systemd/fail-after-reaching-respawn-limit.patch @@ -0,0 +1,12 @@ +diff --git a/src/core/service.c b/src/core/service.c +index 1c127bd..eafdbe5 100644 +--- a/src/core/service.c ++++ b/src/core/service.c +@@ -2487,6 +2487,7 @@ static int service_start(Unit *u) { + r = service_start_limit_test(s); + if (r < 0) { + service_notify_sockets_dead(s, true); ++ service_set_state(s, SERVICE_FAILED); + return r; + } + diff --git a/pkgs/os-specific/linux/sysvinit/default.nix b/pkgs/os-specific/linux/sysvinit/default.nix index c088d3c5b1b..7b3ea62ea2d 100644 --- a/pkgs/os-specific/linux/sysvinit/default.nix +++ b/pkgs/os-specific/linux/sysvinit/default.nix @@ -34,6 +34,7 @@ stdenv.mkDerivation { rm -rf $out/include rm -rf $out/share/man/man5 rm $(for i in $out/share/man/man8/*; do echo $i; done | grep -v 'pidof\|killall5') + rm $out/bin/{mountpoint,wall} $out/share/man/man1/{mountpoint.1,wall.1} ''; meta = { diff --git a/pkgs/os-specific/linux/upower/default.nix b/pkgs/os-specific/linux/upower/default.nix index 4a8cfbdbc51..2f870e5d999 100644 --- a/pkgs/os-specific/linux/upower/default.nix +++ b/pkgs/os-specific/linux/upower/default.nix @@ -1,27 +1,39 @@ -{ stdenv, fetchurl, pkgconfig, glib, dbus, dbus_glib, polkit -, intltool, libxslt, docbook_xsl, udev, libusb1, pmutils }: +{ stdenv, fetchurl, pkgconfig, glib, dbus, dbus_glib, dbus_tools, polkit +, intltool, libxslt, docbook_xsl, udev, libusb1, pmutils +, useSystemd ? false, systemd ? null +}: assert stdenv.isLinux; stdenv.mkDerivation rec { - name = "upower-0.9.16"; + name = "upower-0.9.18"; src = fetchurl { url = "http://upower.freedesktop.org/releases/${name}.tar.xz"; - sha256 = "eb9a3d39a8cb62970fd612e333bc7a43437ab0e7890303578b0a7e3c67c8c212"; + sha256 = "13q6cw2d45qp077g3bjng4yhrvm6g1y9347dkf53kscm5xfm18d1"; }; - buildInputs = [ dbus_glib polkit intltool libxslt docbook_xsl udev libusb1 ]; + buildInputs = + [ dbus_glib polkit intltool libxslt docbook_xsl udev libusb1 ] + ++ stdenv.lib.optional useSystemd systemd; buildNativeInputs = [ pkgconfig ]; - configureFlags = "--with-backend=linux --localstatedir=/var"; + configureFlags = + [ "--with-backend=linux" "--localstatedir=/var" ] + ++ stdenv.lib.optional useSystemd + [ "--enable-systemd" + "--with-systemdsystemunitdir=$(out)/etc/systemd/system" + "--with-systemdutildir=$(out)/lib/systemd/system-sleep" + ]; preConfigure = '' substituteInPlace src/linux/up-backend.c \ --replace /usr/bin/pm- ${pmutils}/bin/pm- \ --replace /usr/sbin/pm- ${pmutils}/sbin/pm- + substituteInPlace src/notify-upower.sh \ + --replace /usr/bin/dbus-send ${dbus_tools}/bin/dbus-send ''; installFlags = "historydir=$(TMPDIR)/foo"; diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix index 522478ed5b7..f947bc9a1e7 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/default.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchurl, openssl, dbus_libs, pkgconfig, libnl1 }: +{ stdenv, fetchurl, openssl, dbus_libs, pkgconfig, libnl }: stdenv.mkDerivation rec { - version = "0.7.3"; - + version = "1.0"; + name = "wpa_supplicant-${version}"; src = fetchurl { - url = "http://hostap.epitest.fi/releases/wpa_supplicant-${version}.tar.gz"; - sha256 = "0hwlsn512q2ps8wxxjmkjfdg3vjqqb9mxnnwfv1wqijkm3551kfh"; + url = "http://hostap.epitest.fi/releases/${name}.tar.gz"; + sha256 = "171b9027rbzy64zaal4832ix9i3mm6ypwmynbpia5bss793ivm4i"; }; - + preBuild = '' cd wpa_supplicant cp -v defconfig .config @@ -18,26 +18,19 @@ stdenv.mkDerivation rec { 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 substituteInPlace Makefile --replace /usr/local $out ''; - buildInputs = [ openssl dbus_libs libnl1 ]; + buildInputs = [ openssl dbus_libs libnl ]; buildNativeInputs = [ pkgconfig ]; patches = - [ # Upstream patch required for NetworkManager-0.9 - (fetchurl { - url = "http://w1.fi/gitweb/gitweb.cgi?p=hostap-07.git;a=commitdiff_plain;h=b80b5639935d37b95d00f86b57f2844a9c775f57"; - name = "wpa_supplicant-nm-0.9.patch"; - sha256 = "1pqba0l4rfhba5qafvvbywi9x1qmphs944p704bh1flnx7cz6ya8"; - }) - # wpa_supplicant crashes when controlled through dbus (wicd/nm) - # see: https://bugzilla.redhat.com/show_bug.cgi?id=678625 - (fetchurl { - url = "https://bugzilla.redhat.com/attachment.cgi?id=491018"; - name = "dbus-assertion-fix.patch"; - sha256 = "6206d79bcd800d56cae73e2a01a27ac2bee961512f77e5d62a59256a9919077a"; + [ (fetchurl { + url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/hostap_allow-linking-with-libnl-3.2.patch?h=packages/wpa_supplicant"; + name = "hostap_allow-linking-with-libnl-3.2.patch"; + sha256 = "0iwvjq0apc6mv1r03k5pnyjgda3q47yx36c4lqvv8i8q1vn7kbf2"; }) ]; diff --git a/pkgs/os-specific/linux/xf86-input-wacom/default.nix b/pkgs/os-specific/linux/xf86-input-wacom/default.nix index 98446c70867..4bcf82a7052 100644 --- a/pkgs/os-specific/linux/xf86-input-wacom/default.nix +++ b/pkgs/os-specific/linux/xf86-input-wacom/default.nix @@ -1,16 +1,16 @@ { stdenv, fetchurl -, file, inputproto, libX11, libXext, libXi, libXrandr, libXrender +, file, inputproto, libX11, libXext, libXi, libXrandr, libXrender, libXinerama , ncurses, pkgconfig, randrproto, xorgserver, xproto, udev }: stdenv.mkDerivation rec { - name = "xf86-input-wacom-0.11.1"; + name = "xf86-input-wacom-0.16.0"; src = fetchurl { url = "mirror://sourceforge/linuxwacom/${name}.tar.bz2"; - sha256 = "1jmnrkf89a3jjbpn17gyndlv9lqc0n7qwyi22hraxypq213gjclx"; + sha256 = "0sc0hmbs3l3ad68iwglbwjv9lg1vd333n1lv72j4nqmk7g57yrii"; }; - buildInputs = [ inputproto libX11 libXext libXi libXrandr libXrender + buildInputs = [ inputproto libX11 libXext libXi libXrandr libXrender libXinerama ncurses pkgconfig randrproto xorgserver xproto udev ]; preConfigure = '' diff --git a/pkgs/os-specific/linux/xf86-video-nested/default.nix b/pkgs/os-specific/linux/xf86-video-nested/default.nix new file mode 100644 index 00000000000..6ed04f490c0 --- /dev/null +++ b/pkgs/os-specific/linux/xf86-video-nested/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchgit, autoconf, automake, fontsproto, libX11, libXext +, libtool, pkgconfig, renderproto, utilmacros, xorgserver +}: + +stdenv.mkDerivation { + name = "xf86-video-nested-2011-09-12"; + + # Breaks at 8d80f2e415e9e58ca481fe52ae8f2290e25de898 for Xorg 7.6 + src = fetchgit { + url = git://anongit.freedesktop.org/xorg/driver/xf86-video-nested; + rev = "fceee1716625badf698ca27dd5788a4deb8533bc"; + sha256 = "6b3544ddcf40602364fd0e528f6e677c37ef8d08f6c4e756caea7e29abf200f7"; + }; + + # Fixed in e123277d10337a1c3b853118df0d1becdddf3b77 + patchPhase = "sed -e 's/Werror/Werror -Wno-extra-portability/g' -i configure.ac"; + + buildInputs = + [ autoconf automake fontsproto libX11 libXext libtool pkgconfig + renderproto utilmacros xorgserver + ]; + + configureScript = "./autogen.sh"; + + meta = { + homepage = git://anongit.freedesktop.org/xorg/driver/xf86-video-nested; + description = "Driver to run Xorg on top of Xorg or something else"; + maintainers = [ stdenv.lib.maintainers.goibhniu ]; + }; +} diff --git a/pkgs/servers/elasticmq/default.nix b/pkgs/servers/elasticmq/default.nix new file mode 100644 index 00000000000..3d0324775f8 --- /dev/null +++ b/pkgs/servers/elasticmq/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchurl, jre, makeWrapper, which }: + +stdenv.mkDerivation rec { + name = "elasticmq-0.5"; + + src = fetchurl { + url = "https://github.com/downloads/adamw/elasticmq/${name}.tar.gz"; + sha256 = "1zpv3vzairprh4x9fia82qqr14kf5hpxq1r90mn4ww7ighbv9pf1"; + }; + + buildInputs = [ makeWrapper ]; + + installPhase = + '' + mkdir -p $out/bin + cp -prd lib conf $out/ + + cp bin/run.sh $out/bin/elasticmq + substituteInPlace $out/bin/elasticmq --replace '-DBASEDIR=$BASEDIR' '-DBASEDIR=''${ELASTICMQ_DATA_PREFIX:-.}' + + wrapProgram $out/bin/elasticmq --prefix PATH : "${which}/bin:${jre}/bin" + ''; + + meta = { + homepage = https://github.com/adamw/elasticmq; + description = "Message queueing system with Java, Scala and Amazon SQS-compatible interfaces"; + longDescription = + '' + ElasticMQ is a message queueing system with Java, Scala and + Amazon SQS-compatible interfaces. You should set the + environment ELASTICMQ_DATA_PREFIX to a writable directory + where ElasticMQ will store its data and log files. It also + looks for its configuration file in + $ELASTICMQ_DATA_PREFIX/conf/Default.scala. You can use the + Default.scala included in the distribution as a template. + ''; + license = "APLv2"; + }; +} diff --git a/pkgs/servers/http/apache-httpd/default.nix b/pkgs/servers/http/apache-httpd/2.2.nix similarity index 82% rename from pkgs/servers/http/apache-httpd/default.nix rename to pkgs/servers/http/apache-httpd/2.2.nix index 1f5e1ae69bc..f2a21ee28be 100644 --- a/pkgs/servers/http/apache-httpd/default.nix +++ b/pkgs/servers/http/apache-httpd/2.2.nix @@ -2,10 +2,14 @@ , sslSupport, proxySupport ? true , apr, aprutil, pcre , ldapSupport ? true, openldap +, # Multi-processing module to use. This is built into the server and + # cannot be selected at runtime. + mpm ? "prefork" }: assert sslSupport -> openssl != null; assert ldapSupport -> aprutil.ldapSupport && openldap != null; +assert mpm == "prefork" || mpm == "worker" || mpm == "event"; stdenv.mkDerivation rec { version = "2.2.22"; @@ -24,6 +28,9 @@ stdenv.mkDerivation rec { # passing simply CFLAGS did not help, then I go by NIX_CFLAGS_COMPILE NIX_CFLAGS_COMPILE = "-iquote ${apr}/include/apr-1"; + # Required for ‘pthread_cancel’. + NIX_LDFLAGS = "-lgcc_s"; + configureFlags = '' --with-z=${zlib} --with-pcre=${pcre} @@ -32,8 +39,11 @@ stdenv.mkDerivation rec { ${if proxySupport then "--enable-proxy" else ""} ${if sslSupport then "--enable-ssl --with-ssl=${openssl}" else ""} ${if ldapSupport then "--enable-ldap --enable-authnz-ldap" else ""} + --with-mpm=${mpm} ''; + enableParallelBuilding = true; + postInstall = '' echo "removing manual" rm -rf $out/manual diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix new file mode 100644 index 00000000000..c9161bf5909 --- /dev/null +++ b/pkgs/servers/http/apache-httpd/2.4.nix @@ -0,0 +1,64 @@ +{ stdenv, fetchurl, perl, zlib, apr, aprutil, pcre +, proxySupport ? true +, sslSupport ? true, openssl +, ldapSupport ? true, openldap +, libxml2Support ? true, libxml2 +, luaSupport ? false, lua5 +}: + +let optional = stdenv.lib.optional; + optionalString = stdenv.lib.optionalString; +in + +assert sslSupport -> aprutil.sslSupport && openssl != null; +assert ldapSupport -> aprutil.ldapSupport && openldap != null; + +stdenv.mkDerivation rec { + version = "2.4.2"; + name = "apache-httpd-${version}"; + + src = fetchurl { + url = "mirror://apache/httpd/httpd-${version}.tar.bz2"; + sha1 = "8d391db515edfb6623c0c7c6ce5c1b2e1f7c64c2"; + }; + + buildInputs = [perl] ++ + optional ldapSupport openldap ++ # there is no --with-ldap flag + optional libxml2Support libxml2; # there is --with-libxml2, but it doesn't work + + # Required for ‘pthread_cancel’. + NIX_LDFLAGS = "-lgcc_s"; + + configureFlags = '' + --with-apr=${apr} + --with-apr-util=${aprutil} + --with-z=${zlib} + --with-pcre=${pcre} + --disable-maintainer-mode + --disable-debugger-mode + --enable-mods-shared=all + --enable-mpms-shared=all + ${optionalString proxySupport "--enable-proxy"} + ${optionalString sslSupport "--enable-ssl --with-ssl=${openssl}"} + ${optionalString luaSupport "--enable-lua --with-lua=${lua5}"} + ''; + + postInstall = '' + echo "removing manual" + rm -rf $out/manual + ''; + + enableParallelBuilding = true; + + passthru = { + inherit apr aprutil sslSupport proxySupport ldapSupport; + }; + + meta = { + description = "Apache HTTPD, the world's most popular web server"; + homepage = "http://httpd.apache.org/"; + license = stdenv.lib.licenses.asl20; + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.simons ]; + }; +} diff --git a/pkgs/servers/http/apache-modules/mod_evasive/default.nix b/pkgs/servers/http/apache-modules/mod_evasive/default.nix new file mode 100644 index 00000000000..22e0fabf832 --- /dev/null +++ b/pkgs/servers/http/apache-modules/mod_evasive/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, apacheHttpd }: + +stdenv.mkDerivation { + name = "mod_evasive_1.10.1"; + + src = fetchurl { + url = http://www.zdziarski.com/blog/wp-content/uploads/2010/02/mod_evasive_1.10.1.tar.gz; + sha256 = "0rsnx50rjv6xygbp9r0gyss7xqdkcb0hy3wh9949jf1im8wm3i07"; + }; + + buildInputs = [ apacheHttpd ]; + + buildPhase = '' + export APACHE_LIBEXECDIR=$out/modules + export makeFlagsArray=(APACHE_LIBEXECDIR=$out/modules) + apxs -ca mod_evasive20.c + ''; + + installPhase = '' + mkdir -p $out/modules + cp .libs/mod_evasive20.so $out/modules + ''; + + meta = { + homepage = "http://www.zdziarski.com/blog/?page_id=442"; + description = "mod_evasive is an evasive maneuvers module for Apache to provide evasive action in the event of an HTTP DoS or DDoS attack or brute force attack."; + + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/servers/mail/dovecot/2.x.nix b/pkgs/servers/mail/dovecot/2.x.nix index 294a58b4f24..1b4fbe7c7cc 100644 --- a/pkgs/servers/mail/dovecot/2.x.nix +++ b/pkgs/servers/mail/dovecot/2.x.nix @@ -1,18 +1,21 @@ -{stdenv, fetchurl, openssl, pam, bzip2, zlib}: +{stdenv, fetchurl, openssl, pam, bzip2, zlib, inotifyTools, openldap}: stdenv.mkDerivation rec { - name = "dovecot-2.1.7"; + name = "dovecot-2.1.8"; - buildInputs = [openssl pam bzip2 zlib]; + buildInputs = [openssl pam bzip2 zlib inotifyTools openldap]; src = fetchurl { url = "http://dovecot.org/releases/2.1/${name}.tar.gz"; - sha256 = "0lpldhs0nvy6rxabqkp14wzcwf1cx4jvnbp1xcm74izrzxhvrdym"; + sha256 = "03801f4agcwdpqyg6dfxlga3750pnhk4gaf8m7sjq1qmz2277028"; }; # It will hardcode this for /var/lib/dovecot. # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=626211 - configureFlags = [ "--localstatedir=/var" ]; + configureFlags = [ + "--localstatedir=/var" + "--with-ldap" + ]; meta = { homepage = http://dovecot.org/; diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix index 16d9127e556..a435eea8663 100644 --- a/pkgs/servers/mail/postfix/default.nix +++ b/pkgs/servers/mail/postfix/default.nix @@ -4,31 +4,22 @@ assert stdenv.isLinux; -stdenv.mkDerivation { - name = "postfix-2.8.6"; - +stdenv.mkDerivation rec { + name = "postfix-2.8.12"; + src = fetchurl { - url = ftp://ftp.cs.uu.nl/mirror/postfix/postfix-release/official/postfix-2.8.6.tar.gz; - sha256 = "1rfsfhna5hy5lc6hkg1zc2862pdc5c1y9z6aiy8rinlmzrfplhlb"; + url = "ftp://ftp.cs.uu.nl/mirror/postfix/postfix-release/official/${name}.tar.gz"; + sha256 = "11z07mjy53l1fnl7k4101yk4ilibgqr1164628mqcbmmr8bh2szl"; }; - installTargets = ["non-interactive-package"]; - - installFlags = [" install_root=$out "]; - - preInstall = '' - sed -e '/^PATH=/d' -i postfix-install - ''; - - postInstall = '' - mkdir -p $out - mv ut/$out/* $out/ + buildInputs = [db4 openssl cyrus_sasl bison perl]; - mkdir $out/share/postfix/conf - cp conf/* $out/share/postfix/conf - sed -e 's@PATH=.*@PATH=${coreutils}/bin:${findutils}/bin:${gnused}/bin:${gnugrep}/bin:'$out'/sbin@' -i $out/share/postfix/conf/post-install $out/libexec/postfix/post-install - sed -e '2aPATH=${coreutils}/bin:${findutils}/bin:${gnused}/bin:${gnugrep}/bin:'$out'/sbin' -i $out/share/postfix/conf/postfix-script $out/libexec/postfix/postfix-script - chmod a+x $out/share/postfix/conf/{postfix-script,post-install} + patches = [ ./postfix-2.2.9-db.patch ./postfix-2.2.9-lib.patch ./db-linux3.patch ]; + + postPatch = '' + sed -i -e s,/usr/bin,/var/run/current-system/sw/bin, \ + -e s,/usr/sbin,/var/run/current-system/sw/sbin, \ + -e s,:/sbin,, src/util/sys_defs.h ''; preBuild = '' @@ -46,15 +37,29 @@ stdenv.mkDerivation { make makefiles CCARGS='-DUSE_TLS -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I${cyrus_sasl}/include/sasl' AUXLIBS='-lssl -lcrypto -lsasl2 -ldb -lnsl' ''; - buildInputs = [db4 openssl cyrus_sasl bison perl]; - - patches = [ ./postfix-2.2.9-db.patch ./postfix-2.2.9-lib.patch ./db-linux3.patch ]; + installPhase = '' + sed -e '/^PATH=/d' -i postfix-install + $SHELL postfix-install install_root=out -non-interactive -package - postPatch = '' - sed -i -e s,/usr/bin,/var/run/current-system/sw/bin, \ - -e s,/usr/sbin,/var/run/current-system/sw/sbin, \ - -e s,:/sbin,, src/util/sys_defs.h + mkdir -p $out + mv -v "out$out/"* $out/ + + mkdir -p $out/share/postfix + mv conf $out/share/postfix/ + mv LICENSE TLS_LICENSE $out/share/postfix/ + + sed -e 's@^PATH=.*@PATH=${coreutils}/bin:${findutils}/bin:${gnused}/bin:${gnugrep}/bin:'$out'/sbin@' -i $out/share/postfix/conf/post-install $out/libexec/postfix/post-install + sed -e '2aPATH=${coreutils}/bin:${findutils}/bin:${gnused}/bin:${gnugrep}/bin:'$out'/sbin' -i $out/share/postfix/conf/postfix-script $out/libexec/postfix/postfix-script + chmod a+x $out/share/postfix/conf/{postfix-script,post-install} ''; - + inherit glibc; + + meta = { + homepage = "http://www.postfix.org/"; + description = "a fast, easy to administer, and secure mail server"; + license = stdenv.lib.licenses.bsdOriginal; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.simons ]; + }; } diff --git a/pkgs/servers/mail/spamassassin/default.nix b/pkgs/servers/mail/spamassassin/default.nix new file mode 100644 index 00000000000..0f5cefb84c2 --- /dev/null +++ b/pkgs/servers/mail/spamassassin/default.nix @@ -0,0 +1,45 @@ +{ stdenv, fetchurl, buildPerlPackage, perl, HTMLParser, NetDNS, NetAddrIP, DBFile +, HTTPDate, MailDKIM, makeWrapper +}: + +# TODO: +# +# - Mail::SPF +# - IP::Country +# - Razor2 +# - Net::Ident +# - DBI +# - LWP::UserAgent +# - Encode::Detect + +buildPerlPackage rec { + name = "SpamAssassin-3.3.2"; + + src = fetchurl { + url = "http://apache.imsam.info/spamassassin/source/Mail-${name}.tar.bz2"; + sha256 = "01d2jcpy423zfnhg123wlhzysih1hmb93nxfspiaajzh9r5rn8y7"; + }; + + buildInputs = [ makeWrapper HTMLParser NetDNS NetAddrIP DBFile HTTPDate + MailDKIM ]; + + # Enabling 'taint' mode is desirable, but that flag disables support + # for the PERL5LIB environment variable. Needs further investigation. + makeFlags = "PERL_BIN=${perl}/bin/perl PERL_TAINT=no"; + + doCheck = false; + + postInstall = '' + for n in "$out/bin/"*; do + wrapProgram "$n" --prefix PERL5LIB : "$PERL5LIB" + done + ''; + + meta = { + homepage = "http://spamassassin.apache.org/"; + description = "Open-Source Spam Filter"; + license = stdenv.lib.licenses.asl20; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.simons ]; + }; +} diff --git a/pkgs/servers/nosql/mongodb/default.nix b/pkgs/servers/nosql/mongodb/default.nix index 685aeb05ce7..ce664972037 100644 --- a/pkgs/servers/nosql/mongodb/default.nix +++ b/pkgs/servers/nosql/mongodb/default.nix @@ -1,39 +1,42 @@ -{ stdenv, fetchurl, scons, which, boost, gnutar, v8 ? null, useV8 ? false}: - -assert useV8 -> v8 != null; +{ stdenv, fetchurl, scons, which, v8, useV8 ? false}: with stdenv.lib; +let installerPatch = fetchurl { + url = "https://jira.mongodb.org/secure/attachment/18160/SConscript.client.patch"; + sha256 = "0n60fh2r8i7m6g113k0iw4adc8jv2by4ahrd780kxg47kzfgw06a"; + }; + +in stdenv.mkDerivation rec { - name = "mongodb-2.0.6"; + name = "mongodb-2.2.0"; src = fetchurl { - url = "http://downloads.mongodb.org/src/mongodb-src-r2.0.6.tar.gz"; - sha256 = "0kiiz8crx318sdn0wd9d88pzx9s1c6ak2dhd0zw7kl63gmd74wm9"; + url = http://downloads.mongodb.org/src/mongodb-src-r2.2.0.tar.gz; + sha256 = "12v0cpq9j2gmagr9pbw08karqwqgl4j9r223w7x7sx5cfvj2cih8"; }; - buildInputs = [scons which boost] ++ stdenv.lib.optional useV8 v8; + buildNativeInputs = [ scons which ]; + + patches = [ installerPatch ]; enableParallelBuilding = true; - patchPhase = '' - substituteInPlace SConstruct --replace "Environment( MSVS_ARCH=msarch , tools = [\"default\", \"gch\"], toolpath = '.' )" "Environment( MSVS_ARCH=msarch , tools = [\"default\", \"gch\"], toolpath = '.', ENV = os.environ )" - substituteInPlace SConstruct --replace "../v8" "${v8}" - substituteInPlace SConstruct --replace "LIBPATH=[\"${v8}/\"]" "LIBPATH=[\"${v8}/lib\"]" + postPatch = '' + substituteInPlace SConstruct --replace "Environment( BUILD_DIR" "Environment( ENV = os.environ, BUILD_DIR" + '' + optionalString useV8 '' + substituteInPlace SConstruct --replace "#/../v8" "${v8}" \ + --replace "[\"${v8}/\"]" "[\"${v8}/lib\"]" ''; buildPhase = '' - export TERM="" - scons all --cc=`which gcc` --cxx=`which g++` --libpath=${boost}/lib --cpppath=${boost}/include \ - ${optionalString useV8 "--usev8"} + echo $PATH + scons all --cc=`which gcc` --cxx=`which g++` ${optionalString useV8 "--usev8"} ''; installPhase = '' - scons install --cc=`which gcc` --cxx=`which g++` --libpath=${boost}/lib --cpppath=${boost}/include \ - ${optionalString useV8 "--usev8"} --full --prefix=$out - if [ -d $out/lib64 ]; then - mv $out/lib64 $out/lib - fi + scons install --cc=`which gcc` --cxx=`which g++` ${optionalString useV8 "--usev8"} --full --prefix=$out + rm -rf $out/lib64 # exact same files as installed in $out/lib ''; meta = { @@ -42,7 +45,6 @@ stdenv.mkDerivation rec { license = "AGPLv3"; maintainers = [ stdenv.lib.maintainers.bluescreen303 ]; - platforms = stdenv.lib.platforms.all; + platforms = stdenv.lib.platforms.linux; }; } - diff --git a/pkgs/servers/samba/default.nix b/pkgs/servers/samba/default.nix index 3a3051e29bf..7a73a041798 100644 --- a/pkgs/servers/samba/default.nix +++ b/pkgs/servers/samba/default.nix @@ -18,16 +18,15 @@ assert useKerberos -> kerberos != null; stdenv.mkDerivation rec { - name = "samba-3.6.5"; + name = "samba-3.6.7"; src = fetchurl { url = "http://us3.samba.org/samba/ftp/stable/${name}.tar.gz"; - sha256 = "1i40mf5rvz055zp7fy5rqp1lwlsm65g8k6n8jxw5w5f1p3rmzxla"; + sha256 = "1jnl9v6axz30ymh6in1fwan7zjy9n5n7x70vi1afazxs27qa0n5q"; }; patches = - [ - # Allow cross-builds for GNU/Hurd. + [ # Allow cross-builds for GNU/Hurd. ./libnss-wins-pthread.patch ]; diff --git a/pkgs/servers/sip/freeswitch/default.nix b/pkgs/servers/sip/freeswitch/default.nix index 770dc6d277b..5b341b7deb9 100644 --- a/pkgs/servers/sip/freeswitch/default.nix +++ b/pkgs/servers/sip/freeswitch/default.nix @@ -1,14 +1,21 @@ -{ fetchurl, stdenv, ncurses, curl, pkgconfig, gnutls, readline, openssl, perl, libjpeg }: +{ fetchgit, stdenv, ncurses, curl, pkgconfig, gnutls, readline, openssl, perl, libjpeg +, libzrtpcpp, autoconf, automake, libtool }: stdenv.mkDerivation rec { - name = "freeswitch-1.0.7"; + name = "freeswitch-git-0db52e6"; - src = fetchurl { - url = http://latest.freeswitch.org/freeswitch-1.0.7.tar.gz; - sha256 = "0r7mqsc50y7aqm8arbwiq75ikwfrrfhhzdf9r070snrf3b8qkj8w"; + src = fetchgit { + url = "git://git.freeswitch.org/freeswitch.git"; + rev = "0db52e6e556fce584f1850c3a3b87c8f46ff87c5"; + sha256 = "5cc7161c1ba64c5faf3dda2669e9aafd529eaa66be2fd83f284304444bcab9ff"; }; - buildInputs = [ ncurses curl pkgconfig gnutls readline openssl perl libjpeg ]; + preConfigure = '' + ./bootstrap.sh + ''; + + buildInputs = [ ncurses curl pkgconfig gnutls readline openssl perl libjpeg + autoconf automake libtool libzrtpcpp ]; meta = { description = "Cross-Platform Scalable FREE Multi-Protocol Soft Switch"; diff --git a/pkgs/servers/sip/sipwitch/default.nix b/pkgs/servers/sip/sipwitch/default.nix index 7fa9a62e5e3..097dde325f1 100644 --- a/pkgs/servers/sip/sipwitch/default.nix +++ b/pkgs/servers/sip/sipwitch/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, pkgconfig, ucommon, libosip, libexosip, gnutls, zlib }: stdenv.mkDerivation rec { - name = "sipwitch-1.2.3"; + name = "sipwitch-1.2.4"; src = fetchurl { url = "mirror://gnu/sipwitch/${name}.tar.gz"; - sha256 = "0vc7x061m2jdj8hwpw56yiz8ij07x058vm1rm1dz7w98slpkcj6d"; + sha256 = "1c826832xi9p85l7c9va33xx8hx01m3jq49s0d1xl4c8kvri7bsj"; }; buildInputs = [ pkgconfig ucommon libosip libexosip gnutls zlib ]; diff --git a/pkgs/servers/sql/postgresql/8.3.x.nix b/pkgs/servers/sql/postgresql/8.3.x.nix index fb4c8302d81..d4ddb36d4fe 100644 --- a/pkgs/servers/sql/postgresql/8.3.x.nix +++ b/pkgs/servers/sql/postgresql/8.3.x.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, zlib, ncurses, readline }: -let version = "8.3.19"; in +let version = "8.3.20"; in stdenv.mkDerivation rec { name = "postgresql-${version}"; - + src = fetchurl { url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; - sha256 = "1maq1gjnd111jn45d7k58av1dm273vypvwhhsbhknqywgr5hsvwq"; + sha256 = "0qqic4wx59lgbyfmdfcgip9nrcpk10zdb91bw9b96wr1vijn2awj"; }; buildInputs = [ zlib ncurses readline ]; diff --git a/pkgs/servers/sql/postgresql/8.4.x.nix b/pkgs/servers/sql/postgresql/8.4.x.nix index 14e948d3d4e..e1150543f36 100644 --- a/pkgs/servers/sql/postgresql/8.4.x.nix +++ b/pkgs/servers/sql/postgresql/8.4.x.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, zlib, ncurses, readline }: -let version = "8.4.12"; in +let version = "8.4.13"; in stdenv.mkDerivation rec { name = "postgresql-${version}"; - + src = fetchurl { url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; - sha256 = "0xqgzi6qrx4g7g8f38hp02qj8grrfnvc33kyijc2hf0qxhqb7dwr"; + sha256 = "1fccqkni64vg1pi4zzcl67bm9g2brrlzjn1vh6qlyfpsld139p90"; }; buildInputs = [ zlib ncurses readline ]; diff --git a/pkgs/servers/sql/postgresql/9.0.x.nix b/pkgs/servers/sql/postgresql/9.0.x.nix index a4896d02a3a..a28e5c33779 100644 --- a/pkgs/servers/sql/postgresql/9.0.x.nix +++ b/pkgs/servers/sql/postgresql/9.0.x.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, zlib, readline }: -let version = "9.0.8"; in +let version = "9.0.9"; in stdenv.mkDerivation rec { name = "postgresql-${version}"; - + src = fetchurl { url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; - sha256 = "1hhb9kaayrs3bqm1afg8g4p9mr3mc8hskrgy24hnwfablsl1p652"; + sha256 = "12nslml1mg3lyvrhmdvv5g15n7vj5fk1blx1dfllylqg38c7shc7"; }; buildInputs = [ zlib readline ]; diff --git a/pkgs/servers/sql/postgresql/9.1.x.nix b/pkgs/servers/sql/postgresql/9.1.x.nix index 8dbaf93df8f..14488d4649e 100644 --- a/pkgs/servers/sql/postgresql/9.1.x.nix +++ b/pkgs/servers/sql/postgresql/9.1.x.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, zlib, readline }: -let version = "9.1.4"; in +let version = "9.1.5"; in stdenv.mkDerivation rec { name = "postgresql-${version}"; - + src = fetchurl { url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; - sha256 = "04lp7hfh8z2n8gzib6b9j1fq70h1s91z2fxn2hlilbdfnf75lyd0"; + sha256 = "0i6fssldjp65xfxz9dcmkhz6bk4rpw9g26zbqbc6iz164h9rr20b"; }; buildInputs = [ zlib readline ]; diff --git a/pkgs/servers/sql/postgresql/jdbc/default.nix b/pkgs/servers/sql/postgresql/jdbc/default.nix index e173a270e88..e490a14bea6 100644 --- a/pkgs/servers/sql/postgresql/jdbc/default.nix +++ b/pkgs/servers/sql/postgresql/jdbc/default.nix @@ -1,13 +1,19 @@ -{stdenv, fetchurl, ant}: +{ stdenv, fetchurl, ant }: -stdenv.mkDerivation { - name = "postgresql-jdbc-8.2"; +stdenv.mkDerivation rec { + name = "postgresql-jdbc-9.1-902"; builder = ./builder.sh; src = fetchurl { - url = http://jdbc.postgresql.org/download/postgresql-jdbc-8.2-504.src.tar.gz; - sha256 = "1fkza5j4b9pzm69cw1zv35bqk062d92l4l0zhz3qn0g64r08ccm4"; + url = "http://jdbc.postgresql.org/download/${name}.src.tar.gz"; + sha256 = "0sgwbiw5vfxcl0g1yzsndgxdha74cr8ag6y65i0jhgg5g8qc56bz"; }; buildInputs = [ant]; + + meta = { + homepage = http://jdbc.postgresql.org/; + description = "JDBC driver for PostgreSQL allowing Java programs to connect to a PostgreSQL database"; + license = "bsd"; + }; } diff --git a/pkgs/shells/bash-completion/default.nix b/pkgs/shells/bash-completion/default.nix index 916c7600dfd..d79c9774569 100644 --- a/pkgs/shells/bash-completion/default.nix +++ b/pkgs/shells/bash-completion/default.nix @@ -1,22 +1,23 @@ { stdenv, fetchurl }: let - version = "1.3"; + version = "2.0"; in stdenv.mkDerivation { name = "bash-completion-${version}"; src = fetchurl { url = "http://bash-completion.alioth.debian.org/files/bash-completion-${version}.tar.bz2"; - sha256 = "8ebe30579f0f3e1a521013bcdd183193605dab353d7a244ff2582fb3a36f7bec"; + sha256 = "e5a490a4301dfb228361bdca2ffca597958e47dd6056005ef9393a5852af5804"; }; postInstall = '' - rm $out/etc/profile.d/bash_completion.sh - rmdir $out/etc/profile.d - sed -i -e "s|/etc/bash_completion|$out/etc/bash_completion|g" $out/etc/bash_completion + sed -i "$out/share/bash-completion/bash_completion" \ + -e 's|: .{BASH_COMPLETION_COMPAT_DIR:=.*}|BASH_COMPLETION_COMPAT_DIR="$HOME/.nix-profile/etc/bash_completion.d"|' ''; + doCheck = true; + meta = { homepage = "http://bash-completion.alioth.debian.org/"; description = "Programmable completion for the bash shell"; diff --git a/pkgs/shells/ipython/default.nix b/pkgs/shells/ipython/default.nix index 8e430df5290..a64c2052056 100644 --- a/pkgs/shells/ipython/default.nix +++ b/pkgs/shells/ipython/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, buildPythonPackage, pythonPackages }: buildPythonPackage rec { - name = "ipython-0.11"; + name = "ipython-0.13"; namePrefix = ""; src = fetchurl { url = "http://pypi.python.org/packages/source/i/ipython/${name}.tar.gz"; - md5 = "efc899e752a4a4a67a99575cea1719ef"; + sha256 = "1m4m0zf3llnicfgrbnl2h08p3662px7v2pzbhq4fq24vnyz6x5w2"; }; propagatedBuildInputs = [ pythonPackages.readline pythonPackages.sqlite3 ]; diff --git a/pkgs/shells/tcsh/default.nix b/pkgs/shells/tcsh/default.nix index 9e5fa7dae0f..be182f87f1e 100644 --- a/pkgs/shells/tcsh/default.nix +++ b/pkgs/shells/tcsh/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, ncurses}: -stdenv.mkDerivation { - name = "tcsh-6.16.00"; +stdenv.mkDerivation rec { + name = "tcsh-6.18.01"; src = fetchurl { - url = ftp://ftp.funet.fi/pub/unix/shells/tcsh/tcsh-6.16.00.tar.gz; - sha256 = "1m0p8lqqna3vpf2k4x3hia3rlrz38av67x7hb4qsiq2kfpbbh0vn"; + url = "ftp://ftp.funet.fi/pub/unix/shells/tcsh/${name}.tar.gz"; + sha256 = "1a4z9kwgx1iqqzvv64si34m60gj34p7lp6rrcrb59s7ka5wa476q"; }; buildInputs = [ncurses]; diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index 749de01deff..9197ff8314b 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -10,6 +10,8 @@ let lib = import ../../lib; + disallowUnfree = builtins.getEnv "HYDRA_DISALLOW_UNFREE" == "1"; + stdenvGenerator = setupScript: rec { # The stdenv that we are producing. @@ -30,7 +32,7 @@ let lib.filter lib.isDerivation initialPath; } - // { + // rec { meta = { description = "The default build environment for Unix packages in Nixpkgs"; @@ -39,33 +41,29 @@ let # Add a utility function to produce derivations that use this # stdenv and its shell. mkDerivation = attrs: + if disallowUnfree && attrs.meta.license or "" == "unfree" then + throw "package ‘${attrs.name}’ has an unfree license, refusing to evaluate" + else (derivation ( (removeAttrs attrs ["meta" "passthru" "crossAttrs"]) // (let - buildInputs = if attrs ? buildInputs then attrs.buildInputs - else []; - buildNativeInputs = if attrs ? buildNativeInputs then - attrs.buildNativeInputs else []; - propagatedBuildInputs = if attrs ? propagatedBuildInputs then - attrs.propagatedBuildInputs else []; - propagatedBuildNativeInputs = if attrs ? - propagatedBuildNativeInputs then - attrs.propagatedBuildNativeInputs else []; - crossConfig = if (attrs ? crossConfig) then attrs.crossConfig else - null; + buildInputs = attrs.buildInputs or []; + buildNativeInputs = attrs.buildNativeInputs or []; + propagatedBuildInputs = attrs.propagatedBuildInputs or []; + propagatedBuildNativeInputs = attrs.propagatedBuildNativeInputs or []; + crossConfig = attrs.crossConfig or null; in { - builder = if attrs ? realBuilder then attrs.realBuilder else shell; - args = if attrs ? args then attrs.args else - ["-e" (if attrs ? builder then attrs.builder else ./default-builder.sh)]; + builder = attrs.realBuilder or shell; + args = attrs.args or ["-e" (attrs.builder or ./default-builder.sh)]; stdenv = result; system = result.system; - # That build by the cross compiler + # Inputs built by the cross compiler. buildInputs = lib.optionals (crossConfig != null) buildInputs; propagatedBuildInputs = lib.optionals (crossConfig != null) propagatedBuildInputs; - # That build by the usual native compiler + # Inputs built by the usual native compiler. buildNativeInputs = buildNativeInputs ++ lib.optionals (crossConfig == null) buildInputs; propagatedBuildNativeInputs = propagatedBuildNativeInputs ++ @@ -77,13 +75,11 @@ let # passed to the builder and is not a dependency. But since we # include it in the result, it *is* available to nix-env for # queries. - // - { meta = if attrs ? meta then attrs.meta else {}; } + // { meta = attrs.meta or {}; } # Pass through extra attributes that are not inputs, but # should be made available to Nix expressions using the # derivation (e.g., in assertions). - // - (if attrs ? passthru then attrs.passthru else {}); + // (attrs.passthru or {}); # Utility flags to test the type of platform. isDarwin = result.system == "i686-darwin" @@ -96,6 +92,9 @@ let || result.system == "armv7l-linux" || result.system == "mips64el-linux"; isGNU = result.system == "i686-gnu"; # GNU/Hurd + isGlibc = isGNU # useful for `stdenvNative' + || isLinux + || result.system == "x86_64-kfreebsd-gnu"; isSunOS = result.system == "i686-solaris" || result.system == "x86_64-solaris"; isCygwin = result.system == "i686-cygwin"; diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index cf7692cc58a..3fbb350e0ab 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -1,17 +1,19 @@ -{stdenv, fetchurl, pkgconfig, python, pyrex, pygtk, xlibs, gtk, makeWrapper}: +{ stdenv, fetchurl, pkgconfig, python, cython +, pygtk, pygobject, pycairo, notify, xlibs, gtk +, ffmpeg, x264, libvpx, makeWrapper}: -stdenv.mkDerivation { - name = "xpra-0.0.3"; +stdenv.mkDerivation rec { + name = "xpra-0.3.2"; src = fetchurl { - url = http://partiwm.org/static/downloads/parti-all-0.0.3.tar.gz; - sha256 = "17inksd4cc7mba2vfs17gz1yk3h6x6wf06pm3hcbs5scq8rr5bkp"; + url = http://xpra.org/src/xpra-0.3.2.tar.bz2; + sha256 = "1s1z6r0r78qvf59ci3vxammjz7lj5m64jyk0bfn7yxd5jl3sy41y"; }; - #src = /home/eelco/Dev/nixpkgs/parti-all-0.0.3; + buildNativeInputs = [ cython ]; buildInputs = [ - pkgconfig python pyrex pygtk gtk makeWrapper + pkgconfig python pygtk gtk ffmpeg x264 libvpx makeWrapper xlibs.inputproto xlibs.libXcomposite xlibs.libXdamage xlibs.libXtst ]; @@ -21,19 +23,26 @@ stdenv.mkDerivation { ./do-build ''; + pythonPaths = [ + "$out/lib/python" + "$(toPythonPath ${pygtk})/gtk-2.0" + ] ++ map (i: "$(toPythonPath ${i})") [ + pygobject pycairo notify + ]; + installPhase = '' mkdir -p $out cp -r install/* $out for i in $(cd $out/bin && ls); do wrapProgram $out/bin/$i \ - --set PYTHONPATH "$out/lib/python:$(toPythonPath ${pygtk})/gtk-2.0:$PYTHONPATH" \ + --set PYTHONPATH "${stdenv.lib.concatStringsSep ":" pythonPaths}" \ --prefix PATH : "${xlibs.xauth}/bin:${xlibs.xorgserver}/bin:${xlibs.xmodmap}/bin" done ''; meta = { - homepage = http://partiwm.org/wiki/xpra; + homepage = http://xpra.org/; description = "Persistent remote applications for X"; }; } diff --git a/pkgs/tools/archivers/atool/default.nix b/pkgs/tools/archivers/atool/default.nix new file mode 100644 index 00000000000..d376f75a552 --- /dev/null +++ b/pkgs/tools/archivers/atool/default.nix @@ -0,0 +1,18 @@ +{stdenv, fetchurl, perl}: + +stdenv.mkDerivation rec { + name = "atool-0.39"; + src = fetchurl { + url = http://savannah.nongnu.org/download/atool/atool-0.39.0.tar.gz; + sha256 = "aaf60095884abb872e25f8e919a8a63d0dabaeca46faeba87d12812d6efc703b"; + }; + + buildInputs = [ perl ]; + + meta = { + homepage = http://www.nongnu.org/atool; + description = "Archive command line helper"; + platforms = stdenv.lib.platforms.all; + }; +} + diff --git a/pkgs/tools/backup/btar/default.nix b/pkgs/tools/backup/btar/default.nix index 919b814f60a..0258edb8a19 100644 --- a/pkgs/tools/backup/btar/default.nix +++ b/pkgs/tools/backup/btar/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, librsync }: stdenv.mkDerivation rec { - name = "btar-1.0.1"; + name = "btar-1.1.1"; src = fetchurl { url = "http://vicerveza.homeunix.net/~viric/soft/btar/${name}.tar.gz"; - sha256 = "141mqrghqmms6zpbwn9bw98q4rkxfyly950jh8hajq9d2fk5qyn1"; + sha256 = "0miklk4bqblpyzh1bni4x6lqn88fa8fjn15x1k1n8bxkx60nlymd"; }; buildInputs = [ librsync ]; diff --git a/pkgs/tools/backup/bup/default.nix b/pkgs/tools/backup/bup/default.nix index e08ea1e03f4..586fc514ba6 100644 --- a/pkgs/tools/backup/bup/default.nix +++ b/pkgs/tools/backup/bup/default.nix @@ -1,23 +1,47 @@ -{ stdenv, fetchurl, python, unzip, perl }: +{ stdenv, fetchgit, python, pyxattr, pylibacl, setuptools, fuse, git, perl, pandoc, makeWrapper }: + +with stdenv.lib; stdenv.mkDerivation { - name = "bup-0.24b"; - src = fetchurl { - url = "https://github.com/apenwarr/bup/zipball/bup-0.24b"; - sha256 = "0l50i8mrg43ahd8fn1n6pwa0xslxr07pvkh0r4qyywv55172ip8v"; - name = "bup-0.24b.zip"; + name = "bup-0.25git20120722"; + + src = fetchgit { + url = "https://github.com/apenwarr/bup.git"; + sha256 = "3ad232d7f23071ed34f920bd4c3137583f1adffbe23c022896289bc0a03fe7aa"; + rev = "02bd2b566ea5eec2fd656e0ae572b4c7b6b9550a"; }; - buildInputs = [ unzip python perl ]; + + buildNativeInputs = [ pandoc perl makeWrapper ]; + + buildInputs = [ python git ]; + + postInstall = optionalString (elem stdenv.system platforms.linux) '' + wrapProgram $out/bin/bup --prefix PYTHONPATH : \ + ${stdenv.lib.concatStringsSep ":" + (map (path: "$(toPythonPath ${path})") [ pyxattr pylibacl setuptools fuse ])} + ''; + patchPhase = '' for f in cmd/* lib/tornado/* lib/tornado/test/* t/* wvtest.py main.py; do substituteInPlace $f --replace "/usr/bin/env python" "${python}/bin/python" done substituteInPlace Makefile --replace "./format-subst.pl" "perl ./format-subst.pl" - substituteInPlace lib/bup/csetup.py --replace "'bupsplit.c'])" "'bupsplit.c'], library_dirs=['${python}/lib'])" + substituteInPlace lib/bup/csetup.py \ + --replace "'bupsplit.c'])" "'bupsplit.c'], library_dirs=['${python}/lib'])" ''; - makeFlags = "MANDIR=$(out)/man DOCDIR=$(out)/share/doc/bup BINDIR=$(out)/bin LIBDIR=$(out)/lib/bup"; + + makeFlags = [ + "MANDIR=$(out)/share/man" + "DOCDIR=$(out)/share/doc/bup" + "BINDIR=$(out)/bin" + "LIBDIR=$(out)/lib/bup" + ]; + meta = { - description = "Highly efficient file backup system based on the git packfile format. Capable of doing *fast* incremental backups of virtual machine images."; + description = '' + Highly efficient file backup system based on the git packfile format. + Capable of doing *fast* incremental backups of virtual machine images. + ''; homepage = "https://github.com/apenwarr/bup"; }; } diff --git a/pkgs/tools/backup/obnam/default.nix b/pkgs/tools/backup/obnam/default.nix index c70e8054c7c..119633e0638 100644 --- a/pkgs/tools/backup/obnam/default.nix +++ b/pkgs/tools/backup/obnam/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, python, pythonPackages, pycrypto, attr }: pythonPackages.buildPythonPackage { - name = "obnam-1.0"; + name = "obnam-1.1"; namePrefix = ""; src = fetchurl rec { - url = "http://code.liw.fi/debian/pool/main/o/obnam/obnam_1.0.orig.tar.gz"; - sha256 = "b3589aac8d97283e44ed8e8c8cf751c4e9cc0677d433a85e27bd42f0d54da623"; + url = "http://code.liw.fi/debian/pool/main/o/obnam/obnam_1.1.orig.tar.gz"; + sha256 = "763693e5ea4e8d6a63b1a16c2aacd5fe0dc97abc687c8f0dde5840f77d549349"; }; buildInputs = [ pythonPackages.sphinx attr ]; diff --git a/pkgs/tools/backup/rdiff-backup/default.nix b/pkgs/tools/backup/rdiff-backup/default.nix index 2460573310c..f108e6a5063 100644 --- a/pkgs/tools/backup/rdiff-backup/default.nix +++ b/pkgs/tools/backup/rdiff-backup/default.nix @@ -1,18 +1,18 @@ {stdenv, fetchurl, python, librsync, gnused }: stdenv.mkDerivation { - name = "rdiff-backup-1.1.14"; + name = "rdiff-backup-1.2.8"; src = fetchurl { - url = http://savannah.nongnu.org/download/rdiff-backup/rdiff-backup-1.1.14.tar.gz; - sha256 = "0sh2kz90z47yfa9786dyn3q9ba1xcmjvd65rykvm7mg5apnrg27h"; + url = http://savannah.nongnu.org/download/rdiff-backup/rdiff-backup-1.2.8.tar.gz; + sha256 = "1nwmmh816f96h0ff1jxk95ad38ilbhbdl5dgibx1d4cl81dsi48d"; }; phases = "unpackPhase installPhase"; installPhase = '' python ./setup.py install --prefix=$out sed -i $out/bin/rdiff-backup -e \ - "/import sys/ asys.path += [ \"$out/lib/python2.4/site-packages/\" ]" + "/import sys/ asys.path += [ \"$out/lib/python2.7/site-packages/\" ]" ''; buildInputs = [python librsync gnused ]; diff --git a/pkgs/tools/compression/lrzip/default.nix b/pkgs/tools/compression/lrzip/default.nix index d806e9fd24a..35df411fd0f 100644 --- a/pkgs/tools/compression/lrzip/default.nix +++ b/pkgs/tools/compression/lrzip/default.nix @@ -1,5 +1,11 @@ {stdenv, fetchurl, zlib, lzo, bzip2, nasm, perl}: +let + md5fix = fetchurl { + url = "https://github.com/ckolivas/lrzip/commit/9430b6ff4a58adb69ef4cf74f1245fd5b3b313dd.patch"; + sha256 = "084x4wi3mamcxphzwf43iw287v1ylrk0xjghg6b5k6vgm9gkqlx8"; + }; +in stdenv.mkDerivation rec { name = "lrzip-0.612"; @@ -10,6 +16,8 @@ stdenv.mkDerivation rec { buildInputs = [ zlib lzo bzip2 nasm perl ]; + patches = [ md5fix ]; + meta = { homepage = http://ck.kolivas.org/apps/lrzip/; description = "The CK LRZIP compression program (LZMA + RZIP)"; diff --git a/pkgs/tools/filesystems/btrfsprogs/default.nix b/pkgs/tools/filesystems/btrfsprogs/default.nix index 75f155fd0dd..861bacd46c2 100644 --- a/pkgs/tools/filesystems/btrfsprogs/default.nix +++ b/pkgs/tools/filesystems/btrfsprogs/default.nix @@ -1,45 +1,24 @@ -a : -let - fetchurl = a.fetchurl; - fetchgit = a.fetchgit; +{ stdenv, fetchgit, zlib, libuuid, acl, attr, e2fsprogs }: - version = a.lib.attrByPath ["version"] "0.19-20120328" a; - buildInputs = with a; [ - zlib libuuid acl attr e2fsprogs - ]; -in +let version = "0.19-20120328"; in -assert a.libuuid != null; +stdenv.mkDerivation { + name = "btrfs-progs-${version}"; -rec { - srcDrv = fetchgit { - url="git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs.git" ; - rev="1957076ab4fefa47b6efed3da541bc974c83eed7"; - sha256="566d863c5500652e999d0d6b823365fb06f2f8f9523e65e69eaa3e993e9b26e1"; + src = fetchgit { + url = "git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs.git"; + rev = "1957076ab4fefa47b6efed3da541bc974c83eed7"; + sha256 = "566d863c5500652e999d0d6b823365fb06f2f8f9523e65e69eaa3e993e9b26e1"; }; - src = srcDrv + "/"; + buildInputs = [ zlib libuuid acl attr e2fsprogs ]; - inherit buildInputs; - configureFlags = []; - makeFlags = ["prefix=$out CFLAGS=-Os"]; + makeFlags = "prefix=$(out)"; - patches = []; - phaseNames = ["fixMakefile" "doEnsureBtrfsImage" "doMakeInstall"]; - - fixMakefile = a.fullDepEntry '' - sed -e 's@^progs = @progs=@g' -i Makefile - '' ["minInit" "doUnpack"]; - - doEnsureBtrfsImage = a.fullDepEntry ('' - if ! grep 'progs = ' Makefile | grep btrfs-image; then - sed -e 's/progs = \(.*\)\\/progs = \1btrfs-image \\/' -i Makefile - fi - '') ["minInit" "doUnpack"]; - - name = "btrfs-progs-" + version; meta = { - description = "BTRFS utilities"; - maintainers = [a.lib.maintainers.raskin]; + description = "Utilities for the btrfs filesystem"; + homepage = https://btrfs.wiki.kernel.org/; + maintainers = [ stdenv.lib.maintainers.raskin ]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/filesystems/ciopfs/default.nix b/pkgs/tools/filesystems/ciopfs/default.nix new file mode 100644 index 00000000000..f944e591a12 --- /dev/null +++ b/pkgs/tools/filesystems/ciopfs/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, pkgconfig, fuse, glib, attr }: + +stdenv.mkDerivation rec { + name = "ciopfs-0.4"; + + src = fetchurl { + url = "http://www.brain-dump.org/projects/ciopfs/${name}.tar.gz"; + sha256 = "0sr9i9b3qfwbfvzvk00yrrg3x2xqk1njadbldkvn7hwwa4z5bm9l"; + }; + + buildInputs = [ pkgconfig fuse glib attr ]; + + makeFlags = "DESTDIR=$(out) PREFIX="; + + meta = { + homepage = http://www.brain-dump.org/projects/ciopfs/; + description = "A case-insensitive filesystem layered on top of any other filesystem"; + license = "GPLv2"; + }; +} diff --git a/pkgs/tools/filesystems/davfs2/default.nix b/pkgs/tools/filesystems/davfs2/default.nix index 8cc212deee4..ce4421f9ca7 100644 --- a/pkgs/tools/filesystems/davfs2/default.nix +++ b/pkgs/tools/filesystems/davfs2/default.nix @@ -1,16 +1,21 @@ -{ stdenv, fetchurl, neon, zlib }: +{ stdenv, fetchurl, neon, zlib, noDavsUser ? false}: stdenv.mkDerivation rec { - name = "davfs2-1.4.5"; + name = "davfs2-1.4.7"; src = fetchurl { url = "mirror://savannah/davfs2/${name}.tar.gz"; - sha256 = "1pkl2braggp2qg4c68dwfv399l9jz7cvi7gkm4xbj6mgvl0cxw18"; + sha256 = "0i7hrwlfzisb4l2mza1kjj9q9xxixggjplsjm339zl7828mfxh2h"; }; + prePatch = stdenv.lib.optional noDavsUser '' + echo "dav_user root" >> etc/davfs2.conf + echo "dav_group root" >> etc/davfs2.conf + ''; + buildInputs = [ neon zlib ]; - - patches = [ ./davfs2-install.patch ./isdir.patch ]; + + patches = [ ./davfs2-install.patch ./isdir.patch ]; meta = { longDescription = "Web Distributed Authoring and Versioning (WebDAV), an extension to the HTTP-protocol, allows authoring of resources on a remote web server. davfs2 provides the ability to access such resources like a typical filesystem, allowing for use by standard applications with no built-in support for WebDAV."; diff --git a/pkgs/tools/filesystems/e2fsprogs/default.nix b/pkgs/tools/filesystems/e2fsprogs/default.nix index bd697d761e0..4f4d235008b 100644 --- a/pkgs/tools/filesystems/e2fsprogs/default.nix +++ b/pkgs/tools/filesystems/e2fsprogs/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libuuid }: stdenv.mkDerivation rec { - name = "e2fsprogs-1.42.4"; + name = "e2fsprogs-1.42.5"; src = fetchurl { url = "mirror://sourceforge/e2fsprogs/${name}.tar.gz"; - sha256 = "0plhvcjynyy5ifih5jr8p2fjymqyl8fj6vj74cmqjyrahi3z6iir"; + sha256 = "1kki3367961377wz2n6kva8q0wjjk6qhxmhp2dp3ar3lxgcamvbn"; }; buildInputs = [ pkgconfig libuuid ]; @@ -20,9 +20,9 @@ stdenv.mkDerivation rec { configureFlags = "--enable-elf-shlibs --disable-libuuid --disable-libblkid --disable-uuidd --disable-fsck"; preInstall = "installFlagsArray=('LN=ln -s')"; - + postInstall = "make install-libs"; - + meta = { homepage = http://e2fsprogs.sourceforge.net/; description = "Tools for creating and checking ext2/ext3/ext4 filesystems"; diff --git a/pkgs/tools/filesystems/grive/default.nix b/pkgs/tools/filesystems/grive/default.nix index a2a8bc572c0..67c6d2f8581 100644 --- a/pkgs/tools/filesystems/grive/default.nix +++ b/pkgs/tools/filesystems/grive/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchgit, cmake, libgcrypt, json_c, curl, expat, boost, binutils }: stdenv.mkDerivation rec { - name = "grive-0.2.0"; + name = "grive-0.3.0"; src = fetchgit { url = "https://github.com/Grive/grive.git"; - rev = "34cb3705288aa83283b370118776ac89393ae5fc"; - sha256 = "a30ea886bdc159e1004d1207fcac30c277f1177a3b846bdd82326eebff7a0bbe"; + rev = "51e42914f3666ee6e0bc16a4c78f60b117265c24"; + sha256 = "f2b978cc93a2d16262c7b78c62019b2a58044eaef4ca95feaa74dfd4dfcbfa36"; }; buildInputs = [cmake libgcrypt json_c curl expat stdenv binutils boost]; diff --git a/pkgs/tools/filesystems/ntfs-3g/default.nix b/pkgs/tools/filesystems/ntfs-3g/default.nix index 2a8bef6c6ed..cedb8df39d1 100644 --- a/pkgs/tools/filesystems/ntfs-3g/default.nix +++ b/pkgs/tools/filesystems/ntfs-3g/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { pname = "ntfs-3g_ntfsprogs"; - version = "2011.4.12"; + version = "2012.1.15"; name = "${pname}-${version}"; buildInputs = [libuuid] ++ stdenv.lib.optionals crypto [gnutls libgcrypt]; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://tuxera.com/opensource/${name}.tgz"; - sha256 = "01gfn94f4fdrl1rjhhxjvjbarr1mipdi4pmhhwirp0gy1dzp935a"; + sha256 = "09gvfgvqm4dswzxmwvg3r23bv39cp8y8b6qs2jcwmrqd032i25kg"; }; patchPhase = '' diff --git a/pkgs/tools/graphics/exif/default.nix b/pkgs/tools/graphics/exif/default.nix index 94bf2e2cb0d..a8599980d94 100644 --- a/pkgs/tools/graphics/exif/default.nix +++ b/pkgs/tools/graphics/exif/default.nix @@ -1,12 +1,17 @@ -{stdenv, fetchurl, pkgconfig, libexif, popt}: +{ stdenv, fetchurl, pkgconfig, libexif, popt }: -stdenv.mkDerivation { - name = "exif-0.6.15"; +stdenv.mkDerivation rec { + name = "exif-0.6.21"; src = fetchurl { - url = mirror://sourceforge/libexif/exif-0.6.15.tar.bz2; - sha256 = "19kxl72l1iqq747k58rir7v4ld1676j3dmjdc1pik9hjlgdb1yj1"; + url = "mirror://sourceforge/libexif/${name}.tar.bz2"; + sha256 = "1zb9hwdl783d4vd2s2rw642hg8hd6n0mfp6lrbiqmp9jmhlq5rsr"; }; - buildInputs = [pkgconfig libexif popt]; + buildInputs = [ pkgconfig libexif popt ]; + + meta = { + homepage = http://libexif.sourceforge.net/; + description = "A utility to read and manipulate EXIF data in digital photographs"; + }; } diff --git a/pkgs/tools/misc/desktop-file-utils/default.nix b/pkgs/tools/misc/desktop-file-utils/default.nix index 4266f4ab768..285160e50d6 100644 --- a/pkgs/tools/misc/desktop-file-utils/default.nix +++ b/pkgs/tools/misc/desktop-file-utils/default.nix @@ -13,5 +13,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.freedesktop.org/wiki/Software/desktop-file-utils; description = "Command line utilities for working with .desktop files"; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/misc/gnokii/src-for-default.nix b/pkgs/tools/misc/gnokii/src-for-default.nix index 360f98de758..3ea6f1a3b66 100644 --- a/pkgs/tools/misc/gnokii/src-for-default.nix +++ b/pkgs/tools/misc/gnokii/src-for-default.nix @@ -2,7 +2,7 @@ rec { version="0.6.30"; name="gnokii-0.6.30"; hash="0k14dymifk7dx3z58cqrc4mgxrm17s4jk12chwdfjhjarz390x8p"; - url="http://www.gnokii.org/download/gnokii/gnokii-${version}.tar.gz"; + url="http://www.gnokii.org/download/gnokii/0.6.x/gnokii-${version}.tar.gz"; advertisedUrl="http://www.gnokii.org/download/gnokii/gnokii-0.6.30.tar.gz"; diff --git a/pkgs/tools/misc/grub/1.9x.nix b/pkgs/tools/misc/grub/2.0x.nix similarity index 85% rename from pkgs/tools/misc/grub/1.9x.nix rename to pkgs/tools/misc/grub/2.0x.nix index 49cc4884e63..4186a440535 100644 --- a/pkgs/tools/misc/grub/1.9x.nix +++ b/pkgs/tools/misc/grub/2.0x.nix @@ -1,13 +1,17 @@ { fetchurl, stdenv, flex, bison, gettext, ncurses, libusb, freetype, qemu -, EFIsupport ? false }: +, devicemapper, EFIsupport ? false }: let - prefix = "grub${if EFIsupport then "-efi" else ""}"; - version = "1.99"; - unifont_bdf = fetchurl { - url = "http://unifoundry.com/unifont-5.1.20080820.bdf.gz"; - sha256 = "0s0qfff6n6282q28nwwblp5x295zd6n71kl43xj40vgvdqxv0fxx"; - }; + + prefix = "grub${if EFIsupport then "-efi" else ""}"; + + version = "2.00"; + + unifont_bdf = fetchurl { + url = "http://unifoundry.com/unifont-5.1.20080820.bdf.gz"; + sha256 = "0s0qfff6n6282q28nwwblp5x295zd6n71kl43xj40vgvdqxv0fxx"; + }; + in stdenv.mkDerivation rec { @@ -15,11 +19,11 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnu/grub/grub-${version}.tar.xz"; - sha256 = "06q2a7bg1mbsms604a89fkdnwrc1jg9hr2mmfdmg3il39j6i827k"; + sha256 = "0n64hpmsccvicagvr0c6v0kgp2yw0kgnd3jvsyd26cnwgs7c6kkq"; }; buildNativeInputs = [ flex bison ]; - buildInputs = [ ncurses libusb freetype gettext ] + buildInputs = [ ncurses libusb freetype gettext devicemapper ] ++ stdenv.lib.optional doCheck qemu; preConfigure = diff --git a/pkgs/tools/misc/lockfile-progs/default.nix b/pkgs/tools/misc/lockfile-progs/default.nix new file mode 100644 index 00000000000..41fca212158 --- /dev/null +++ b/pkgs/tools/misc/lockfile-progs/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, liblockfile }: + +stdenv.mkDerivation rec { + _name = "lockfile-progs"; + version = "0.1.16"; + name = "${_name}-${version}"; + + src = fetchurl { + url = "mirror://debian/pool/main/l/${_name}/${_name}_${version}.tar.gz"; + sha256 = "0sca19mg0lk68ms6idy4vfp8dyjpcbq9f143v9qzjyk86bb34lgr"; + }; + + buildInputs = [ liblockfile ]; + + installPhase = '' + mkdir -p $out/bin $out/man/man1 + install -s bin/* $out/bin + install man/*.1 $out/man/man1 + ''; + + meta = { + description = "Programs for locking and unlocking files and mailboxes"; + homepage = http://packages.debian.org/sid/lockfile-progs; + license = "GPLv2"; + + maintainers = [ stdenv.lib.maintainers.bluescreen303 ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/tools/misc/logstash/default.nix b/pkgs/tools/misc/logstash/default.nix new file mode 100644 index 00000000000..b273e4630a3 --- /dev/null +++ b/pkgs/tools/misc/logstash/default.nix @@ -0,0 +1,11 @@ +{ fetchurl }: + +let version = "1.1.0"; in + +fetchurl { + url = "http://semicomplete.com/files/logstash/logstash-${version}-monolithic.jar"; + + name = "logstash-${version}.jar"; + + sha256 = "03s9g2appsmdg973212dl37ldws36fgsvxi9w1lxbvmmclc4k7vc"; +} diff --git a/pkgs/tools/misc/mmv/default.nix b/pkgs/tools/misc/mmv/default.nix new file mode 100644 index 00000000000..e6e7eb505bf --- /dev/null +++ b/pkgs/tools/misc/mmv/default.nix @@ -0,0 +1,46 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "mmv-${version}"; + version = "1.01b"; + + src = fetchurl { + url = "http://ftp.debian.org/debian/pool/main/m/mmv/mmv_${version}.orig.tar.gz"; + sha256 = "0399c027ea1e51fd607266c1e33573866d4db89f64a74be8b4a1d2d1ff1fdeef"; + }; + + patches = [ + # Use Debian patched version, as upstream is no longer maintained and it + # contains a _lot_ of fixes. + (fetchurl { + url = "http://ftp.debian.org/debian/pool/main/m/mmv/mmv_${version}-15.diff.gz"; + sha256 = "9ad3e3d47510f816b4a18bae04ea75913588eec92248182f85dd09bc5ad2df13"; + }) + ]; + + postPatch = '' + sed -i \ + -e 's/^\s*LDFLAGS\s*=\s*-s\s*-N/LDFLAGS = -s/' \ + -e "s|/usr/bin|$out/bin|" \ + -e "s|/usr/man|$out/share/man|" \ + Makefile + ''; + + preInstall = '' + mkdir -p "$out/bin" "$out/share/man/man1" + ''; + + postInstall = '' + for variant in mcp mad mln + do + ln -s mmv "$out/bin/$variant" + ln -s mmv.1 "$out/share/man/man1/$variant.1" + done + ''; + + meta = { + homepage = "http://linux.maruhn.com/sec/mmv.html"; + description = "Utility for wildcard renaming, copying, etc"; + license = stdenv.lib.licenses.gpl2; + }; +} diff --git a/pkgs/tools/misc/ncdu/default.nix b/pkgs/tools/misc/ncdu/default.nix new file mode 100644 index 00000000000..944b6ea77e1 --- /dev/null +++ b/pkgs/tools/misc/ncdu/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, ncurses }: + +stdenv.mkDerivation rec { + name = "ncdu-${version}"; + version = "1.8"; + + src = fetchurl { + url = "http://dev.yorhel.nl/download/${name}.tar.gz"; + sha256 = "42aaf0418c05e725b39b220166a9c604a9c54c0fbf7692c9c119b36d0ed5d099"; + }; + + buildInputs = [ ncurses ]; + + meta = { + description = "An ncurses disk usage analyzer."; + homepage = http://dev.yorhel.nl/ncdu; + license = stdenv.lib.licenses.mit; + }; +} diff --git a/pkgs/tools/misc/plowshare/default.nix b/pkgs/tools/misc/plowshare/default.nix new file mode 100644 index 00000000000..5e684cfa377 --- /dev/null +++ b/pkgs/tools/misc/plowshare/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchurl, makeWrapper, curl }: + +let + + v = "20120807"; + +in stdenv.mkDerivation { + + name = "plowshare-git${v}"; + + src = fetchurl { + url = "http://plowshare.googlecode.com/files/plowshare-snapshot-git${v}.tar.gz"; + sha256 = "0clryfssaa4rjvsy760p51ppq1275lwvhm9jh3g4mi973xv4n8si"; + }; + + buildInputs = [ makeWrapper ]; + + phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; + + installPhase = '' + make PREFIX="$out" install + + for fn in plow{del,down,list,up}; do + wrapProgram "$out/bin/$fn" --prefix PATH : "${curl}/bin" + done + ''; + + meta = { + description = '' + A command-line download/upload tool for popular file sharing websites + ''; + license = stdenv.lib.licenses.gpl3; + maintainers = [ stdenv.lib.maintainers.aforemny ]; + }; +} diff --git a/pkgs/tools/misc/pv/default.nix b/pkgs/tools/misc/pv/default.nix index 8150e7118dc..444408fec41 100644 --- a/pkgs/tools/misc/pv/default.nix +++ b/pkgs/tools/misc/pv/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl } : stdenv.mkDerivation rec { - name = "pv-1.3.1"; + name = "pv-1.3.4"; src = fetchurl { url = "http://www.ivarch.com/programs/sources/${name}.tar.bz2"; - sha256 = "1fwvdj663g3jf3rcxi788pv1l7s86sxna78xi2nl5qimng05y8jl"; + sha256 = "114b730pghgg4gv9d798817n3am88p2b0xgdavch1vhklzh33c16"; }; meta = { diff --git a/pkgs/tools/misc/xclip/default.nix b/pkgs/tools/misc/xclip/default.nix index ae9fed67117..1014f11453b 100644 --- a/pkgs/tools/misc/xclip/default.nix +++ b/pkgs/tools/misc/xclip/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, x11, libXmu }: -stdenv.mkDerivation { - name = "xclip-0.11"; +stdenv.mkDerivation rec { + name = "xclip-0.12"; src = fetchurl { - url = "mirror://sourceforge/xclip/xclip-0.11.tar.gz"; - sha256 = "0ipwxkfqz66fz6jlln1v46sd2kr6bkqzq6j5hkzn6pb3grmzsacg"; + url = "mirror://sourceforge/xclip/${name}.tar.gz"; + sha256 = "0ibcf46rldnv0r424qcnai1fa5iq3lm5q5rdd7snsi5sb78gmixp"; }; buildInputs = [ x11 libXmu ]; diff --git a/pkgs/tools/misc/xvfb-run/default.nix b/pkgs/tools/misc/xvfb-run/default.nix new file mode 100644 index 00000000000..162fb73b3f0 --- /dev/null +++ b/pkgs/tools/misc/xvfb-run/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, makeWrapper, xkbcomp, xorgserver, getopt, xkeyboard_config, xauth, utillinux, which, fontsConf}: +let + xvfb_run = fetchurl { + url = https://projects.archlinux.org/svntogit/packages.git/plain/trunk/xvfb-run?h=packages/xorg-server; + sha256 = "1f9mrhqy0l72i3674n98bqlq9a10h0rh9qfjiwvivz3hjhq5c0gz"; + }; +in +stdenv.mkDerivation { + name = "xvfb-run"; + buildInputs = [makeWrapper]; + buildCommand = '' + mkdir -p $out/bin + cp ${xvfb_run} $out/bin/xvfb-run + sed -i 's|XVFBARGS="|XVFBARGS="-xkbdir ${xkeyboard_config}/etc/X11/xkb |' $out/bin/xvfb-run + + chmod a+x $out/bin/xvfb-run + wrapProgram $out/bin/xvfb-run \ + --set XKB_BINDIR "${xkbcomp}/bin" \ + --set FONTCONFIG_FILE "${fontsConf}" \ + --prefix PATH : ${getopt}/bin:${xorgserver}/bin:${xauth}/bin:${which}/bin:${utillinux}/bin + ''; +} diff --git a/pkgs/tools/networking/aircrack-ng/default.nix b/pkgs/tools/networking/aircrack-ng/default.nix index 394022c2d08..9ecaf183f1f 100644 --- a/pkgs/tools/networking/aircrack-ng/default.nix +++ b/pkgs/tools/networking/aircrack-ng/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchsvn, libpcap, openssl, zlib, wirelesstools}: let - rev = "1859"; + rev = "2178"; in stdenv.mkDerivation rec { name = "aircrack-ng-1.1-${rev}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchsvn { url = "http://trac.aircrack-ng.org/svn/trunk"; inherit rev; - sha256 = "6ca98321ef3f14af9c78b2fe25091c4e79e3c28679f240b80f8aeda71b84ab4a"; + sha256 = "0rwj2nk4nyy0l9dg6rpg2h5gpvcygs5irj4i6fdcsr8xf0blq7yw"; }; buildInputs = [libpcap openssl zlib]; diff --git a/pkgs/tools/networking/autossh/default.nix b/pkgs/tools/networking/autossh/default.nix index 2cf17f29603..0c32b1c1240 100644 --- a/pkgs/tools/networking/autossh/default.nix +++ b/pkgs/tools/networking/autossh/default.nix @@ -1,23 +1,28 @@ {stdenv, fetchurl, openssh}: stdenv.mkDerivation { - name="autossh-1.4b"; - src = fetchurl { - url = "http://www.harding.motd.ca/autossh/autossh-1.4b.tgz"; - md5 = "8f9aa006f6f69e912d3c2f504622d6f7"; - }; - buildInputs = [ openssh ]; - installPhase = '' -install -D -m755 autossh $out/bin/autossh || return 1 -install -D -m644 CHANGES $out/share/doc/autossh/CHANGES || return 1 -install -D -m644 README $out/share/doc/autossh/README || return 1 -install -D -m644 autossh.host $out/share/autossh/examples/autossh.host || return 1 -install -D -m644 rscreen $out/share/autossh/examples/rscreen || return 1 -install -D -m644 autossh.1 $out/man/man1/autossh.1 || return 1 - ''; - meta = { - homepage = http://www.harding.motd.ca/autossh/; - description = "Automatically restart SSH sessions and tunnels"; - }; + name = "autossh-1.4b"; + + src = fetchurl { + url = "http://www.harding.motd.ca/autossh/autossh-1.4b.tgz"; + md5 = "8f9aa006f6f69e912d3c2f504622d6f7"; + }; + + buildInputs = [ openssh ]; + + installPhase = + '' + install -D -m755 autossh $out/bin/autossh || return 1 + install -D -m644 CHANGES $out/share/doc/autossh/CHANGES || return 1 + install -D -m644 README $out/share/doc/autossh/README || return 1 + install -D -m644 autossh.host $out/share/autossh/examples/autossh.host || return 1 + install -D -m644 rscreen $out/share/autossh/examples/rscreen || return 1 + install -D -m644 autossh.1 $out/man/man1/autossh.1 || return 1 + ''; + + meta = { + homepage = http://www.harding.motd.ca/autossh/; + description = "Automatically restart SSH sessions and tunnels"; + platforms = stdenv.lib.platforms.linux; + }; } - diff --git a/pkgs/tools/networking/dhcp/default.nix b/pkgs/tools/networking/dhcp/default.nix index 7fa1fce66a5..2dac54577b8 100644 --- a/pkgs/tools/networking/dhcp/default.nix +++ b/pkgs/tools/networking/dhcp/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, nettools, iputils, iproute, makeWrapper, coreutils, gnused }: stdenv.mkDerivation rec { - name = "dhcp-4.1.2-P1"; + name = "dhcp-4.1-ESV-R6"; src = fetchurl { - url = "http://ftp.isc.org/isc/dhcp/${name}.tar.gz"; - sha256 = "1kcdsylyx0ai0wlmc6rc6b1qi2fsndqh1pvgvddd3i4hmbhi6vmz"; + url = http://ftp.isc.org/isc/dhcp/4.1-ESV-R6/dhcp-4.1-ESV-R6.tar.gz; + sha256 = "17md1vml07szl9dx4875gfg4sgnb3z73glpbq1si7p82mfhnddny"; }; patches = diff --git a/pkgs/tools/networking/miniupnpc/default.nix b/pkgs/tools/networking/miniupnpc/default.nix index 34ec8eed90e..3cd35073be6 100644 --- a/pkgs/tools/networking/miniupnpc/default.nix +++ b/pkgs/tools/networking/miniupnpc/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "miniupnpc-1.6"; + name = "miniupnpc-1.7"; src = fetchurl { url = "http://miniupnp.free.fr/files/download.php?file=${name}.tar.gz"; - sha256 = "151rh46axl44y7bbflb43pnj52gvlfnkxfgrn2jvai5gwrbbgmmv"; + sha256 = "0dv3mz4yikngmlnrnmh747mlgbbpijryw03wcs8g4jwvprb29p8n"; }; installFlags = "PREFIX=$(out) INSTALLPREFIX=$(out)"; diff --git a/pkgs/tools/networking/nbd/default.nix b/pkgs/tools/networking/nbd/default.nix index 97ef0080de2..9e2d14c64ff 100644 --- a/pkgs/tools/networking/nbd/default.nix +++ b/pkgs/tools/networking/nbd/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pkgconfig, glib }: let - name = "nbd-3.1.1"; + name = "nbd-3.2"; in stdenv.mkDerivation { inherit name; src = fetchurl { url = "mirror://sourceforge/nbd/${name}.tar.bz2"; - sha256 = "5cd150b874f966aacf4a9dfe1e9de9b2139b295241ce89bae9f70f9aa844220b"; + sha256 = "e297c1883133f04a55d8e9527a2e4344e577a54046cf81694ffabe13f73793db"; }; buildInputs = [ pkgconfig glib ] ++ stdenv.lib.optional (stdenv ? glibc) stdenv.glibc.kernelHeaders; @@ -18,7 +18,7 @@ stdenv.mkDerivation { cp README "$out/share/doc/${name}/README" ''; - # The test suite doesn't succeed on Hydra. + # The test suite doesn't succeed in chroot builds. doCheck = false; # Glib calls `clock_gettime', which is in librt. Linking that library diff --git a/pkgs/tools/networking/netrw/default.nix b/pkgs/tools/networking/netrw/default.nix new file mode 100644 index 00000000000..23ff6ddba55 --- /dev/null +++ b/pkgs/tools/networking/netrw/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchurl +, checksumType ? "built-in" +, libmhash ? null +, openssl ? null +}: + +assert checksumType == "mhash" -> libmhash != null; +assert checksumType == "openssl" -> openssl != null; + +stdenv.mkDerivation rec { + name = "netrw-${version}"; + version = "1.3.2"; + + configureFlags = [ + "--with-checksum=${checksumType}" + ]; + + buildInputs = stdenv.lib.optional (checksumType == "mhash") libmhash + ++ stdenv.lib.optional (checksumType == "openssl") openssl; + + src = fetchurl { + urls = [ + "http://mamuti.net/files/netrw/netrw-${version}.tar.bz2" + "http://www.sourcefiles.org/Networking/FTP/Other/netrw-${version}.tar.bz2" + ]; + sha256 = "1gnl80i5zkyj2lpnb4g0q0r5npba1x6cnafl2jb3i3pzlfz1bndr"; + }; + + meta = { + description = "A simple tool for transporting data over the network."; + license = stdenv.lib.licenses.gpl2; + homepage = "http://mamuti.net/netrw/index.en.html"; + }; +} diff --git a/pkgs/tools/networking/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager-applet/default.nix index d22d5f50988..1a9b9485749 100644 --- a/pkgs/tools/networking/network-manager-applet/default.nix +++ b/pkgs/tools/networking/network-manager-applet/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, intltool, pkgconfig, gtk, glib, libglade -, networkmanager, GConf, libnotify, libgnome_keyring, dbus_glib -, polkit, isocodes }: +{ stdenv, fetchurl, intltool, pkgconfig, gtk, libglade, networkmanager, GConf +, libnotify, libgnome_keyring, dbus_glib, polkit, isocodes +, mobile_broadband_provider_info }: let pn = "network-manager-applet"; major = "0.9"; - version = "${major}.2.0"; + version = "${major}.4.1"; in stdenv.mkDerivation rec { @@ -13,19 +13,25 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pn}/${major}/${name}.tar.xz"; - sha256 = "ebe725d0140f658c6a3f384674c72fba7a7c417df3be0e84ee8f45e6dfc219de"; + sha256 = "b6b6de75e28d1fbcdfdbb51c0e40fcd6bc0ec0385bfecd16c457260491cd2ff7"; }; - buildInputs = [ gtk libglade networkmanager GConf libnotify libgnome_keyring - polkit isocodes ]; + buildInputs = [ + gtk libglade networkmanager GConf libnotify libgnome_keyring dbus_glib + polkit isocodes + ]; buildNativeInputs = [ intltool pkgconfig ]; + makeFlags = [ + ''CFLAGS=-DMOBILE_BROADBAND_PROVIDER_INFO=\"${mobile_broadband_provider_info}/share/mobile-broadband-provider-info/serviceproviders.xml\"'' + ]; + meta = with stdenv.lib; { homepage = http://projects.gnome.org/NetworkManager/; description = "NetworkManager control applet for GNOME"; license = licenses.gpl2; - maintainers = [ maintainers.phreedom maintainers.urkud ]; + maintainers = with maintainers; [ phreedom urkud rickynils ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index 00f37bd61e3..eec7361f6a2 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -1,16 +1,20 @@ { stdenv, fetchurl, intltool, wirelesstools, pkgconfig, dbus_glib, xz -, udev, libnl1, libuuid, polkit, gnutls, ppp, dhcp, dhcpcd, iptables -, libgcrypt, dnsmasq, avahi, substituteAll }: +, udev, libnl, libuuid, polkit, gnutls, ppp, dhcp, dhcpcd, iptables +, libgcrypt, dnsmasq, avahi, bind, perl, substituteAll }: stdenv.mkDerivation rec { name = "network-manager-${version}"; - version = "0.9.2.0"; + version = "0.9.4.0"; src = fetchurl { url = "mirror://gnome/sources/NetworkManager/0.9/NetworkManager-${version}.tar.xz"; - sha256 = "1pvd49ji7mh8ww2rfbvq6hmmjms5mb7w10fr7ihgzqbg589zjyj3"; + sha256 = "eb4f124008b3d855a37205d03ef035b7218639cd7332bdae5567095977e93e0f"; }; + preConfigure = '' + substituteInPlace tools/glib-mkenums --replace /usr/bin/perl ${perl}/bin/perl + ''; + # Right now we hardcode quite a few paths at build time. Probably we should # patch networkmanager to allow passing these path in config file. This will # remove unneeded build-time dependencies. @@ -27,7 +31,7 @@ stdenv.mkDerivation rec { "--with-dbus-sys-dir=\${out}/etc/dbus-1/system.d" "--with-crypto=gnutls" "--disable-more-warnings" ]; - buildInputs = [ wirelesstools udev libnl1 libuuid polkit ppp xz ]; + buildInputs = [ wirelesstools udev libnl libuuid polkit ppp xz ]; propagatedBuildInputs = [ dbus_glib gnutls libgcrypt ]; @@ -36,7 +40,7 @@ stdenv.mkDerivation rec { patches = [ ( substituteAll { src = ./nixos-purity.patch; - inherit avahi dnsmasq ppp; + inherit avahi dnsmasq ppp bind; glibc = stdenv.gcc.libc; }) ]; @@ -46,11 +50,16 @@ stdenv.mkDerivation rec { installFlagsArray=( "sysconfdir=$out/etc" "localstatedir=$out/var" ) ''; + postInstall = + '' + mkdir -p $out/lib/NetworkManager + ''; + meta = with stdenv.lib; { homepage = http://projects.gnome.org/NetworkManager/; description = "Network configuration and management in an easy way. Desktop environment independent."; license = licenses.gpl2Plus; - maintainers = [ maintainers.phreedom maintainers.urkud ]; + maintainers = with maintainers; [ phreedom urkud rickynils ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/networking/network-manager/nixos-purity.patch b/pkgs/tools/networking/network-manager/nixos-purity.patch index 41f7d3b7351..998c2f25b2b 100644 --- a/pkgs/tools/networking/network-manager/nixos-purity.patch +++ b/pkgs/tools/networking/network-manager/nixos-purity.patch @@ -1,11 +1,11 @@ diff --git a/src/backends/NetworkManagerExherbo.c b/src/backends/NetworkManagerExherbo.c -index d7e24cf..aa64210 100644 +index d027789..ef6b646 100644 --- a/src/backends/NetworkManagerExherbo.c +++ b/src/backends/NetworkManagerExherbo.c -@@ -56,9 +56,9 @@ void nm_system_enable_loopback (void) - */ - void nm_system_update_dns (void) - { +@@ -41,9 +41,9 @@ void nm_backend_update_dns (void) + /* Make glibc/nscd aware of any changes to the resolv.conf file by + * restarting nscd. Only restart if already running. + */ - if (g_file_test ("/usr/sbin/nscd", G_FILE_TEST_IS_EXECUTABLE)) { + if (g_file_test ("@glibc@/sbin/nscd", G_FILE_TEST_IS_EXECUTABLE)) { nm_log_info (LOGD_DNS, "Clearing nscd hosts cache."); @@ -15,7 +15,7 @@ index d7e24cf..aa64210 100644 } diff --git a/src/dhcp-manager/nm-dhcp-dhclient.c b/src/dhcp-manager/nm-dhcp-dhclient.c -index 88136a9..b4113a9 100644 +index 0932139..5b5aee8 100644 --- a/src/dhcp-manager/nm-dhcp-dhclient.c +++ b/src/dhcp-manager/nm-dhcp-dhclient.c @@ -68,10 +68,6 @@ const char * @@ -44,8 +44,23 @@ index 237661f..48bc33f 100644 NULL }; const char **path = dhcpcd_paths; +diff --git a/src/dns-manager/nm-dns-bind.c b/src/dns-manager/nm-dns-bind.c +index 1a3243b..a47dccd 100644 +--- a/src/dns-manager/nm-dns-bind.c ++++ b/src/dns-manager/nm-dns-bind.c +@@ -51,9 +51,7 @@ static inline const char * + find_bind (void) + { + static const char *paths[] = { +- "/usr/local/sbin/named", +- "/usr/sbin/named", +- "/sbin/named", ++ "@bind@/sbin/named", + NULL + }; + const char **binary = paths; diff --git a/src/dns-manager/nm-dns-dnsmasq.c b/src/dns-manager/nm-dns-dnsmasq.c -index 2767208..6562015 100644 +index 8e216f4..6e00210 100644 --- a/src/dns-manager/nm-dns-dnsmasq.c +++ b/src/dns-manager/nm-dns-dnsmasq.c @@ -52,9 +52,7 @@ static inline const char * @@ -60,7 +75,7 @@ index 2767208..6562015 100644 }; const char **binary = paths; diff --git a/src/dnsmasq-manager/nm-dnsmasq-manager.c b/src/dnsmasq-manager/nm-dnsmasq-manager.c -index ca2f9dc..7afb118 100644 +index ca2f9dc..ce718d0 100644 --- a/src/dnsmasq-manager/nm-dnsmasq-manager.c +++ b/src/dnsmasq-manager/nm-dnsmasq-manager.c @@ -170,9 +170,7 @@ static inline const char * @@ -75,11 +90,11 @@ index ca2f9dc..7afb118 100644 }; diff --git a/src/nm-device.c b/src/nm-device.c -index 3522ea4..75b2db3 100644 +index 1dc94ee..e60f3c8 100644 --- a/src/nm-device.c +++ b/src/nm-device.c -@@ -1285,8 +1285,7 @@ aipd_exec (NMDevice *self, GError **error) - gboolean success = FALSE; +@@ -1321,8 +1321,7 @@ aipd_start (NMDevice *self, NMDeviceStateReason *reason) + char *argv[6], *cmdline; const char **aipd_binary = NULL; static const char *aipd_paths[] = { - "/usr/sbin/avahi-autoipd", @@ -88,7 +103,7 @@ index 3522ea4..75b2db3 100644 NULL }; int i = 0; -@@ -2446,7 +2445,7 @@ share_init (void) +@@ -2555,7 +2554,7 @@ share_init (void) } for (iter = modules; *iter; iter++) { @@ -98,7 +113,7 @@ index 3522ea4..75b2db3 100644 GError *error = NULL; diff --git a/src/ppp-manager/nm-ppp-manager.c b/src/ppp-manager/nm-ppp-manager.c -index e863aab..27c14e2 100644 +index 59698c3..7dba0f7 100644 --- a/src/ppp-manager/nm-ppp-manager.c +++ b/src/ppp-manager/nm-ppp-manager.c @@ -661,9 +661,7 @@ static inline const char * @@ -112,7 +127,7 @@ index e863aab..27c14e2 100644 NULL }; -@@ -992,7 +990,7 @@ nm_ppp_manager_start (NMPPPManager *manager, +@@ -988,7 +986,7 @@ nm_ppp_manager_start (NMPPPManager *manager, /* Make sure /dev/ppp exists (bgo #533064) */ if (stat ("/dev/ppp", &st) || !S_ISCHR (st.st_mode)) diff --git a/pkgs/tools/networking/network-manager/pptp-purity.patch b/pkgs/tools/networking/network-manager/pptp-purity.patch new file mode 100644 index 00000000000..55ade68dd41 --- /dev/null +++ b/pkgs/tools/networking/network-manager/pptp-purity.patch @@ -0,0 +1,26 @@ +diff --git a/src/nm-pptp-service.c b/src/nm-pptp-service.c +index 68a5759..568bbfe 100644 +--- a/src/nm-pptp-service.c ++++ b/src/nm-pptp-service.c +@@ -729,9 +729,7 @@ nm_find_pppd (void) + { + static const char *pppd_binary_paths[] = + { +- "/sbin/pppd", +- "/usr/sbin/pppd", +- "/usr/local/sbin/pppd", ++ "@ppp@/sbin/pppd", + NULL + }; + +@@ -751,9 +749,7 @@ nm_find_pptp (void) + { + static const char *pptp_binary_paths[] = + { +- "/sbin/pptp", +- "/usr/sbin/pptp", +- "/usr/local/sbin/pptp", ++ "@pptp@/sbin/pptp", + NULL + }; + diff --git a/pkgs/tools/networking/network-manager/pptp.nix b/pkgs/tools/networking/network-manager/pptp.nix index dc3c1643ebc..8d2acfe9b31 100644 --- a/pkgs/tools/networking/network-manager/pptp.nix +++ b/pkgs/tools/networking/network-manager/pptp.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchurl, networkmanager, pptp, ppp, intltool, pkgconfig +{ stdenv, fetchurl, networkmanager, pptp, ppp, intltool, pkgconfig, substituteAll , withGnome ? false, gtk, libgnome_keyring }: stdenv.mkDerivation rec { name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; pname = "NetworkManager-pptp"; - version = "0.9.2.0"; + version = "0.9.4.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/0.9/${pname}-${version}.tar.xz"; - sha256 = "1fj2v8pjc17m9calckgc2jm8wbimwga8if4r21walf9xysvhsd1b"; + sha256 = "0p93in5dn8m6dp9qs2ppfmazwqlklp5hwp9pjqr7jwvjbac75dvg"; }; buildInputs = [ networkmanager pptp ppp ] @@ -19,6 +19,13 @@ stdenv.mkDerivation rec { configureFlags = if withGnome then "--with-gnome --with-gtkver=2" else "--without-gnome"; + patches = + [ ( substituteAll { + src = ./pptp-purity.patch; + inherit ppp pptp; + }) + ]; + meta = { description = "PPtP plugin for NetworkManager"; inherit (networkmanager.meta) maintainers platforms; diff --git a/pkgs/tools/networking/networkmanagement/default.nix b/pkgs/tools/networking/networkmanagement/default.nix index 682b78f2bae..1919186586a 100644 --- a/pkgs/tools/networking/networkmanagement/default.nix +++ b/pkgs/tools/networking/networkmanagement/default.nix @@ -2,7 +2,7 @@ let pname = "networkmanagement"; - version = "0.9.0"; + version = "0.9.0.4"; name = "${pname}-${version}"; in stdenv.mkDerivation { @@ -10,7 +10,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://kde/unstable/${pname}/${version}/src/${name}.tar.bz2"; - sha256 = "0bxb5hzygf4szv01903zirzxjb3r2nzza9ya3rag4lkxxpwaynpd"; + sha256 = "0mp2jai6f2qpywjwgvxcl1nh27idgy740vwiahfamq8w2y90a3aj"; }; buildInputs = [ kdelibs kde_workspace networkmanager ]; diff --git a/pkgs/tools/networking/p2p/seeks/default.nix b/pkgs/tools/networking/p2p/seeks/default.nix index bce4b0687ba..43c189f36a9 100644 --- a/pkgs/tools/networking/p2p/seeks/default.nix +++ b/pkgs/tools/networking/p2p/seeks/default.nix @@ -2,13 +2,13 @@ , pkgconfig, protobuf, tokyocabinet, tokyotyrant, opencv }: -let version = "0.4.0"; in +let version = "0.4.1"; in stdenv.mkDerivation { name = "seeks-${version}"; src = fetchurl { url = "mirror://sourceforge/seeks/hippy/seeks-${version}.tar.gz"; - sha256 = "1y91dmd0b0yj5036x8kk92iy88dsnzdwhhz23ba9lp96vpafd2ky"; + sha256 = "1ppbbjw1zffxxhyvy64xwsff9xlw9wigqb7qwq5iw5mhbblz545q"; }; buildInputs = diff --git a/pkgs/tools/networking/pptp/default.nix b/pkgs/tools/networking/pptp/default.nix index adb22a8d9c6..88f1a86a2ed 100644 --- a/pkgs/tools/networking/pptp/default.nix +++ b/pkgs/tools/networking/pptp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, ppp }: +{ stdenv, fetchurl, perl, ppp, iproute }: stdenv.mkDerivation rec { name = "pptp-1.7.2"; @@ -11,6 +11,7 @@ stdenv.mkDerivation rec { patchPhase = '' sed -e 's/install -o root/install/' -i Makefile + sed -e 's,/bin/ip,${iproute}/sbin/ip,' -i routing.c ''; preConfigure = '' diff --git a/pkgs/tools/networking/stunnel/default.nix b/pkgs/tools/networking/stunnel/default.nix index fa225877b40..d16d9bfb089 100644 --- a/pkgs/tools/networking/stunnel/default.nix +++ b/pkgs/tools/networking/stunnel/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, openssl }: stdenv.mkDerivation { - name = "stunnel-4.26"; + name = "stunnel-4.53"; src = fetchurl { - url = http://www.stunnel.org/download/stunnel/src/stunnel-4.26.tar.gz; - sha256 = "1lvbd25krcz1sqk5pj2fv3r32h0160qdxrbzlqqs0kz8f987krp9"; + url = http://www.stunnel.org/downloads/stunnel-4.53.tar.gz; + sha256 = "3e640aa4c96861d10addba758b66e99e7c5aec8697764f2a59ca2268901b8e57"; }; buildInputs = [openssl]; diff --git a/pkgs/tools/networking/surfraw/default.nix b/pkgs/tools/networking/surfraw/default.nix new file mode 100644 index 00000000000..6fcc031aab4 --- /dev/null +++ b/pkgs/tools/networking/surfraw/default.nix @@ -0,0 +1,22 @@ +{stdenv, fetchurl, perl}: + +stdenv.mkDerivation rec { + name = "surfraw-2.2.8"; + + src = fetchurl { + url = "http://surfraw.alioth.debian.org/dist/surfraw-2.2.8.tar.gz"; + sha256 = "925075e05637e39458b00e859193aacde306aafd9a962f44f5114f81713539ec"; + }; + + configureFlags = [ + "--disable-opensearch" + ]; + + buildNativeInputs = [ perl ]; + + meta = { + description = "Provides a fast unix command line interface to a variety of popular WWW search engines and other artifacts of power"; + homepage = "http://surfraw.alioth.debian.org"; + maintainers = []; + }; +} diff --git a/pkgs/tools/networking/trickle/default.nix b/pkgs/tools/networking/trickle/default.nix new file mode 100644 index 00000000000..646108525d3 --- /dev/null +++ b/pkgs/tools/networking/trickle/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl, libevent }: + +stdenv.mkDerivation rec { + name = "trickle-1.07"; + + src = fetchurl { + url = "http://monkey.org/~marius/trickle/${name}.tar.gz"; + sha256 = "0s1qq3k5mpcs9i7ng0l9fvr1f75abpbzfi1jaf3zpzbs1dz50dlx"; + }; + + buildInputs = [libevent]; + + preConfigure = '' + sed -i 's|libevent.a|libevent.so|' configure + ''; + + preBuild = '' + sed -i '/#define in_addr_t/ s:^://:' config.h + ''; + + LDFLAGS = "-levent"; + + configureFlags = "--with-libevent"; + + meta = { + description = "Trickle, a portable lightweight userspace bandwidth shaper."; + license = "BSD"; + homepage = http://monkey.org/~marius/pages/?page=trickle; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/tools/package-management/disnix/activation-scripts/default.nix b/pkgs/tools/package-management/disnix/activation-scripts/default.nix index 23906fb3aff..beae2e3b5f6 100644 --- a/pkgs/tools/package-management/disnix/activation-scripts/default.nix +++ b/pkgs/tools/package-management/disnix/activation-scripts/default.nix @@ -18,8 +18,8 @@ assert enableEjabberdDump -> ejabberd != null; stdenv.mkDerivation { name = "disnix-activation-scripts-0.3pre30423"; src = fetchurl { - url = http://hydra.nixos.org/build/1842091/download/1/disnix-activation-scripts-0.3pre30423.tar.gz; - sha256 = "11b569bflknjbjddam4mv07bpmihbfx5acxzxzhnshj6x8sv6064"; + url = http://hydra.nixos.org/build/2794103/download/1/disnix-activation-scripts-0.3pre30423.tar.gz; + sha256 = "1x1702isjnrkvwzycryc8rvjgka4qqmd1dk34pwl51y1l2bxymrx"; }; preConfigure = if enableEjabberdDump then "export PATH=$PATH:${ejabberd}/sbin" else ""; diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 79f73ebb8c3..e433aa60579 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation rec { - name = "nix-1.0"; + name = "nix-1.1"; src = fetchurl { - url = "http://hydra.nixos.org/build/2609700/download/4/${name}.tar.bz2"; - sha256 = "27f1d4d2a5fb1951bfc9e706c0894a961aed1afe0d095e16eb8fbef94ee7ec17"; + url = "http://hydra.nixos.org/build/2860022/download/4/${name}.tar.bz2"; + sha256 = "edb2fc444eda49be144ca2901f1fc9472cd24896775ba02556ded5705863d324"; }; buildNativeInputs = [ perl pkgconfig ]; @@ -53,6 +53,7 @@ stdenv.mkDerivation rec { '' + stdenv.lib.optionalString ( stdenv.cross ? nix && stdenv.cross.nix ? system ) ''--with-system=${stdenv.cross.nix.system}''; + doInstallCheck = false; }; diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix index a5466114358..103d92a0ee9 100644 --- a/pkgs/tools/package-management/nix/unstable.nix +++ b/pkgs/tools/package-management/nix/unstable.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation rec { - name = "nix-1.1pre2718_8da6772"; + name = "nix-1.2pre2793_d950cfe"; src = fetchurl { - url = "http://hydra.nixos.org/build/2727338/download/4/${name}.tar.bz2"; - sha256 = "99466467b01102d8a2e1022283259ac490427b9a45c3c4784af027977014d7c5"; + url = "http://hydra.nixos.org/build/2955697/download/4/${name}.tar.bz2"; + sha256 = "f91367d8e7ed795b2bc9a47fb3ecff00d005633f248ecaafa25e8e101a5dc682"; }; buildNativeInputs = [ perl pkgconfig ]; @@ -53,6 +53,7 @@ stdenv.mkDerivation rec { '' + stdenv.lib.optionalString ( stdenv.cross ? nix && stdenv.cross.nix ? system ) ''--with-system=${stdenv.cross.nix.system}''; + doInstallCheck = false; }; diff --git a/pkgs/tools/security/clamav/default.nix b/pkgs/tools/security/clamav/default.nix new file mode 100644 index 00000000000..bccf0cc77c5 --- /dev/null +++ b/pkgs/tools/security/clamav/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, zlib, bzip2, libiconv }: +stdenv.mkDerivation rec { + name = "clamav-${version}"; + version = "0.97.5"; + + src = fetchurl { + url = "http://tenet.dl.sourceforge.net/project/clamav/clamav/${version}/clamav-${version}.tar.gz"; + sha256 = "039wm64wl2sx7k019g5ll5dkdlsq64fnd0ng0s00pjn8bqd5wv6v"; + }; + + buildInputs = [ zlib bzip2 libiconv ]; + + configureFlags = [ + "--with-zlib=${zlib}" + "--with-libbz2-prefix=${bzip2}" + "--with-iconv-dir=${libiconv}" + "--disable-clamav" ]; + + meta = with stdenv.lib; { + homepage = http://www.clamav.net; + description = "an open source (GPL) antivirus engine designed for detecting Trojans, viruses, malware and other malicious threats."; + license = licenses.gpl2; + maintainers = [ maintainers.phreedom ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/security/fprot/default.nix b/pkgs/tools/security/fprot/default.nix new file mode 100644 index 00000000000..95f7140b918 --- /dev/null +++ b/pkgs/tools/security/fprot/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchurl }: +stdenv.mkDerivation rec { + + name = "f-prot-${version}"; + version = "6.2.1"; + + src = fetchurl { + url = http://files.f-prot.com/files/unix-trial/fp-Linux.x86.32-ws.tar.gz; + sha256 = "0qlsrkanf0inplwv1i6hqbimdg91syf5ggd1vahsm9lhivmnr0v5"; + }; + + installPhase = '' + ensureDir $out/bin + cp fpscan $out/bin + + ensureDir $out/opt/f-prot + cp fpupdate $out/opt/f-prot + cp product.data.default $out/opt/f-prot/product.data + cp license.key $out/opt/f-prot/ + cp f-prot.conf.default $out/opt/f-prot/f-prot.conf + ln -s $out/opt/f-prot/fpupdate $out/bin/fpupdate + + patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" $out/opt/f-prot/fpupdate + + ensureDir $out/share/man/ + ensureDir $out/share/man/man1 + cp doc/man/fpscan.1 $out/share/man/man1 + ensureDir $out/share/man/man5 + cp doc/man/f-prot.conf.5 $out/share/man/man5 + ensureDir $out/share/man/man8 + cp doc/man/fpupdate.8 $out/share/man/man8 + ''; + + meta = with stdenv.lib; { + homepage = http://www.f-prot.com; + description = "a popular proprietary antivirus, Linux workstation edition."; + license = licenses.proprietary; + maintainers = [ maintainers.phreedom ]; + platforms = platforms.linux; + }; +} \ No newline at end of file diff --git a/pkgs/tools/security/gnupg/default.nix b/pkgs/tools/security/gnupg/default.nix index d3c9e3c13b6..0667a7f9885 100644 --- a/pkgs/tools/security/gnupg/default.nix +++ b/pkgs/tools/security/gnupg/default.nix @@ -54,5 +54,7 @@ stdenv.mkDerivation rec { license = "GPLv3+"; maintainers = with stdenv.lib.maintainers; [ ludo urkud ]; + + platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/tools/security/ossec/default.nix b/pkgs/tools/security/ossec/default.nix new file mode 100644 index 00000000000..f6f062011ab --- /dev/null +++ b/pkgs/tools/security/ossec/default.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchurl, which }: + +stdenv.mkDerivation { + name = "ossec-client-2.6"; + + src = fetchurl { + url = http://www.ossec.net/files/ossec-hids-2.6.tar.gz; + + sha256 = "0k1b59wdv9h50gbyy88qw3cnpdm8hv0nrl0znm92h9a11i5b39ip"; + }; + + buildInputs = [ which ]; + + phases = [ "unpackPhase" "patchPhase" "buildPhase" ]; + + patches = [ ./no-root.patch ]; + + buildPhase = '' + echo "en + +agent +$out +no +127.0.0.1 +yes +yes +yes + + +" | ./install.sh + ''; + + meta = { + description = "Open soruce host-based instrusion detection system"; + homepage = http://www.ossec.net; + license = stdenv.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.shlevy ]; + }; +} + diff --git a/pkgs/tools/security/ossec/no-root.patch b/pkgs/tools/security/ossec/no-root.patch new file mode 100644 index 00000000000..ea6e9c54a9a --- /dev/null +++ b/pkgs/tools/security/ossec/no-root.patch @@ -0,0 +1,176 @@ +diff -Naur ossec-hids-2.6-orig/install.sh ossec-hids-2.6/install.sh +--- ossec-hids-2.6-orig/install.sh 2011-07-11 15:36:58.000000000 -0400 ++++ ossec-hids-2.6/install.sh 2012-07-09 09:58:57.970692818 -0400 +@@ -119,14 +119,14 @@ + # Generate the /etc/ossec-init.conf + VERSION_FILE="./src/VERSION" + VERSION=`cat ${VERSION_FILE}` +- chmod 700 ${OSSEC_INIT} > /dev/null 2>&1 +- echo "DIRECTORY=\"${INSTALLDIR}\"" > ${OSSEC_INIT} +- echo "VERSION=\"${VERSION}\"" >> ${OSSEC_INIT} +- echo "DATE=\"`date`\"" >> ${OSSEC_INIT} +- echo "TYPE=\"${INSTYPE}\"" >> ${OSSEC_INIT} +- chmod 600 ${OSSEC_INIT} +- cp -pr ${OSSEC_INIT} ${INSTALLDIR}${OSSEC_INIT} +- chmod 644 ${INSTALLDIR}${OSSEC_INIT} ++ echo chmod 700 ${OSSEC_INIT} > /dev/null 2>&1 ++ echo "DIRECTORY=\"${INSTALLDIR}\"" > ${INSTALLDIR}${OSSEC_INIT} ++ echo "VERSION=\"${VERSION}\"" >> ${INSTALLDIR}${OSSEC_INIT} ++ echo "DATE=\"`date`\"" >> ${INSTALLDIR}${OSSEC_INIT} ++ echo "TYPE=\"${INSTYPE}\"" >> ${INSTALLDIR}${OSSEC_INIT} ++ echo chmod 600 ${OSSEC_INIT} ++ echo cp -pr ${OSSEC_INIT} ${INSTALLDIR}${OSSEC_INIT} ++ echo chmod 644 ${INSTALLDIR}${OSSEC_INIT} + + + # If update_rules is set, we need to tweak +@@ -926,11 +926,6 @@ + catError "0x1-location"; + fi + +- # Must be root +- if [ ! "X$ME" = "Xroot" ]; then +- catError "0x2-beroot"; +- fi +- + # Checking dependencies + checkDependencies + +diff -Naur ossec-hids-2.6-orig/src/InstallAgent.sh ossec-hids-2.6/src/InstallAgent.sh +--- ossec-hids-2.6-orig/src/InstallAgent.sh 2011-07-11 15:36:58.000000000 -0400 ++++ ossec-hids-2.6/src/InstallAgent.sh 2012-07-09 09:56:12.061870552 -0400 +@@ -80,7 +80,7 @@ + else + grep "^${USER}" /etc/passwd > /dev/null 2>&1 + if [ ! $? = 0 ]; then +- /usr/sbin/groupadd ${GROUP} ++ echo /usr/sbin/groupadd ${GROUP} + + # We first check if /sbin/nologin is present. If it is not, + # we look for bin/false. If none of them is present, we +@@ -93,7 +93,7 @@ + OSMYSHELL="/bin/false" + fi + fi +- /usr/sbin/useradd -d ${DIR} -s ${OSMYSHELL} -g ${GROUP} ${USER} ++ echo /usr/sbin/useradd -d ${DIR} -s ${OSMYSHELL} -g ${GROUP} ${USER} + fi + fi + +@@ -105,31 +105,31 @@ + done + + # Default for all directories +-chmod -R 550 ${DIR} +-chown -R root:${GROUP} ${DIR} ++echo chmod -R 550 ${DIR} ++echo chown -R root:${GROUP} ${DIR} + + # To the ossec queue (default for agentd to read) +-chown -R ${USER}:${GROUP} ${DIR}/queue/ossec +-chmod -R 770 ${DIR}/queue/ossec ++echo chown -R ${USER}:${GROUP} ${DIR}/queue/ossec ++echo chmod -R 770 ${DIR}/queue/ossec + + # For the logging user +-chown -R ${USER}:${GROUP} ${DIR}/logs +-chmod -R 750 ${DIR}/logs +-chmod -R 775 ${DIR}/queue/rids +-touch ${DIR}/logs/ossec.log +-chown ${USER}:${GROUP} ${DIR}/logs/ossec.log +-chmod 664 ${DIR}/logs/ossec.log +- +-chown -R ${USER}:${GROUP} ${DIR}/queue/diff +-chmod -R 750 ${DIR}/queue/diff +-chmod 740 ${DIR}/queue/diff/* > /dev/null 2>&1 ++echo chown -R ${USER}:${GROUP} ${DIR}/logs ++echo chmod -R 750 ${DIR}/logs ++echo chmod -R 775 ${DIR}/queue/rids ++echo touch ${DIR}/logs/ossec.log ++echo chown ${USER}:${GROUP} ${DIR}/logs/ossec.log ++echo chmod 664 ${DIR}/logs/ossec.log ++ ++echo chown -R ${USER}:${GROUP} ${DIR}/queue/diff ++echo chmod -R 750 ${DIR}/queue/diff ++echo chmod 740 ${DIR}/queue/diff/* "> /dev/null 2>&1" + + + + + # For the etc dir +-chmod 550 ${DIR}/etc +-chown -R root:${GROUP} ${DIR}/etc ++echo chmod 550 ${DIR}/etc ++echo chown -R root:${GROUP} ${DIR}/etc + + ls /etc/localtime > /dev/null 2>&1 + if [ $? = 0 ]; then +@@ -167,25 +167,25 @@ + cp -pr ../etc/client.keys ${DIR}/etc/ > /dev/null 2>&1 + cp -pr agentlessd/scripts/* ${DIR}/agentless/ + +-chown root:${GROUP} ${DIR}/etc/internal_options.conf +-chown root:${GROUP} ${DIR}/etc/local_internal_options.conf > /dev/null 2>&1 +-chown root:${GROUP} ${DIR}/etc/client.keys > /dev/null 2>&1 +-chown root:${GROUP} ${DIR}/agentless/* +-chown ${USER}:${GROUP} ${DIR}/.ssh +-chown -R root:${GROUP} ${DIR}/etc/shared +- +-chmod 550 ${DIR}/etc +-chmod 440 ${DIR}/etc/internal_options.conf +-chmod 440 ${DIR}/etc/local_internal_options.conf > /dev/null 2>&1 +-chmod 440 ${DIR}/etc/client.keys > /dev/null 2>&1 +-chmod -R 770 ${DIR}/etc/shared # ossec must be able to write to it +-chmod 550 ${DIR}/agentless/* +-chmod 700 ${DIR}/.ssh ++echo chown root:${GROUP} ${DIR}/etc/internal_options.conf ++echo chown root:${GROUP} ${DIR}/etc/local_internal_options.conf "> /dev/null 2>&1" ++echo chown root:${GROUP} ${DIR}/etc/client.keys "> /dev/null 2>&1" ++echo chown root:${GROUP} ${DIR}/agentless/* ++echo chown ${USER}:${GROUP} ${DIR}/.ssh ++echo chown -R root:${GROUP} ${DIR}/etc/shared ++ ++echo chmod 550 ${DIR}/etc ++echo chmod 440 ${DIR}/etc/internal_options.conf ++echo chmod 440 ${DIR}/etc/local_internal_options.conf > /dev/null 2>&1 ++echo chmod 440 ${DIR}/etc/client.keys > /dev/null 2>&1 ++echo chmod -R 770 ${DIR}/etc/shared # ossec must be able to write to it ++echo chmod 550 ${DIR}/agentless/* ++echo chmod 700 ${DIR}/.ssh + + + # For the /var/run +-chmod 770 ${DIR}/var/run +-chown root:${GROUP} ${DIR}/var/run ++echo chmod 770 ${DIR}/var/run ++echo chown root:${GROUP} ${DIR}/var/run + + + # Moving the binary files +@@ -201,11 +201,11 @@ + sh ./init/fw-check.sh execute > /dev/null + cp -pr ../active-response/*.sh ${DIR}/active-response/bin/ + cp -pr ../active-response/firewalls/*.sh ${DIR}/active-response/bin/ +-chmod 755 ${DIR}/active-response/bin/* +-chown root:${GROUP} ${DIR}/active-response/bin/* ++echo chmod 755 ${DIR}/active-response/bin/* ++echo chown root:${GROUP} ${DIR}/active-response/bin/* + +-chown root:${GROUP} ${DIR}/bin/* +-chmod 550 ${DIR}/bin/* ++echo chown root:${GROUP} ${DIR}/bin/* ++echo chmod 550 ${DIR}/bin/* + + + # Moving the config file +@@ -221,8 +221,8 @@ + else + cp -pr ../etc/ossec-agent.conf ${DIR}/etc/ossec.conf + fi +-chown root:${GROUP} ${DIR}/etc/ossec.conf +-chmod 440 ${DIR}/etc/ossec.conf ++echo chown root:${GROUP} ${DIR}/etc/ossec.conf ++echo chmod 440 ${DIR}/etc/ossec.conf + + + diff --git a/pkgs/tools/system/gptfdisk/default.nix b/pkgs/tools/system/gptfdisk/default.nix index f82c94c0a72..9db39411854 100644 --- a/pkgs/tools/system/gptfdisk/default.nix +++ b/pkgs/tools/system/gptfdisk/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, libuuid, popt, icu, ncurses }: stdenv.mkDerivation rec { - name = "gptfdisk-0.8.0"; + name = "gptfdisk-0.8.5"; src = fetchurl { url = "mirror://sourceforge/gptfdisk/${name}.tar.gz"; - sha256 = "096qmlqcsvjklihggwphdmd0y78jz4ghf7gf4fvjnskp7mg4ng31"; + sha256 = "1yaax2mga7n847x1ihbgvv4drzvndgnn4mii0mz1ab1150gnkk0m"; }; buildInputs = [ libuuid popt icu ncurses ]; diff --git a/pkgs/tools/system/logcheck/default.nix b/pkgs/tools/system/logcheck/default.nix new file mode 100644 index 00000000000..1c57711940b --- /dev/null +++ b/pkgs/tools/system/logcheck/default.nix @@ -0,0 +1,45 @@ +{ stdenv, fetchurl, lockfileProgs, perl, mimeConstruct }: + +stdenv.mkDerivation rec { + _name = "logcheck"; + version = "1.3.15"; + name = "${_name}-${version}"; + + src = fetchurl { + url = "mirror://debian/pool/main/l/${_name}/${_name}_${version}.tar.gz"; + sha256 = "1rdrs12hkm5i5yyz89a6cwhf4fzjkbcd4q4zy6sk148aji9lg6xj"; + }; + + preConfigure = '' + substituteInPlace src/logtail --replace "/usr/bin/perl" "${perl}/bin/perl" + substituteInPlace src/logtail2 --replace "/usr/bin/perl" "${perl}/bin/perl" + + sed -i -e 's|! -f /usr/bin/lockfile|! -f ${lockfileProgs}/bin/lockfile|' \ + -e 's|^\([ \t]*\)lockfile-|\1${lockfileProgs}/bin/lockfile-|' \ + -e "s|/usr/sbin/logtail2|$out/sbin/logtail2|" \ + -e 's|mime-construct|${mimeConstruct}/bin/mime-construct|' \ + -e 's|\$(run-parts --list "\$dir")|"$dir"/*|' src/logcheck + ''; + + makeFlags = [ + "DESTDIR=$(out)" + "SBINDIR=sbin" + "BINDIR=bin" + "SHAREDIR=share/logtail/detectrotate" + ]; + + meta = { + description = "Mails anomalies in the system logfiles to the administrator."; + longDescription = '' + Mails anomalies in the system logfiles to the administrator. + + Logcheck helps spot problems and security violations in your logfiles automatically and will send the results to you by e-mail. + Logcheck was part of the Abacus Project of security tools, but this version has been rewritten. + ''; + homepage = http://logcheck.org; + license = "GPLv2"; + + maintainers = [ stdenv.lib.maintainers.bluescreen303 ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/tools/text/enca/default.nix b/pkgs/tools/text/enca/default.nix new file mode 100644 index 00000000000..ce1c7401a4e --- /dev/null +++ b/pkgs/tools/text/enca/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, libiconv ? null }: + +stdenv.mkDerivation rec { + name = "enca-1.13"; + + src = fetchurl { + url = "http://dl.cihar.com/enca/${name}.tar.bz2"; + sha256 = "6c091455d524b3ddae3533fe9bb375092f60ad6fe252e0777c873bd7869c7432"; + }; + + buildInputs = (stdenv.lib.optional (libiconv != null) libiconv); + + meta = { + homepage = http://freecode.com/projects/enca; + description = "Detects the encoding of text files and reencodes them"; + + longDescription = '' + Enca detects the encoding of text files, on the basis of knowledge + of their language. It can also convert them to other encodings, + allowing you to recode files without knowing their current encoding. + It supports most of Central and East European languages, and a few + Unicode variants, independently on language. + ''; + + license = "GPLv2"; + + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/tools/text/wgetpaste/default.nix b/pkgs/tools/text/wgetpaste/default.nix index 8cfc26d70cc..63313872ede 100644 --- a/pkgs/tools/text/wgetpaste/default.nix +++ b/pkgs/tools/text/wgetpaste/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, wget, bash, coreutils}: stdenv.mkDerivation rec { - version = "2.19"; + version = "2.20"; name = "wgetpaste-${version}"; src = fetchurl { url = "http://wgetpaste.zlin.dk/${name}.tar.bz2"; - sha256 = "bb832557fca3be838838a87d790cb535974ea70bd2393818201676212f0f3b5a"; + sha256 = "7a53836d02e07cefc3c2978bb129a037fa1e1222ba0e275c4e818230a6d6fb9e"; }; # currently zsh-autocompletion support is not installed diff --git a/pkgs/tools/typesetting/lhs2tex/default.nix b/pkgs/tools/typesetting/lhs2tex/default.nix index a78feaadb18..2b96ae526c4 100644 --- a/pkgs/tools/typesetting/lhs2tex/default.nix +++ b/pkgs/tools/typesetting/lhs2tex/default.nix @@ -2,9 +2,9 @@ cabal.mkDerivation (self: { pname = "lhs2tex"; - version = "1.17"; + version = "1.18.1"; name = self.fname; - sha256 = "1x49316m5xm4f6hw5q7kia9rpfpygxhk5gnifd54ai0zjmdlkxrc"; + sha256 = "0j4n7vkabsggn94gbwixy1vmckdck2nggdiqvk6n9nx164if5jnw"; extraBuildInputs = [regexCompat texLive]; postInstall = '' @@ -18,10 +18,6 @@ cabal.mkDerivation (self: { description = "Preprocessor for typesetting Haskell sources with LaTeX"; license = "GPL"; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) - diff --git a/pkgs/tools/typesetting/tex/texlive/aggregate.nix b/pkgs/tools/typesetting/tex/texlive/aggregate.nix index c018d2da0d3..c2ccecab089 100644 --- a/pkgs/tools/typesetting/tex/texlive/aggregate.nix +++ b/pkgs/tools/typesetting/tex/texlive/aggregate.nix @@ -46,13 +46,14 @@ rec { rm $out/texmf*/ls-R for i in web2c texconfig fonts/map; do - cp -r $out/texmf/$i/* $out/texmf-config/$i || true + cp -Lr $out/texmf/$i/* $out/texmf-config/$i || true done + chmod -R u+w $out/texmf-config - TEXMFCONFIG=$out/texmf-config HOME=$PWD PATH=$PATH:$out/bin updmap --syncwithtrees - PATH=$PATH:$out/bin mktexlsr $out/texmf* - TEXMFCONFIG=$out/texmf-config HOME=$PWD PATH=$PATH:$out/bin updmap --syncwithtrees - PATH=$PATH:$out/bin mktexlsr $out/texmf* + yes | TEXMFCONFIG=$out/texmf-config HOME=$PWD PATH=$PATH:$out/bin updmap --syncwithtrees + yes | PATH=$PATH:$out/bin mktexlsr $out/texmf* + yes | TEXMFCONFIG=$out/texmf-config HOME=$PWD PATH=$PATH:$out/bin updmap --syncwithtrees + yes | PATH=$PATH:$out/bin mktexlsr $out/texmf* '') ["minInit" "defEnsureDir" "addInputs"]; meta = { diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix index 30e59849d32..aac8da784b3 100644 --- a/pkgs/tools/typesetting/tex/texlive/default.nix +++ b/pkgs/tools/typesetting/tex/texlive/default.nix @@ -1,18 +1,18 @@ args : with args; rec { src = fetchurl { - url = mirror://debian/pool/main/t/texlive-bin/texlive-bin_2009.orig.tar.gz; - sha256 = "0ywc8h4jnig53fs0bji2ivw5f9j6zlgdy477jqw7xvpc7migjpw7"; + url = mirror://debian/pool/main/t/texlive-bin/texlive-bin_2012.20120628.orig.tar.xz; + sha256 = "0k94df3lfvghngzdzi2d4fz2z0gs8iglz7h3w2lxvlhiwwpmx601"; }; texmfSrc = fetchurl { - url = mirror://debian/pool/main/t/texlive-base/texlive-base_2009.orig.tar.gz; - sha256 = "130z907xcxr10yrzbbmp9l8a00dabvi4bi702s5jxamjzav17cmf"; + url = mirror://debian/pool/main/t/texlive-base/texlive-base_2012.20120611.orig.tar.xz; + sha256 = "116zm0qdq9rd4vakhd2py9q7lq3ihspc7hy33bh8wy5v1rgiqsm6"; }; langTexmfSrc = fetchurl { - url = mirror://debian/pool/main/t/texlive-lang/texlive-lang_2009.orig.tar.gz; - sha256 = "10shnsc71n95zy9ys938pljdid9ampmc50k4lji9wv53hm14laic"; + url = mirror://debian/pool/main/t/texlive-lang/texlive-lang_2012.20120611.orig.tar.xz; + sha256 = "0zh9svszfkbjx72i7sa9gg0gak93wf05845mxpjv56h8qwk4bffv"; }; setupHook = ./setup-hook.sh; @@ -44,15 +44,23 @@ rec { '') ["minInit" "doUnpack" "addInputs" "defEnsureDir"]; doPostInstall = fullDepEntry('' - mv $out/bin $out/libexec + mkdir -p $out/libexec/ + mv $out/bin $out/libexec/$(uname -m) mkdir -p $out/bin - for i in "$out/libexec/"*"/"*; do - test \( \! -d "$i" \) -a -x "$i" || continue - echo -ne "#! $SHELL\\nexec $i \"\$@\"" >$out/bin/$(basename $i) - chmod a+x $out/bin/$(basename $i) + for i in "$out/libexec/"* "$out/libexec/"*/* ; do + test \( \! -d "$i" \) -a \( -x "$i" -o -L "$i" \) || continue + if [ -x "$i" ]; then + echo -ne "#! $SHELL\\nexec $i \"\$@\"" >$out/bin/$(basename $i) + chmod a+x $out/bin/$(basename $i) + else + mv "$i" "$out/libexec" + ln -s "$(readlink -f "$out/libexec/$(basename "$i")")" "$out/bin/$(basename "$i")"; + ln -sf "$(readlink -f "$out/libexec/$(basename "$i")")" "$out/libexec/$(uname -m)/$(basename "$i")"; + rm "$out/libexec/$(basename "$i")" + fi; done [ -d $out/texmf-config ] || ln -s $out/texmf $out/texmf-config - ln -s "$out/"*texmf* "$out/share/" + ln -s -v "$out/"*texmf* "$out/share/" || true sed -e 's/.*pyhyph.*/=&/' -i $out/texmf-config/tex/generic/config/language.dat @@ -79,16 +87,20 @@ rec { zlib bzip2 ncurses libpng flex bison libX11 libICE xproto freetype t1lib gd libXaw icu ghostscript ed libXt libXpm libXmu libXext xextproto perl libSM - ruby expat curl libjpeg python fontconfig + ruby expat curl libjpeg python fontconfig xz + pkgconfig poppler silgraphite lesstif zziplib ]; configureFlags = [ "--with-x11" - "--enable-ipc" "--with-mktexfmt" + "--enable-ipc" "--with-mktexfmt" "--enable-shared" + "--disable-native-texlive-build" "--with-system-zziplib" + "--with-system-icu" "--with-system-libgs" "--with-system-t1lib" + "--with-system-freetype2" ]; phaseNames = ["addInputs" "doMainBuild" "doMakeInstall" "doPostInstall"]; - name = "texlive-core-2009"; + name = "texlive-core-2012"; meta = { description = "A TeX distribution"; maintainers = [ args.lib.maintainers.raskin ]; diff --git a/pkgs/tools/typesetting/tex/texlive/extra.nix b/pkgs/tools/typesetting/tex/texlive/extra.nix index 1ecec91a685..180019bb205 100644 --- a/pkgs/tools/typesetting/tex/texlive/extra.nix +++ b/pkgs/tools/typesetting/tex/texlive/extra.nix @@ -1,12 +1,12 @@ args: with args; rec { - name = "texlive-extra-2009"; + name = "texlive-extra-2012"; src = fetchurl { - url = mirror://debian/pool/main/t/texlive-extra/texlive-extra_2009.orig.tar.gz; - sha256 = "04k48lxy76bad1270gb9k4aza2q13can2dbcf2hj0a3byls099kp"; + url = mirror://debian/pool/main/t/texlive-extra/texlive-extra_2012.20120611.orig.tar.xz; + sha256 = "1wn2gwifb5ww6nb15zdbkk5yz5spynvwqscvrgxzb84p0z3hy8dq"; }; - buildInputs = [texLive]; + buildInputs = [texLive xz]; phaseNames = ["doCopy"]; doCopy = fullDepEntry ('' mkdir -p $out/share diff --git a/pkgs/tools/typesetting/tex/texlive/moderncv.nix b/pkgs/tools/typesetting/tex/texlive/moderncv.nix index a3dde11d5ae..2d422385bd5 100644 --- a/pkgs/tools/typesetting/tex/texlive/moderncv.nix +++ b/pkgs/tools/typesetting/tex/texlive/moderncv.nix @@ -1,9 +1,10 @@ args: with args; rec { - name = "moderncv-1.0"; + version = "1.1.1"; + name = "moderncv-${version}"; src = fetchurl { - url = "http://mirror.ctan.org/macros/latex/contrib/moderncv.zip"; - sha256 = "0yq0ss3qnwk71rcxvch7r5phxfx00s3v80ddpbpc0a0rkh124w53"; + url = "https://launchpad.net/moderncv/trunk/${version}/+download/moderncv-${version}.zip"; + sha256 = "929c118eff339a5c59ed58cc961ddee787e9a5933d12ec8801613fd2e2500e9f"; }; buildInputs = [texLive unzip]; diff --git a/pkgs/tools/virtualization/aws/default.nix b/pkgs/tools/virtualization/aws/default.nix new file mode 100644 index 00000000000..00cc4e7733f --- /dev/null +++ b/pkgs/tools/virtualization/aws/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, perl }: + +stdenv.mkDerivation { + name = "aws-1.75"; + + src = fetchurl { + url = https://raw.github.com/timkay/aws/2f2ff99f9f5111ea708ae6cd14d20e264748e72b/aws; + sha256 = "0d5asv73a58yb1bb1jpsw3c7asd62y86z5fwpg4llhjzkx79maj6"; + }; + + buildInputs = [ perl ]; + + unpackPhase = "true"; + + installPhase = + '' + mkdir -p $out/bin + cp $src $out/bin/aws + chmod +x $out/bin/aws + ''; + + meta = { + homepage = http://www.timkay.com/aws/; + description = "Command-line utility for working with Amazon EC2, S3, SQS, ELB, IAM and SDB"; + license = "GPLv3+"; + }; +} diff --git a/pkgs/tools/virtualization/amazon-ec2-ami-tools/default.nix b/pkgs/tools/virtualization/ec2-ami-tools/default.nix similarity index 93% rename from pkgs/tools/virtualization/amazon-ec2-ami-tools/default.nix rename to pkgs/tools/virtualization/ec2-ami-tools/default.nix index b05596ed50a..1420ab5eeeb 100644 --- a/pkgs/tools/virtualization/amazon-ec2-ami-tools/default.nix +++ b/pkgs/tools/virtualization/ec2-ami-tools/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, unzip, ruby, openssl, makeWrapper }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "ec2-ami-tools-1.4.0.7"; buildInputs = [ unzip makeWrapper ]; src = fetchurl { - url = http://s3.amazonaws.com/ec2-downloads/ec2-ami-tools.zip; + url = "http://nixos.org/tarballs/${name}.zip"; sha256 = "0l8c623i1w30bh9k622cdjj5f57rlfc1zs0i01ya016ijyr08qip"; }; diff --git a/pkgs/tools/virtualization/amazon-ec2-ami-tools/writable.patch b/pkgs/tools/virtualization/ec2-ami-tools/writable.patch similarity index 100% rename from pkgs/tools/virtualization/amazon-ec2-ami-tools/writable.patch rename to pkgs/tools/virtualization/ec2-ami-tools/writable.patch diff --git a/pkgs/tools/virtualization/amazon-ec2-api-tools/default.nix b/pkgs/tools/virtualization/ec2-api-tools/default.nix similarity index 75% rename from pkgs/tools/virtualization/amazon-ec2-api-tools/default.nix rename to pkgs/tools/virtualization/ec2-api-tools/default.nix index 1d146aa449e..22669c67b12 100644 --- a/pkgs/tools/virtualization/amazon-ec2-api-tools/default.nix +++ b/pkgs/tools/virtualization/ec2-api-tools/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, unzip, makeWrapper, jre }: -stdenv.mkDerivation { - name = "ec2-api-tools-1.5.3.0"; +stdenv.mkDerivation rec { + name = "ec2-api-tools-1.6.0.0"; src = fetchurl { - url = http://s3.amazonaws.com/ec2-downloads/ec2-api-tools.zip; - sha256 = "0p0rk3bhk35b3dxdy8wjnbbj5zh1va63yfvdk5jxnzdzplds8v65"; + url = "http://nixos.org/tarballs/${name}.zip"; + sha256 = "1j9isvi6g68zhk7zxs29yad2d0rpnbqx8fz25yn5paqx9c8pzqcl"; }; buildInputs = [ unzip makeWrapper ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1b9d8156272..eee8d221dc6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21,10 +21,12 @@ # null, the default standard environment is used. bootStdenv ? null -, # Darwin is an "impure" platform, with its libc outside of the store. - # Thus, GCC, GFortran, & co. must always look for files in standard system - # directories (/usr/include, etc.) - noSysDirs ? (system != "x86_64-darwin" && system != "i686-darwin") +, # Non-GNU/Linux OSes are currently "impure" platforms, with their libc + # outside of the store. Thus, GCC, GFortran, & co. must always look for + # files in standard system directories (/usr/include, etc.) + noSysDirs ? (system != "x86_64-darwin" && system != "i686-darwin" + && system != "x86_64-freebsd" && system != "i686-freebsd" + && system != "x86_64-kfreebsd-gnu") # More flags for the bootstrapping of stdenv. , gccWithCC ? true @@ -131,7 +133,7 @@ let # `__overrides' is a magic attribute that causes the attributes in # its value to be added to the surrounding `rec'. We'll remove this # eventually. - inherit __overrides; + inherit __overrides pkgs; # We use `callPackage' to be able to omit function arguments that @@ -383,9 +385,9 @@ let }; }; - ec2apitools = callPackage ../tools/virtualization/amazon-ec2-api-tools { }; + ec2_api_tools = callPackage ../tools/virtualization/ec2-api-tools { }; - ec2amitools = callPackage ../tools/virtualization/amazon-ec2-ami-tools { }; + ec2_ami_tools = callPackage ../tools/virtualization/ec2-ami-tools { }; altermime = callPackage ../tools/networking/altermime {}; @@ -419,6 +421,8 @@ let qt4Support = getConfig [ "avahi" "qt4Support" ] false; }; + aws = callPackage ../tools/virtualization/aws { }; + aws_mturk_clt = callPackage ../tools/misc/aws-mturk-clt { }; axel = callPackage ../tools/networking/axel { }; @@ -435,18 +439,20 @@ let bfr = callPackage ../tools/misc/bfr { }; + boomerang = callPackage ../development/tools/boomerang { }; + bootchart = callPackage ../tools/system/bootchart { }; bsod = callPackage ../misc/emulators/bsod { }; - btrfsProgs = builderDefsPackage (import ../tools/filesystems/btrfsprogs) { - inherit (pkgs) libuuid zlib acl attr fetchgit e2fsprogs; - }; + btrfsProgs = callPackage ../tools/filesystems/btrfsprogs { }; catdoc = callPackage ../tools/text/catdoc { }; eggdrop = callPackage ../tools/networking/eggdrop { }; + enca = callPackage ../tools/text/enca { }; + mcrl = callPackage ../tools/misc/mcrl { }; mcrl2 = callPackage ../tools/misc/mcrl2 { }; @@ -487,7 +493,12 @@ let btar = callPackage ../tools/backup/btar { }; - bup = callPackage ../tools/backup/bup { }; + bup = callPackage ../tools/backup/bup { + inherit (pythonPackages) pyxattr pylibacl setuptools fuse; + inherit (haskellPackages) pandoc; + }; + + atool = callPackage ../tools/archivers/atool { }; bzip2 = callPackage ../tools/compression/bzip2 { }; @@ -517,6 +528,8 @@ let cksfv = callPackage ../tools/networking/cksfv { }; + ciopfs = callPackage ../tools/filesystems/ciopfs { }; + colordiff = callPackage ../tools/text/colordiff { }; convertlit = callPackage ../tools/text/convertlit { }; @@ -527,6 +540,8 @@ let usb_modeswitch = callPackage ../development/tools/misc/usb-modeswitch { }; + clamav = callPackage ../tools/security/clamav { }; + cloog = callPackage ../development/libraries/cloog { }; cloogppl = callPackage ../development/libraries/cloog-ppl { }; @@ -654,7 +669,9 @@ let efibootmgr = callPackage ../tools/system/efibootmgr { }; - enblendenfuse = callPackage ../tools/graphics/enblend-enfuse { }; + enblendenfuse = callPackage ../tools/graphics/enblend-enfuse { + boost = boost149; + }; encfs = callPackage ../tools/filesystems/encfs { }; @@ -711,6 +728,8 @@ let fortune = callPackage ../tools/misc/fortune { }; + fprot = callPackage ../tools/security/fprot { }; + freeipmi = callPackage ../tools/system/freeipmi {}; freetalk = callPackage ../applications/networking/instant-messengers/freetalk { @@ -821,11 +840,9 @@ let buggyBiosCDSupport = getConfig ["grub" "buggyBiosCDSupport"] true; }; - grub19x = callPackage ../tools/misc/grub/1.9x.nix { }; + grub2 = callPackage ../tools/misc/grub/2.0x.nix { }; - grub2 = grub19x; - - grub2_efi = callPackage ../tools/misc/grub/1.9x.nix { EFIsupport = true; }; + grub2_efi = grub2.override { EFIsupport = true; }; gssdp = callPackage ../development/libraries/gssdp { inherit (gnome) libsoup; @@ -952,10 +969,16 @@ let less = callPackage ../tools/misc/less { }; + lockfileProgs = callPackage ../tools/misc/lockfile-progs { }; + + logstash = callPackage ../tools/misc/logstash { }; + klavaro = callPackage ../games/klavaro {}; minidlna = callPackage ../tools/networking/minidlna { }; + mmv = callPackage ../tools/misc/mmv { }; + most = callPackage ../tools/misc/most { }; netperf = callPackage ../applications/networking/netperf { }; @@ -964,6 +987,10 @@ let nodejs = callPackage ../development/web/nodejs {}; + nodePackages = recurseIntoAttrs (import ./node-packages.nix { + inherit pkgs stdenv nodejs fetchurl; + }); + ldns = callPackage ../development/libraries/ldns { }; lftp = callPackage ../tools/networking/lftp { }; @@ -974,6 +1001,10 @@ let libtorrent = callPackage ../tools/networking/p2p/libtorrent { }; + logcheck = callPackage ../tools/system/logcheck { + inherit (perlPackages) mimeConstruct; + }; + logrotate = callPackage ../tools/system/logrotate { }; logstalgica = callPackage ../tools/graphics/logstalgica {}; @@ -1053,6 +1084,8 @@ let mpage = callPackage ../tools/text/mpage { }; + mr = callPackage ../applications/version-management/mr { }; + mscgen = callPackage ../tools/graphics/mscgen { }; msf = builderDefsPackage (import ../tools/security/metasploit/3.1.nix) { @@ -1111,6 +1144,8 @@ let netpbm = callPackage ../tools/graphics/netpbm { }; + netrw = callPackage ../tools/networking/netrw { }; + netselect = callPackage ../tools/networking/netselect { }; networkmanager = callPackage ../tools/networking/network-manager { }; @@ -1193,6 +1228,8 @@ let optipng = callPackage ../tools/graphics/optipng { }; + ossec = callPackage ../tools/security/ossec {}; + p7zip = callPackage ../tools/archivers/p7zip { }; pal = callPackage ../tools/misc/pal { }; @@ -1269,6 +1306,8 @@ let plotutils = callPackage ../tools/graphics/plotutils { }; + plowshare = callPackage ../tools/misc/plowshare { }; + pngcrush = callPackage ../tools/graphics/pngcrush { }; pngnq = callPackage ../tools/graphics/pngnq { }; @@ -1385,7 +1424,9 @@ let s3cmd = callPackage ../tools/networking/s3cmd { }; - s3sync = callPackage ../tools/networking/s3sync { }; + s3sync = callPackage ../tools/networking/s3sync { + ruby = ruby18; + }; sablotron = callPackage ../tools/text/xml/sablotron { }; @@ -1459,6 +1500,8 @@ let su = shadow; + surfraw = callPackage ../tools/networking/surfraw { }; + swec = callPackage ../tools/networking/swec { inherit (perlPackages) LWP URI HTMLParser HTTPServerSimple Parent; }; @@ -1497,6 +1540,8 @@ let torsocks = callPackage ../tools/security/tor/torsocks.nix { }; + trickle = callPackage ../tools/networking/trickle {}; + ttf2pt1 = callPackage ../tools/misc/ttf2pt1 { }; ttf2pt1_cl_pdf = callPackage ../tools/misc/ttf2pt1 { }; @@ -1530,7 +1575,9 @@ let vifm = callPackage ../applications/misc/vifm {}; - viking = callPackage ../applications/misc/viking { }; + viking = callPackage ../applications/misc/viking { + inherit (gnome) scrollkeeper; + }; vncrec = builderDefsPackage ../tools/video/vncrec { inherit (xlibs) imake libX11 xproto gccmakedep libXt @@ -1706,6 +1753,8 @@ let xtreemfs = callPackage ../tools/filesystems/xtreemfs {}; + xvfb_run = callPackage ../tools/misc/xvfb-run { inherit (texFunctions) fontsConf; }; + youtubeDL = callPackage ../tools/misc/youtube-dl { }; zbar = callPackage ../tools/graphics/zbar {}; @@ -1772,6 +1821,8 @@ let cmucl_binary = callPackage ../development/compilers/cmucl/binary.nix { }; + cython = callPackage ../development/interpreters/cython { }; + dylan = callPackage ../development/compilers/gwydion-dylan { dylan = callPackage ../development/compilers/gwydion-dylan/binary.nix { }; }; @@ -1855,6 +1906,8 @@ let gcc46 = gcc46_real; + gcc47 = gcc47_real; + gcc45_realCross = lib.addMetaAttrs { platforms = []; } (makeOverridable (import ../development/compilers/gcc/4.5) { inherit fetchurl stdenv texinfo gmp mpfr mpc libelf zlib @@ -1991,20 +2044,31 @@ let binutilsCross = null; })); - gcc47 = lowPrio (wrapGCC (lib.overrideDerivation gcc46_debug.gcc (a: { - name = "gcc-debug-4.7.1"; - src = fetchurl { - url = "mirror://gnu/gcc/gcc-4.7.1/gcc-4.7.1.tar.bz2"; - sha256 = "0vs0v89zzgkngkw2p8kdynyk7j8ky4wf6zyrg3rsschpl1pky28n"; - }; + gcc47_real = lowPrio (wrapGCC (callPackage ../development/compilers/gcc/4.7 { + inherit noSysDirs; + # I'm not sure if profiling with enableParallelBuilding helps a lot. + # We can enable it back some day. This makes the *gcc* builds faster now. + profiledCompiler = false; - configureFlags = a.configureFlags - # This flag replaces `no-sys-dirs.patch'. - + (lib.optionalString (stdenv ? glibc) - " --with-native-system-header-dir=${stdenv.glibc}/include"); + # When building `gcc.hostDrv' (a "Canadian cross", with host == target + # and host != build), `cross' must be null but the cross-libc must still + # be passed. + cross = null; + libcCross = if crossSystem != null then libcCross else null; + libpthreadCross = + if crossSystem != null && crossSystem.config == "i586-pc-gnu" + then gnu.libpthreadCross + else null; + })); - patches = []; - }))); + gcc47_debug = lowPrio (wrapGCC (callPackage ../development/compilers/gcc/4.7 { + stripped = false; + + inherit noSysDirs; + cross = null; + libcCross = null; + binutilsCross = null; + })); gccApple = wrapGCC (makeOverridable @@ -2169,11 +2233,12 @@ let inherit fetchurl stdenv; }); - gccgo = gccgo46; + # gccgo46 does not work. I set 4.7 then. + gccgo = gccgo47; - gccgo46 = wrapGCC (gcc46_real.gcc.override { + gccgo47 = wrapGCC (gcc47_real.gcc.override { name = "gccgo"; - langCC = true; #required for go + langCC = true; #required for go. langC = true; langGo = true; }); @@ -2252,8 +2317,8 @@ let haskellPackages_ghc741_no_profiling = recurseIntoAttrs (haskell.packages_ghc741.noProfiling); haskellPackages_ghc741_profiling = recurseIntoAttrs (haskell.packages_ghc741.profiling); haskellPackages_ghc741 = recurseIntoAttrs (haskell.packages_ghc741.highPrio); - # Stable branch snapshot. haskellPackages_ghc742 = recurseIntoAttrs (haskell.packages_ghc742); + haskellPackages_ghc761 = recurseIntoAttrs (haskell.packages_ghc761); # Reasonably current HEAD snapshot. haskellPackages_ghcHEAD = haskell.packages_ghcHEAD; @@ -2286,37 +2351,38 @@ let path64 = callPackage ../development/compilers/path64 { }; + openjdkBootstrap = callPackage ../development/compilers/openjdk/bootstrap.nix {}; + openjdk = if stdenv.isDarwin then callPackage ../development/compilers/openjdk-darwin { } else - callPackage ../development/compilers/openjdk { }; + callPackage ../development/compilers/openjdk { + jdk = pkgs.openjdkBootstrap; + ant = pkgs.ant.override { jdk = pkgs.openjdkBootstrap; }; + }; openjre = callPackage ../development/compilers/openjdk { jreOnly = true; }; - j2sdk14x = ( - assert system == "i686-linux"; - import ../development/compilers/jdk/default-1.4.nix { - inherit fetchurl stdenv; - }); + jdk = if (stdenv.isDarwin || stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") + then openjdk + else jdkdistro true false; + jre = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") + then openjre + else jdkdistro false false; - jdk5 = ( - assert system == "i686-linux" || system == "x86_64-linux"; - callPackage ../development/compilers/jdk/default-5.nix { }); + oraclejdk = jdkdistro true false; - jdk = if stdenv.isDarwin then openjdk else jdkdistro true false; - jre = jdkdistro false false; + oraclejre = jdkdistro false false; - jdkPlugin = lowPrio (jdkdistro true true); jrePlugin = lowPrio (jdkdistro false true); supportsJDK = system == "i686-linux" || system == "x86_64-linux" || - system == "i686-cygwin" || - system == "powerpc-linux"; + system == "i686-cygwin"; jdkdistro = installjdk: pluginSupport: (assert supportsJDK; @@ -2326,7 +2392,13 @@ let jikes = callPackage ../development/compilers/jikes { }; - julia = callPackage ../development/compilers/julia { }; + julia = callPackage ../development/compilers/julia { + llvm = llvm_3_1; + pcre = pcre_8_30; + liblapack = liblapack.override {shared = true;}; + fftw = fftw.override {pthreads = true;}; + fftwSinglePrec = fftwSinglePrec.override {pthreads = true;}; + }; lazarus = builderDefsPackage (import ../development/compilers/fpc/lazarus.nix) { inherit makeWrapper gtk glib pango atk gdk_pixbuf; @@ -2363,6 +2435,8 @@ let ocaml_3_12_1 = callPackage ../development/compilers/ocaml/3.12.1.nix { }; + ocaml_4_00_0 = callPackage ../development/compilers/ocaml/4.00.0.nix { }; + metaocaml_3_09 = callPackage ../development/compilers/ocaml/metaocaml-3.09.nix { }; ber_metaocaml_003 = callPackage ../development/compilers/ocaml/ber-metaocaml-003.nix { }; @@ -2458,6 +2532,7 @@ let ocamlPackages_3_10_0 = mkOcamlPackages ocaml_3_10_0 pkgs.ocamlPackages_3_10_0; ocamlPackages_3_11_2 = mkOcamlPackages ocaml_3_11_2 pkgs.ocamlPackages_3_11_2; ocamlPackages_3_12_1 = mkOcamlPackages ocaml_3_12_1 pkgs.ocamlPackages_3_12_1; + ocamlPackages_4_00_0 = mkOcamlPackages ocaml_4_00_0 pkgs.ocamlPackages_4_00_0; ocaml_make = callPackage ../development/ocaml-modules/ocamlmake { }; @@ -2505,6 +2580,8 @@ let swiProlog = callPackage ../development/compilers/swi-prolog { }; + tbb = callPackage ../development/libraries/tbb { }; + tinycc = callPackage ../development/compilers/tinycc { }; urweb = callPackage ../development/compilers/urweb { }; @@ -2617,6 +2694,8 @@ let guile = guile_2_0; + hadoop = callPackage ../applications/networking/cluster/hadoop { }; + io = callPackage ../development/interpreters/io { }; j = callPackage ../development/interpreters/j {}; @@ -2814,8 +2893,6 @@ let apacheAntOpenJDK = apacheAnt.override { jdk = openjdk; }; - apacheAnt14 = apacheAnt.override { jdk = j2sdk14x; }; - apacheAntGcj = callPackage ../development/tools/build-managers/apache-ant/from-source.nix { # must be either pre-built or built with GCJ *alone* gcj = gcj.gcc; # use the raw GCJ, which has ${gcj}/lib/jvm @@ -2829,16 +2906,12 @@ let autoconf213 = callPackage ../development/tools/misc/autoconf/2.13.nix { }; - automake = automake111x; - - automake17x = callPackage ../development/tools/misc/automake/automake-1.7.x.nix { }; - - automake19x = callPackage ../development/tools/misc/automake/automake-1.9.x.nix { }; + automake = automake112x; automake110x = callPackage ../development/tools/misc/automake/automake-1.10.x.nix { }; automake111x = callPackage ../development/tools/misc/automake/automake-1.11.x.nix { - doCheck = !stdenv.isArm && !stdenv.isCygwin + doCheck = !stdenv.isArm && !stdenv.isCygwin && !stdenv.isMips # Some of the parallel tests seem to hang on `i386-pc-solaris2.11'. && stdenv.system != "i686-solaris" @@ -2846,6 +2919,12 @@ let && !stdenv.isFreeBSD; }; + automake112x = callPackage ../development/tools/misc/automake/automake-1.12.x.nix { + doCheck = !stdenv.isArm && !stdenv.isCygwin && !stdenv.isMips + # Some of the parallel tests seem to hang on `i386-pc-solaris2.11'. + && stdenv.system != "i686-solaris"; + }; + automoc4 = callPackage ../development/tools/misc/automoc4 { }; avrdude = callPackage ../development/tools/misc/avrdude { }; @@ -2880,6 +2959,8 @@ let bison26 = callPackage ../development/tools/parsing/bison/bison-2.6.nix { }; + bison26 = callPackage ../development/tools/parsing/bison/bison-2.6.nix { }; + buildbot = callPackage ../development/tools/build-managers/buildbot { inherit (pythonPackages) twisted; }; @@ -2928,6 +3009,8 @@ let coccinelle = callPackage ../development/tools/misc/coccinelle { }; + framac = callPackage ../development/tools/misc/frama-c { }; + cppi = callPackage ../development/tools/misc/cppi { }; cproto = callPackage ../development/tools/misc/cproto { }; @@ -3067,6 +3150,8 @@ let patchelf = callPackage ../development/tools/misc/patchelf { }; + patchelfUnstable = callPackage ../development/tools/misc/patchelf/unstable.nix { }; + peg = callPackage ../development/tools/parsing/peg { }; pmccabe = callPackage ../development/tools/misc/pmccabe { }; @@ -3082,6 +3167,8 @@ let premake = callPackage ../development/tools/misc/premake { }; + pstack = callPackage ../development/tools/misc/gdb/pstack.nix { }; + radare = callPackage ../development/tools/analysis/radare { inherit (gnome) vte; lua = lua5; @@ -3213,6 +3300,8 @@ let axis = callPackage ../development/libraries/axis { }; + babl_0_0_22 = callPackage ../development/libraries/babl/0_0_22.nix { }; + babl = callPackage ../development/libraries/babl { }; beecrypt = callPackage ../development/libraries/beecrypt { }; @@ -3226,19 +3315,13 @@ let boost147 = callPackage ../development/libraries/boost/1.47.nix { }; boost149 = callPackage ../development/libraries/boost/1.49.nix { }; boost150 = callPackage ../development/libraries/boost/1.50.nix { }; - boost = boost150; + boost151 = callPackage ../development/libraries/boost/1.51.nix { }; + boost = boost151; boostHeaders149 = callPackage ../development/libraries/boost/1.49-headers.nix { }; boostHeaders150 = callPackage ../development/libraries/boost/1.50-headers.nix { }; boostHeaders = boostHeaders150; - # A Boost build with all library variants enabled. Very large (about 250 MB). - boostFull = appendToName "full" (boost.override { - enableDebug = true; - enableSingleThreaded = true; - enableStatic = true; - }); - botan = callPackage ../development/libraries/botan { }; box2d = callPackage ../development/libraries/box2d { }; @@ -3259,6 +3342,7 @@ let celt = callPackage ../development/libraries/celt {}; celt_0_7 = callPackage ../development/libraries/celt/0.7.nix {}; + celt_0_5_1 = callPackage ../development/libraries/celt/0.5.1.nix {}; cgal = callPackage ../development/libraries/CGAL {}; @@ -3295,6 +3379,8 @@ let clppcre = builderDefsPackage (import ../development/libraries/cl-ppcre) { }; + clucene_core_2 = callPackage ../development/libraries/clucene-core/2.x.nix { }; + clucene_core = callPackage ../development/libraries/clucene-core { }; cluceneCore = clucene_core; # !!! remove this @@ -3323,7 +3409,7 @@ let cppunit = callPackage ../development/libraries/cppunit { }; cppnetlib = callPackage ../development/libraries/cppnetlib { - boost = boostFull; + boost = boostHeaders; }; cracklib = callPackage ../development/libraries/cracklib { }; @@ -3370,6 +3456,8 @@ let dragonegg = callPackage ../development/compilers/llvm/dragonegg.nix { }; + dxflib = callPackage ../development/libraries/dxflib {}; + eigen = callPackage ../development/libraries/eigen {}; enchant = callPackage ../development/libraries/enchant { }; @@ -3473,6 +3561,9 @@ let # avocodec avformat librsvg }; + gegl_0_0_22 = callPackage ../development/libraries/gegl/0_0_22.nix { + # avocodec avformat librsvg + }; geoclue = callPackage ../development/libraries/geoclue {}; geoip = builderDefsPackage ../development/libraries/geoip { @@ -3912,6 +4003,8 @@ let libcdio = callPackage ../development/libraries/libcdio { }; + libcdr = callPackage ../development/libraries/libcdr { }; + libchamplain = callPackage ../development/libraries/libchamplain { inherit (gnome) libsoup; }; @@ -3951,6 +4044,8 @@ let libdiscid = callPackage ../development/libraries/libdiscid { }; + libdivsufsort = callPackage ../development/libraries/libdivsufsort { }; + libdmtx = callPackage ../development/libraries/libdmtx { }; libdnet = callPackage ../development/libraries/libdnet { }; @@ -4013,6 +4108,8 @@ let libmpeg2 = mpeg2dec; }; + libexttextcat = callPackage ../development/libraries/libexttextcat {}; + libf2c = callPackage ../development/libraries/libf2c {}; libfixposix = callPackage ../development/libraries/libfixposix {}; @@ -4055,6 +4152,8 @@ let liblqr1 = callPackage ../development/libraries/liblqr-1 { }; + liblockfile = callPackage ../development/libraries/liblockfile { }; + libmhash = callPackage ../development/libraries/libmhash {}; libmtp = callPackage ../development/libraries/libmtp { }; @@ -4079,9 +4178,12 @@ let libiconv = callPackage ../development/libraries/libiconv { }; - libiconvOrEmpty = if (libiconvOrNull == null) then [] else libiconv; + libiconvOrEmpty = if (libiconvOrNull == null) then [] else [libiconv]; - libiconvOrNull = if gcc ? libc then null else libiconv; + libiconvOrNull = + if ((gcc ? libc && (gcc.libc != null)) || stdenv.isGlibc) + then null + else libiconv; libiconvOrLibc = if (libiconvOrNull == null) then gcc.libc else libiconv; @@ -4250,6 +4352,8 @@ let libvirt = callPackage ../development/libraries/libvirt { }; + libvisio = callPackage ../development/libraries/libvisio { }; + libvncserver = builderDefsPackage (import ../development/libraries/libvncserver) { inherit libtool libjpeg openssl zlib; inherit (xlibs) xproto libX11 damageproto libXdamage @@ -4336,6 +4440,8 @@ let lzo = callPackage ../development/libraries/lzo { }; + mdds = callPackage ../development/libraries/mdds { }; + # failed to build mediastreamer = callPackage ../development/libraries/mediastreamer { }; @@ -4392,6 +4498,8 @@ let mysocketw = callPackage ../development/libraries/mysocketw { }; + mythes = callPackage ../development/libraries/mythes { }; + ncurses = makeOverridable (import ../development/libraries/ncurses) { inherit fetchurl; unicode = system != "i686-cygwin"; @@ -4454,6 +4562,7 @@ let openbabel = callPackage ../development/libraries/openbabel { }; opencascade = callPackage ../development/libraries/opencascade { + automake = automake111x; ftgl = ftgl212; }; @@ -4510,6 +4619,11 @@ let cplusplusSupport = !stdenv ? isDietLibC; }; + pcre_8_30 = callPackage ../development/libraries/pcre/8.30.nix { + unicodeSupport = getConfig ["pcre" "unicode"] true; + cplusplusSupport = !stdenv ? isDietLibC; + }; + pdf2xml = callPackage ../development/libraries/pdf2xml {} ; phonon = callPackage ../development/libraries/phonon { }; @@ -4567,6 +4681,8 @@ let qjson = callPackage ../development/libraries/qjson { }; + qoauth = callPackage ../development/libraries/qoauth { }; + qt3 = callPackage ../development/libraries/qt-3 { openglSupport = mesaSupported; }; @@ -4622,6 +4738,10 @@ let librdf = callPackage ../development/libraries/librdf { }; + lilv = callPackage ../development/libraries/audio/lilv { }; + + lv2 = callPackage ../development/libraries/audio/lv2 { }; + qrupdate = callPackage ../development/libraries/qrupdate { }; redland = pkgs.librdf_redland; @@ -4639,6 +4759,8 @@ let inherit (vamp) vampSDK; }; + sbc = callPackage ../development/libraries/sbc { }; + schroedinger = callPackage ../development/libraries/schroedinger { }; SDL = callPackage ../development/libraries/SDL { @@ -4660,6 +4782,10 @@ let SDL_ttf = callPackage ../development/libraries/SDL_ttf { }; + serd = callPackage ../development/libraries/serd {}; + + silgraphite = callPackage ../development/libraries/silgraphite {}; + simgear = callPackage ../development/libraries/simgear {}; sfml_git = callPackage ../development/libraries/sfml { }; @@ -4682,6 +4808,8 @@ let soqt = callPackage ../development/libraries/soqt { }; + sord = callPackage ../development/libraries/sord {}; + speechd = callPackage ../development/libraries/speechd { }; speech_tools = callPackage ../development/libraries/speech-tools {}; @@ -4690,6 +4818,15 @@ let sphinxbase = callPackage ../development/libraries/sphinxbase { }; + spice = callPackage ../development/libraries/spice { + celt = celt_0_5_1; + inherit (xlibs) libXrandr libXfixes libXext libXrender libXinerama; + }; + + spiceProtocol = callPackage ../development/libraries/spice-protocol { }; + + sratom = callPackage ../development/libraries/audio/sratom { }; + srtp = callPackage ../development/libraries/srtp {}; sqlite = lowPrio (callPackage ../development/libraries/sqlite { @@ -4714,6 +4851,8 @@ let strigi = callPackage ../development/libraries/strigi {}; + suil = callPackage ../development/libraries/audio/suil { }; + suitesparse = callPackage ../development/libraries/suitesparse { }; sword = callPackage ../development/libraries/sword { }; @@ -4730,6 +4869,8 @@ let tclap = callPackage ../development/libraries/tclap {}; + tclgpg = callPackage ../development/libraries/tclgpg { }; + tcllib = callPackage ../development/libraries/tcllib { }; tcltls = callPackage ../development/libraries/tcltls { }; @@ -4939,9 +5080,7 @@ let javasvn = callPackage ../development/libraries/java/javasvn { }; - jclasslib = callPackage ../development/tools/java/jclasslib { - ant = apacheAnt14; - }; + jclasslib = callPackage ../development/tools/java/jclasslib { }; jdom = callPackage ../development/libraries/java/jdom { }; @@ -4971,7 +5110,7 @@ let inherit (gnome) libsoup; }; - v8 = callPackage ../development/libraries/v8 { }; + v8 = callPackage ../development/libraries/v8 { inherit (pythonPackages) gyp; }; xalanj = xalanJava; xalanJava = callPackage ../development/libraries/java/xalanj { @@ -4987,7 +5126,6 @@ let jquery_ui = callPackage ../development/libraries/javascript/jquery-ui { }; - ### DEVELOPMENT / PERL MODULES buildPerlPackage = import ../development/perl-modules/generic perl; @@ -5098,16 +5236,26 @@ let rdf4store = callPackage ../servers/http/4store { }; - apacheHttpd = callPackage ../servers/http/apache-httpd { + apacheHttpd = pkgs.apacheHttpd_2_2; + + apacheHttpd_2_2 = callPackage ../servers/http/apache-httpd/2.2.nix { sslSupport = true; }; + apacheHttpd_2_4 = lowPrio (callPackage ../servers/http/apache-httpd/2.4.nix { + sslSupport = true; + }); + sabnzbd = callPackage ../servers/sabnzbd { }; bind = callPackage ../servers/dns/bind { inherit openssl libtool perl; }; + couchdb = callPackage ../servers/http/couchdb { + spidermonkey = spidermonkey_185; + }; + dico = callPackage ../servers/dico { }; dict = callPackage ../servers/dict { }; @@ -5127,9 +5275,7 @@ let ejabberd = callPackage ../servers/xmpp/ejabberd { }; - couchdb = callPackage ../servers/http/couchdb { - spidermonkey = spidermonkey_185; - }; + elasticmq = callPackage ../servers/elasticmq { }; felix = callPackage ../servers/felix { }; @@ -5144,7 +5290,7 @@ let freeswitch = callPackage ../servers/sip/freeswitch { }; ghostOne = callPackage ../servers/games/ghost-one { - boost = boostFull; + boost = boost144.override { taggedLayout = true; }; }; ircdHybrid = callPackage ../servers/irc/ircd-hybrid { }; @@ -5167,6 +5313,8 @@ let memcached = callPackage ../servers/memcached {}; + mod_evasive = callPackage ../servers/http/apache-modules/mod_evasive { }; + mod_python = callPackage ../servers/http/apache-modules/mod_python { }; mod_fastcgi = callPackage ../servers/http/apache-modules/mod_fastcgi { }; @@ -5201,10 +5349,9 @@ let rpcbind = callPackage ../servers/rpcbind { }; - monetdb = callPackage ../servers/sql/monetdb { }; + #monetdb = callPackage ../servers/sql/monetdb { }; mongodb = callPackage ../servers/nosql/mongodb { - boost = boost147; useV8 = (getConfig ["mongodb" "useV8"] false); }; @@ -5271,6 +5418,11 @@ let redstore = callPackage ../servers/http/redstore { }; + spamassassin = callPackage ../servers/mail/spamassassin { + inherit (perlPackages) HTMLParser NetDNS NetAddrIP DBFile + HTTPDate MailDKIM; + }; + samba = callPackage ../servers/samba { }; # A lightweight Samba, useful for non-Linux-based OSes. @@ -5363,6 +5515,12 @@ let inherit (perlPackages) LocaleGettext TermReadKey RpcXML; }; + atop = callPackage ../os-specific/linux/atop { }; + + b43Firmware_5_1_138 = callPackage ../os-specific/linux/firmware/b43-firmware/5.1.138.nix { }; + + b43FirmwareCutter = callPackage ../os-specific/linux/firmware/b43-firmware-cutter { }; + bcm43xx = callPackage ../os-specific/linux/firmware/bcm43xx { }; bluez = callPackage ../os-specific/linux/bluez { }; @@ -5403,12 +5561,12 @@ let inherit (xlibs) xproto; }; - dmraid = builderDefsPackage ../os-specific/linux/dmraid { - inherit devicemapper; - }; + dmraid = callPackage ../os-specific/linux/dmraid { }; drbd = callPackage ../os-specific/linux/drbd { }; + dstat = callPackage ../os-specific/linux/dstat { }; + libuuid = if crossSystem != null && crossSystem.config == "i586-pc-gnu" then (utillinux // { @@ -5487,8 +5645,12 @@ let ipw2200fw = callPackage ../os-specific/linux/firmware/ipw2200 { }; + iw = callPackage ../os-specific/linux/iw { }; + iwlwifi1000ucode = callPackage ../os-specific/linux/firmware/iwlwifi-1000-ucode { }; + iwlwifi2030ucode = callPackage ../os-specific/linux/firmware/iwlwifi-2030-ucode { }; + iwlwifi3945ucode = callPackage ../os-specific/linux/firmware/iwlwifi-3945-ucode { }; iwlwifi4965ucodeV1 = callPackage ../os-specific/linux/firmware/iwlwifi-4965-ucode { }; @@ -5521,10 +5683,6 @@ let libnl = callPackage ../os-specific/linux/libnl { }; - libnl2 = callPackage ../os-specific/linux/libnl/v2.nix { }; - - libnl1 = callPackage ../os-specific/linux/libnl/v1.nix { }; - linuxHeaders = callPackage ../os-specific/linux/kernel-headers { }; linuxHeaders33 = callPackage ../os-specific/linux/kernel-headers/3.3.5.nix { }; @@ -5634,6 +5792,12 @@ let ]; }; + linux_3_2_xen = linux_3_2.override { + extraConfig = '' + XEN_DOM0 y + ''; + }; + linux_3_3 = makeOverridable (import ../os-specific/linux/kernel/linux-3.3.nix) { inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; kernelPatches = @@ -5655,6 +5819,19 @@ let ]; }; + linux_3_5 = makeOverridable (import ../os-specific/linux/kernel/linux-3.5.nix) { + inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; + kernelPatches = + [ + kernelPatches.sec_perm_2_6_24 + kernelPatches.aufs3_5 + kernelPatches.perf3_5 + ] ++ lib.optionals (platform.kernelArch == "mips") + [ kernelPatches.mips_fpureg_emu + kernelPatches.mips_fpu_sigill + ]; + }; + /* Linux kernel modules are inherently tied to a specific kernel. So rather than provide specific instances of those packages for a specific kernel, we have a function that builds those packages @@ -5730,8 +5907,10 @@ let linuxHeaders = glibc.kernelHeaders; }; - splashutils = - if kernel.features ? fbConDecor then pkgs.splashutils else null; + splashutils = let hasFbConDecor = if kernel ? features + then kernel.features ? fbConDecor + else kernel.config.isEnabled "FB_CON_DECOR"; + in if hasFbConDecor then pkgs.splashutils else null; /* compiles but has to be integrated into the kernel somehow Let's have it uncommented and finish it.. @@ -5772,13 +5951,20 @@ let linuxPackages_3_0 = recurseIntoAttrs (linuxPackagesFor linux_3_0 pkgs.linuxPackages_3_0); linuxPackages_3_1 = recurseIntoAttrs (linuxPackagesFor linux_3_1 pkgs.linuxPackages_3_1); linuxPackages_3_2 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_2 pkgs.linuxPackages_3_2); + linuxPackages_3_2_xen = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_2_xen pkgs.linuxPackages_3_2_xen); linuxPackages_3_3 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_3 pkgs.linuxPackages_3_3); linuxPackages_3_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_4 pkgs.linuxPackages_3_4); + linuxPackages_3_5 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_5 pkgs.linuxPackages_3_5); # The current default kernel / kernel modules. linux = linuxPackages.kernel; linuxPackages = linuxPackages_3_2; + # A function to build a manually-configured kernel + linuxManualConfig = import ../os-specific/linux/kernel/manual-config.nix { + inherit (pkgs) stdenv runCommand nettools perl kmod writeTextFile; + }; + keyutils = callPackage ../os-specific/linux/keyutils { }; libselinux = callPackage ../os-specific/linux/libselinux { }; @@ -5927,8 +6113,6 @@ let rt2870fw = callPackage ../os-specific/linux/firmware/rt2870 { }; - rt73fw = callPackage ../os-specific/linux/firmware/rt73 { }; - rtkit = callPackage ../os-specific/linux/rtkit { }; rtl8192cfw = callPackage ../os-specific/linux/firmware/rtl8192c { }; @@ -5989,7 +6173,7 @@ let uclibc = callPackage ../os-specific/linux/uclibc { }; - uclibcCross = import ../os-specific/linux/uclibc { + uclibcCross = callPackage ../os-specific/linux/uclibc { inherit fetchurl stdenv libiconv; linuxHeaders = linuxHeadersCross; gccCross = gccCrossStageStatic; @@ -6103,6 +6287,10 @@ let xf86_input_wacom = callPackage ../os-specific/linux/xf86-input-wacom { }; + xf86_video_nested = callPackage ../os-specific/linux/xf86-video-nested { + inherit (xorg) fontsproto renderproto utilmacros xorgserver; + }; + xf86_video_nouveau = callPackage ../os-specific/linux/xf86-video-nouveau { inherit (xorg) xorgserver xproto fontsproto xf86driproto renderproto videoproto utilmacros; @@ -6192,6 +6380,8 @@ let inherit fontforge; }; + lmmath = callPackage ../data/fonts/lmodern/lmmath.nix {}; + lmodern = callPackage ../data/fonts/lmodern { }; manpages = callPackage ../data/documentation/man-pages { }; @@ -6234,6 +6424,8 @@ let terminus_font = callPackage ../data/fonts/terminus-font { }; + tipa = callPackage ../data/fonts/tipa { }; + ttf_bitstream_vera = callPackage ../data/fonts/ttf-bitstream-vera { }; ubuntu_font_family = callPackage ../data/fonts/ubuntu-font-family { }; @@ -6343,6 +6535,10 @@ let bvi = callPackage ../applications/editors/bvi { }; + calf = callPackage ../applications/audio/calf { + inherit (gnome) libglade; + }; + calibre = callPackage ../applications/misc/calibre { }; carrier = builderDefsPackage (import ../applications/networking/instant-messengers/carrier/2.5.0.nix) { @@ -6402,7 +6598,10 @@ let compiz_plugins_extra = callPackage ../applications/window-managers/compiz/plugins-extra.nix { }; - cinepaint = callPackage ../applications/graphics/cinepaint { }; + cinepaint = callPackage ../applications/graphics/cinepaint { + fltk = fltk13; + libpng = libpng12; + }; codeville = builderDefsPackage (import ../applications/version-management/codeville/0.8.0.nix) { inherit makeWrapper; @@ -6525,12 +6724,18 @@ let emacsPackages = emacs: self: let callPackage = newScope self; in rec { inherit emacs; + autoComplete = callPackage ../applications/editors/emacs-modes/auto-complete { }; + bbdb = callPackage ../applications/editors/emacs-modes/bbdb { }; cedet = callPackage ../applications/editors/emacs-modes/cedet { }; calfw = callPackage ../applications/editors/emacs-modes/calfw { }; + coffee = callPackage ../applications/editors/emacs-modes/coffee { }; + + colorTheme = callPackage ../applications/editors/emacs-modes/color-theme { }; + cua = callPackage ../applications/editors/emacs-modes/cua { }; ecb = callPackage ../applications/editors/emacs-modes/ecb { }; @@ -6543,6 +6748,14 @@ let emms = callPackage ../applications/editors/emacs-modes/emms { }; + flymakeCursor = callPackage ../applications/editors/emacs-modes/flymake-cursor { }; + + gh = callPackage ../applications/editors/emacs-modes/gh { }; + + gist = callPackage ../applications/editors/emacs-modes/gist { }; + + jade = callPackage ../applications/editors/emacs-modes/jade { }; + jdee = callPackage ../applications/editors/emacs-modes/jdee { # Requires Emacs 23, for `avl-tree'. }; @@ -6559,6 +6772,10 @@ let htmlize = callPackage ../applications/editors/emacs-modes/htmlize { }; + logito = callPackage ../applications/editors/emacs-modes/logito { }; + + loremIpsum = callPackage ../applications/editors/emacs-modes/lorem-ipsum { }; + magit = callPackage ../applications/editors/emacs-modes/magit { }; maudeMode = callPackage ../applications/editors/emacs-modes/maude { }; @@ -6571,6 +6788,10 @@ let # we want it to have higher precedence. org = hiPrio (callPackage ../applications/editors/emacs-modes/org { }); + org2blog = callPackage ../applications/editors/emacs-modes/org2blog { }; + + pcache = callPackage ../applications/editors/emacs-modes/pcache { }; + phpMode = callPackage ../applications/editors/emacs-modes/php { }; prologMode = callPackage ../applications/editors/emacs-modes/prolog { }; @@ -6583,11 +6804,17 @@ let quack = callPackage ../applications/editors/emacs-modes/quack { }; + rectMark = callPackage ../applications/editors/emacs-modes/rect-mark { }; + remember = callPackage ../applications/editors/emacs-modes/remember { }; rudel = callPackage ../applications/editors/emacs-modes/rudel { }; scalaMode = callPackage ../applications/editors/emacs-modes/scala-mode { }; + + sunriseCommander = callPackage ../applications/editors/emacs-modes/sunrise-commander { }; + + xmlRpc = callPackage ../applications/editors/emacs-modes/xml-rpc { }; }; emacs22Packages = emacsPackages emacs22 pkgs.emacs22Packages; @@ -6598,6 +6825,8 @@ let espeak = callPackage ../applications/audio/espeak { }; + espeakedit = callPackage ../applications/audio/espeak/edit.nix { }; + esniper = callPackage ../applications/networking/esniper { }; etherape = callPackage ../applications/networking/sniffers/etherape { @@ -6688,6 +6917,13 @@ let firefox13Wrapper = lowPrio (wrapFirefox { browser = firefox13Pkgs.firefox; }); + firefox15Pkgs = callPackage ../applications/networking/browsers/firefox/15.0.nix { + inherit (gnome) libIDL; + inherit (pythonPackages) pysqlite; + }; + + firefox15Wrapper = lowPrio (wrapFirefox { browser = firefox15Pkgs.firefox; }); + flac = callPackage ../applications/audio/flac { }; flashplayer = flashplayer11; @@ -6728,7 +6964,7 @@ let get_iplayer = callPackage ../applications/misc/get_iplayer {}; - gimp = callPackage ../applications/graphics/gimp { + gimp_2_6 = callPackage ../applications/graphics/gimp { inherit (gnome) libart_lgpl; }; @@ -6736,6 +6972,8 @@ let inherit (gnome) libart_lgpl; }; + gimp = gimp_2_6; + gimpPlugins = recurseIntoAttrs (import ../applications/graphics/gimp/plugins { inherit pkgs gimp; }); @@ -6762,6 +7000,8 @@ let libquvi = callPackage ../applications/video/quvi/library.nix { }; + praat = callPackage ../applications/audio/praat { }; + quvi = callPackage ../applications/video/quvi/tool.nix { }; quvi_scripts = callPackage ../applications/video/quvi/scripts.nix { }; @@ -6908,13 +7148,13 @@ let id3v2 = callPackage ../applications/audio/id3v2 { }; + ii = callPackage ../applications/networking/irc/ii { }; + ikiwiki = callPackage ../applications/misc/ikiwiki { inherit (perlPackages) TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate TimeDate CGISession DBFile CGIFormBuilder LocaleGettext - RpcXML XMLSimple PerlMagick YAML YAMLLibYAML; - gitSupport = false; - monotoneSupport = false; - extraUtils = []; + RpcXML XMLSimple PerlMagick YAML YAMLLibYAML HTMLTree Filechdir + AuthenPassphrase NetOpenIDConsumer LWPxParanoidAgent CryptSSLeay; }; imagemagick = callPackage ../applications/graphics/ImageMagick { @@ -6944,6 +7184,8 @@ let bip = callPackage ../applications/networking/irc/bip { }; + jack_capture = callPackage ../applications/audio/jack-capture { }; + jackmeter = callPackage ../applications/audio/jackmeter { }; jedit = callPackage ../applications/editors/jedit { }; @@ -6984,6 +7226,8 @@ let fftw = fftwSinglePrec; }; + lastwatch = callPackage ../applications/audio/lastwatch { }; + lci = callPackage ../applications/science/logic/lci {}; ldcpp = callPackage ../applications/networking/p2p/ldcpp { @@ -6996,6 +7240,8 @@ let inherit (perlPackages) ArchiveZip CompressZlib; inherit (gnome) GConf ORBit2 gnome_vfs; zip = zip.override { enableNLS = false; }; + boost = boost149; + jdk = openjdk; fontsConf = makeFontsConf { fontDirectories = [ freefont_ttf xorg.fontmiscmisc xorg.fontbhttf @@ -7010,7 +7256,9 @@ let links = callPackage ../applications/networking/browsers/links { }; ledger = callPackage ../applications/office/ledger/2.6.3.nix { }; - ledger3 = callPackage ../applications/office/ledger/3.0.nix { }; + ledger3 = callPackage ../applications/office/ledger/3.0.nix { + boost = boost149; + }; links2 = callPackage ../applications/networking/browsers/links2 { }; @@ -7026,9 +7274,7 @@ let lynx = callPackage ../applications/networking/browsers/lynx { }; - lyx = callPackage ../applications/misc/lyx { - qt = qt4; - }; + lyx = callPackage ../applications/misc/lyx { }; makeself = callPackage ../applications/misc/makeself { }; @@ -7042,7 +7288,7 @@ let mcomix = callPackage ../applications/graphics/mcomix { }; mercurial = callPackage ../applications/version-management/mercurial { - inherit (pythonPackages) curses; + inherit (pythonPackages) curses docutils; guiSupport = false; # use mercurialFull to get hgk GUI }; @@ -7071,6 +7317,8 @@ let icon = "${midori}/share/icons/hicolor/22x22/apps/midori.png"; }; + mikmod = callPackage ../applications/audio/mikmod { }; + minicom = callPackage ../tools/misc/minicom { }; minidjvu = callPackage ../applications/graphics/minidjvu { }; @@ -7163,6 +7411,8 @@ let navit = callPackage ../applications/misc/navit { }; + ncdu = callPackage ../tools/misc/ncdu { }; + nedit = callPackage ../applications/editors/nedit { motif = lesstif; }; @@ -7227,6 +7477,8 @@ let pianobooster = callPackage ../applications/audio/pianobooster { }; + picard = callPackage ../applications/audio/picard { }; + pidgin = callPackage ../applications/networking/instant-messengers/pidgin { openssl = if (getConfig ["pidgin" "openssl"] true) then openssl else null; gnutls = if (getConfig ["pidgin" "gnutls"] false) then gnutls else null; @@ -7295,6 +7547,8 @@ let fltk = fltk13; }; + rapcad = callPackage ../applications/graphics/rapcad {}; + rapidsvn = callPackage ../applications/version-management/rapidsvn { }; ratpoison = callPackage ../applications/window-managers/ratpoison { }; @@ -7305,7 +7559,7 @@ let rdesktop = callPackage ../applications/networking/remote/rdesktop { }; - RealPlayer = callPackage ../applications/video/RealPlayer { + RealPlayer = callPackage_i686 ../applications/video/RealPlayer { libstdcpp5 = gcc33.gcc; }; @@ -7335,7 +7589,6 @@ let scribus = callPackage ../applications/office/scribus { inherit (gnome) libart_lgpl; - qt = qt4; }; seeks = callPackage ../tools/networking/p2p/seeks { @@ -7354,6 +7607,8 @@ let usePulseAudio = getConfig [ "pulseaudio" ] false; # disabled by default (the 100% cpu bug) }; + st = callPackage ../applications/misc/st { }; + dropbox = callPackage ../applications/networking/dropbox { }; slim = callPackage ../applications/display-managers/slim { }; @@ -7410,6 +7665,7 @@ let surf = callPackage ../applications/misc/surf { libsoup = gnome.libsoup; + webkit = webkit_gtk2; }; svk = perlPackages.SVK; @@ -7470,6 +7726,8 @@ let inherit (gnome) libIDL; }; + tig = gitAndTools.tig; + timidity = callPackage ../tools/misc/timidity { }; tkcvs = callPackage ../applications/version-management/tkcvs { }; @@ -7491,7 +7749,6 @@ let tribler = callPackage ../applications/networking/p2p/tribler { }; twinkle = callPackage ../applications/networking/instant-messengers/twinkle { - boost = boostFull; ccrtp = ccrtp_1_8; libzrtpcpp = libzrtpcpp_1_6; }; @@ -7546,7 +7803,10 @@ let }; virtviewer = callPackage ../applications/virtualization/virt-viewer {}; - virtmanager = callPackage ../applications/virtualization/virt-manager {}; + virtmanager = callPackage ../applications/virtualization/virt-manager { + inherit (gnome) gnome_python; + }; + virtinst = callPackage ../applications/virtualization/virtinst {}; virtualgl = callPackage ../tools/X11/virtualgl { }; @@ -7657,10 +7917,16 @@ let xineUI = callPackage ../applications/video/xine-ui { }; - xneur = callPackage ../applications/misc/xneur { }; + xneur_0_13 = callPackage ../applications/misc/xneur { }; xneur_0_8 = callPackage ../applications/misc/xneur/0.8.nix { }; + xneur = xneur_0_13; + + gxneur = callPackage ../applications/misc/gxneur { + inherit (gnome) libglade GConf; + }; + xournal = callPackage ../applications/graphics/xournal { inherit (gnome) libgnomeprint libgnomeprintui libgnomecanvas; }; @@ -7674,7 +7940,7 @@ let }; xpra = callPackage ../tools/X11/xpra { - pyrex = pyrex095; + inherit (pythonPackages) notify; }; xscreensaver = callPackage ../misc/screensavers/xscreensaver { @@ -7710,7 +7976,13 @@ let fltk = fltk13; }; - zathura = callPackage ../applications/misc/zathura { }; + zathuraCollection = recurseIntoAttrs + (let callPackage = newScope pkgs.zathuraCollection; in + import ../applications/misc/zathura { inherit callPackage pkgs; }); + + zathura = zathuraCollection.zathuraWrapper; + + girara = callPackage ../applications/misc/girara { }; zgrviewer = callPackage ../applications/graphics/zgrviewer {}; @@ -7926,6 +8198,7 @@ let # Torcs wants to make shared libraries linked with plib libraries (it provides static). # i686 is the only platform I know than can do that linking without plib built with -fPIC plib = plib.override { enablePIC = if stdenv.isi686 then false else true; }; + libpng = libpng12; }; torcs = callPackage ../games/torcs { @@ -7938,6 +8211,7 @@ let ufoai = callPackage ../games/ufoai { inherit (gnome) gtksourceview gtkglext; + libpng = libpng12; }; ultimatestunts = callPackage ../games/ultimatestunts { }; @@ -8242,6 +8516,7 @@ let liblapack = callPackage ../development/libraries/science/math/liblapack { }; + openblas = callPackage ../development/libraries/science/math/openblas { }; ### SCIENCE/LOGIC @@ -8250,6 +8525,11 @@ let camlp5 = ocamlPackages.camlp5_transitional; }; + coq_8_3 = callPackage ../applications/science/logic/coq/8.3.nix { + inherit (ocamlPackages) findlib lablgtk; + camlp5 = ocamlPackages.camlp5_transitional; + }; + cvc3 = callPackage ../applications/science/logic/cvc3 {}; eprover = callPackage ../applications/science/logic/eProver { @@ -8443,15 +8723,12 @@ let lazylist = callPackage ../tools/typesetting/tex/lazylist { }; - lilypond = callPackage ../misc/lilypond { - guile = guile_1_8; - }; + lilypond = callPackage ../misc/lilypond { }; martyr = callPackage ../development/libraries/martyr { }; - maven = callPackage ../misc/maven/maven-1.0.nix { }; - maven2 = callPackage ../misc/maven { }; - maven3 = callPackage ../misc/maven/3.0.nix { }; + maven = maven3; + maven3 = callPackage ../misc/maven { jdk = openjdk; }; mess = callPackage ../misc/emulators/mess { inherit (pkgs.gnome) GConf; @@ -8565,9 +8842,9 @@ let texFunctions = import ../tools/typesetting/tex/nix pkgs; texLive = builderDefsPackage (import ../tools/typesetting/tex/texlive) { - inherit builderDefs zlib bzip2 ncurses libpng ed - gd t1lib freetype icu perl expat curl - libjpeg bison python fontconfig flex; + inherit builderDefs zlib bzip2 ncurses libpng ed lesstif + gd t1lib freetype icu perl expat curl xz pkgconfig zziplib + libjpeg bison python fontconfig flex poppler silgraphite; inherit (xlibs) libXaw libX11 xproto libXt libXpm libXmu libXext xextproto libSM libICE; ghostscript = ghostscriptX; @@ -8576,7 +8853,7 @@ let texLiveFull = lib.setName "texlive-full" (texLiveAggregationFun { paths = [ texLive texLiveExtra lmodern texLiveCMSuper texLiveLatexXColor - texLivePGF texLiveBeamer texLiveModerncv ]; + texLivePGF texLiveBeamer texLiveModerncv tipa ]; }); /* Look in configurations/misc/raskin.nix for usage example (around revisions @@ -8601,7 +8878,7 @@ let }; texLiveExtra = builderDefsPackage (import ../tools/typesetting/tex/texlive/extra.nix) { - inherit texLive; + inherit texLive xz; }; texLiveCMSuper = builderDefsPackage (import ../tools/typesetting/tex/texlive/cm-super.nix) { diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index 64291854a03..f33defcb809 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -19,6 +19,7 @@ self : self.haskellPlatformArgs_future self // { haskellPlatform = null; binary = null; # now a core package + extensibleExceptions = self.extensibleExceptions_0_1_1_4; }; ghc741Prefs = @@ -27,9 +28,14 @@ binary = null; # now a core package }; - ghc722Prefs = ghc741Prefs; + ghc722Prefs = + self : self.haskellPlatformArgs_2012_2_0_0 self // { + haskellPlatform = self.haskellPlatform_2012_2_0_0; + binary = null; # a core package + deepseq = self.deepseq_1_3_0_0; + }; - ghc721Prefs = ghc741Prefs; + ghc721Prefs = ghc722Prefs; ghc704Prefs = self : self.haskellPlatformArgs_2011_4_0_0 self // { @@ -37,6 +43,7 @@ repaExamples = null; # don't pick this version of 'repa-examples' during nix-env -u cabalInstall_0_14_0 = self.cabalInstall_0_14_0.override { Cabal = self.Cabal_1_14_0; }; monadPar = self.monadPar_0_1_0_3; + jailbreakCabal = self.jailbreakCabal.override { Cabal = self.Cabal_1_14_0; }; }; ghc703Prefs = @@ -45,6 +52,7 @@ repaExamples = null; # don't pick this version of 'repa-examples' during nix-env -u cabalInstall_0_14_0 = self.cabalInstall_0_14_0.override { Cabal = self.Cabal_1_14_0; zlib = self.zlib_0_5_3_3; }; monadPar = self.monadPar_0_1_0_3; + jailbreakCabal = self.jailbreakCabal.override { Cabal = self.Cabal_1_14_0; }; }; ghc702Prefs = ghc701Prefs; @@ -55,6 +63,7 @@ repaExamples = null; # don't pick this version of 'repa-examples' during nix-env -u cabalInstall_0_14_0 = self.cabalInstall_0_14_0.override { Cabal = self.Cabal_1_14_0; zlib = self.zlib_0_5_3_3; }; monadPar = self.monadPar_0_1_0_3; + jailbreakCabal = self.jailbreakCabal.override { Cabal = self.Cabal_1_14_0; }; }; ghc6123Prefs = ghc6122Prefs; @@ -68,6 +77,7 @@ monadPar = self.monadPar_0_1_0_3; deepseq = self.deepseq_1_1_0_2; # deviating from Haskell platform here, to make some packages (notably statistics) compile + jailbreakCabal = self.jailbreakCabal.override { Cabal = self.Cabal_1_14_0; }; }; ghc6121Prefs = @@ -78,6 +88,7 @@ repaExamples = null; # don't pick this version of 'repa-examples' during nix-env -u deepseq = self.deepseq_1_1_0_2; monadPar = self.monadPar_0_1_0_3; + jailbreakCabal = self.jailbreakCabal.override { Cabal = self.Cabal_1_14_0; }; # deviating from Haskell platform here, to make some packages (notably statistics) compile }; @@ -92,6 +103,7 @@ cabalInstall_0_14_0 = self.cabalInstall_0_14_0.override { Cabal = self.Cabal_1_14_0; zlib = self.zlib_0_5_3_3; }; deepseq = self.deepseq_1_1_0_2; monadPar = self.monadPar_0_1_0_3; + jailbreakCabal = self.jailbreakCabal.override { Cabal = self.Cabal_1_14_0; }; # deviating from Haskell platform here, to make some packages (notably statistics) compile }; @@ -251,6 +263,12 @@ prefFun = ghc741Prefs; }; + packages_ghc761 = + packages { ghcPath = ../development/compilers/ghc/7.6.1.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 c329fbc7478..30edecc335d 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -120,33 +120,33 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); haskellPlatformArgs_future = self : { inherit (self) cabal ghc; - cgi = self.cgi_3001_1_7_4; # 7.5 fail - fgl = self.fgl_5_4_2_4; # 7.5 ok - GLUT = self.GLUT_2_1_2_1; # 7.5 fail - haskellSrc = self.haskellSrc_1_0_1_5; # 7.5 ok - html = self.html_1_0_1_2; # 7.5 ok - HTTP = self.HTTP_4000_2_3; # 7.5 ok - HUnit = self.HUnit_1_2_4_3; # 7.5 ok - mtl = self.mtl_2_1_2; # 7.5 ok - network = self.network_2_3_0_14; # 7.5 ok - OpenGL = self.OpenGL_2_2_3_1; # 7.5 fail - parallel = self.parallel_3_2_0_2; # 7.5 fail - parsec = self.parsec_3_1_3; # 7.5 ok - QuickCheck = self.QuickCheck_2_5; # 7.5 fail - random = self.random_1_0_1_1; # 7.5 ok - regexBase = self.regexBase_0_93_2; # 7.5 ok - regexCompat = self.regexCompat_0_95_1; # 7.5 fail - regexPosix = self.regexPosix_0_95_1; # 7.5 fail - stm = self.stm_2_3; # 7.5 ok - syb = self.syb_0_3_6_2; # 7.5 ok - text = self.text_0_11_2_2; # 7.5 ok - transformers = self.transformers_0_3_0_0; # 7.5 ok - xhtml = self.xhtml_3000_2_1; # 7.5 ok - zlib = self.zlib_0_5_3_3; # 7.5 fail - cabalInstall = self.cabalInstall_0_14_0; # 7.5 ok - alex = self.alex_3_0_1; # 7.5 ok - haddock = self.haddock_2_10_0; # 7.5 ok - happy = self.happy_1_18_9; # 7.5 ok + cgi = self.cgi_3001_1_8_2; # 7.6 fail + fgl = self.fgl_5_4_2_4; # 7.6 ok + GLUT = self.GLUT_2_3_0_0; # 7.6 fail + haskellSrc = self.haskellSrc_1_0_1_5; # 7.6 fail + html = self.html_1_0_1_2; # 7.6 ok + HTTP = self.HTTP_4000_2_4; # 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_3_1_0; # 7.6 ok + OpenGL = self.OpenGL_2_5_0_0; # 7.6 ok + parallel = self.parallel_3_2_0_3; # 7.6 ok + parsec = self.parsec_3_1_3; # 7.6 ok + QuickCheck = self.QuickCheck_2_5; # 7.6 ok + random = self.random_1_0_1_1; # 7.6 ok + regexBase = self.regexBase_0_93_2; # 7.6 ok + regexCompat = self.regexCompat_0_95_1; # 7.6 fail + regexPosix = self.regexPosix_0_95_1; # 7.6 fail + stm = self.stm_2_4; # 7.6 ok + syb = self.syb_0_3_7; # 7.6 ok + text = self.text_0_11_2_3; # 7.6 ok + transformers = self.transformers_0_3_0_0; # 7.6 ok + xhtml = self.xhtml_3000_2_1; # 7.6 ok + zlib = self.zlib_0_5_3_3; # 7.6 ok + cabalInstall = self.cabalInstall_0_14_0; # 7.6 ok + alex = self.alex_3_0_1; # 7.6 ok + haddock = self.haddock_2_12_0; # 7.6 ok + happy = self.happy_1_18_9; # 7.6 fail }; haskellPlatformArgs_2012_2_0_0 = self : { @@ -386,6 +386,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); Agda = callPackage ../development/libraries/haskell/Agda { haskellSrcExts = self.haskellSrcExts_1_11_1; + haskeline = self.haskeline_0_6_4_7; }; accelerate = callPackage ../development/libraries/haskell/accelerate {}; @@ -396,6 +397,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); accelerateIo = callPackage ../development/libraries/haskell/accelerate-io {}; + active = callPackage ../development/libraries/haskell/active {}; + ACVector = callPackage ../development/libraries/haskell/AC-Vector {}; abstractDeque = callPackage ../development/libraries/haskell/abstract-deque {}; @@ -473,6 +476,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); Boolean = callPackage ../development/libraries/haskell/Boolean {}; + brainfuck = callPackage ../development/libraries/haskell/brainfuck {}; + bson = callPackage ../development/libraries/haskell/bson {}; byteorder = callPackage ../development/libraries/haskell/byteorder {}; @@ -520,6 +525,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); citeprocHs = callPackage ../development/libraries/haskell/citeproc-hs {}; + cipherAes = callPackage ../development/libraries/haskell/cipher-aes {}; + clientsession = callPackage ../development/libraries/haskell/clientsession {}; cmdargs = callPackage ../development/libraries/haskell/cmdargs {}; @@ -530,18 +537,26 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); colour = callPackage ../development/libraries/haskell/colour {}; + comonad = callPackage ../development/libraries/haskell/comonad {}; + + comonadTransformers = callPackage ../development/libraries/haskell/comonad-transformers {}; + compactStringFix = callPackage ../development/libraries/haskell/compact-string-fix {}; conduit = callPackage ../development/libraries/haskell/conduit {}; ConfigFile = callPackage ../development/libraries/haskell/ConfigFile {}; + configurator = callPackage ../development/libraries/haskell/configurator {}; + convertible = callPackage ../development/libraries/haskell/convertible { time = self.time_1_1_3; }; continuedFractions = callPackage ../development/libraries/haskell/continued-fractions {}; + contravariant = callPackage ../development/libraries/haskell/contravariant {}; + converge = callPackage ../development/libraries/haskell/converge {}; cookie = callPackage ../development/libraries/haskell/cookie {}; @@ -584,14 +599,24 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); dataenc = callPackage ../development/libraries/haskell/dataenc {}; + dataInttrie = callPackage ../development/libraries/haskell/data-inttrie {}; + + dataLens = callPackage ../development/libraries/haskell/data-lens {}; + + dataLensTemplate = callPackage ../development/libraries/haskell/data-lens-template {}; + + dataMemocombinators = callPackage ../development/libraries/haskell/data-memocombinators {}; + dataReify = callPackage ../development/libraries/haskell/data-reify {}; + dateCache = callPackage ../development/libraries/haskell/date-cache {}; + datetime = callPackage ../development/libraries/haskell/datetime {}; deepseq_1_1_0_0 = callPackage ../development/libraries/haskell/deepseq/1.1.0.0.nix {}; deepseq_1_1_0_2 = callPackage ../development/libraries/haskell/deepseq/1.1.0.2.nix {}; deepseq_1_2_0_1 = callPackage ../development/libraries/haskell/deepseq/1.2.0.1.nix {}; - deepseq_1_3_0_0 = callPackage ../development/libraries/haskell/deepseq/1.3.0.0.nix {}; + deepseq_1_3_0_1 = callPackage ../development/libraries/haskell/deepseq/1.3.0.1.nix {}; deepseq = null; # a core package in recent GHCs deepseqTh = callPackage ../development/libraries/haskell/deepseq-th {}; @@ -600,16 +625,32 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); derp = callPackage ../development/libraries/haskell/derp {}; + diagrams = callPackage ../development/libraries/haskell/diagrams/diagrams.nix {}; + + diagramsCairo = callPackage ../development/libraries/haskell/diagrams/cairo.nix {}; + + diagramsCore = callPackage ../development/libraries/haskell/diagrams/core.nix {}; + + diagramsLib = callPackage ../development/libraries/haskell/diagrams/lib.nix {}; + Diff = callPackage ../development/libraries/haskell/Diff {}; digest = callPackage ../development/libraries/haskell/digest { inherit (pkgs) zlib; }; + digestiveFunctors = callPackage ../development/libraries/haskell/digestive-functors {}; + + digestiveFunctorsHeist = callPackage ../development/libraries/haskell/digestive-functors-heist {}; + + digestiveFunctorsSnap = callPackage ../development/libraries/haskell/digestive-functors-snap {}; + dimensional = callPackage ../development/libraries/haskell/dimensional {}; directoryTree = callPackage ../development/libraries/haskell/directory-tree {}; + distributive = callPackage ../development/libraries/haskell/distributive {}; + dlist = callPackage ../development/libraries/haskell/dlist {}; dotgen = callPackage ../development/libraries/haskell/dotgen {}; @@ -730,6 +771,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); OpenGL = self.OpenGL25; }; + glpkHs = callPackage ../development/libraries/haskell/glpk-hs {}; + GLURaw = callPackage ../development/libraries/haskell/GLURaw {}; GLUT_2_1_1_2 = callPackage ../development/libraries/haskell/GLUT/2.1.1.2.nix {}; @@ -781,7 +824,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); hashtables = callPackage ../development/libraries/haskell/hashtables {}; - haskeline = callPackage ../development/libraries/haskell/haskeline {}; + haskeline_0_6_4_7 = callPackage ../development/libraries/haskell/haskeline/0.6.4.7.nix {}; + haskeline_0_7_0_3 = callPackage ../development/libraries/haskell/haskeline/0.7.0.3.nix {}; + haskeline = self.haskeline_0_7_0_3; haskelineClass = callPackage ../development/libraries/haskell/haskeline-class {}; @@ -797,8 +842,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); haskellSrc = self.haskellSrc_1_0_1_5; haskellSrcExts_1_11_1 = callPackage ../development/libraries/haskell/haskell-src-exts/1.11.1.nix {}; - haskellSrcExts_1_13_3 = callPackage ../development/libraries/haskell/haskell-src-exts/1.13.3.nix {}; - haskellSrcExts = self.haskellSrcExts_1_13_3; + haskellSrcExts_1_13_5 = callPackage ../development/libraries/haskell/haskell-src-exts/1.13.5.nix {}; + haskellSrcExts = self.haskellSrcExts_1_13_5; haskellSrcMeta = callPackage ../development/libraries/haskell/haskell-src-meta {}; @@ -811,7 +856,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); HTTP_4000_2_1 = callPackage ../development/libraries/haskell/HTTP/4000.2.1.nix {}; 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 = self.HTTP_4000_2_3; + HTTP_4000_2_4 = callPackage ../development/libraries/haskell/HTTP/4000.2.4.nix {}; + HTTP = self.HTTP_4000_2_4; hackageDb = callPackage ../development/libraries/haskell/hackage-db {}; @@ -833,6 +879,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); HDBCSqlite = callPackage ../development/libraries/haskell/HDBC/HDBC-sqlite3.nix {}; + heist = callPackage ../development/libraries/haskell/heist {}; + HFuse = callPackage ../development/libraries/haskell/hfuse {}; HGL = callPackage ../development/libraries/haskell/HGL {}; @@ -847,7 +895,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); hjsmin = callPackage ../development/libraries/haskell/hjsmin {}; - hledger = callPackage ../development/libraries/haskell/hledger {}; + hledger = callPackage ../development/libraries/haskell/hledger { + haskeline = self.haskeline_0_6_4_7; + }; hledgerLib = callPackage ../development/libraries/haskell/hledger-lib {}; hledgerInterest = callPackage ../applications/office/hledger-interest {}; hledgerWeb = callPackage ../development/libraries/haskell/hledger-web {}; @@ -856,6 +906,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); hmatrix = callPackage ../development/libraries/haskell/hmatrix {}; + hoauth = callPackage ../development/libraries/haskell/hoauth {}; + hoogle = callPackage ../development/libraries/haskell/hoogle {}; hopenssl = callPackage ../development/libraries/haskell/hopenssl {}; @@ -906,7 +958,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); HUnit_1_2_2_3 = callPackage ../development/libraries/haskell/HUnit/1.2.2.3.nix {}; HUnit_1_2_4_2 = callPackage ../development/libraries/haskell/HUnit/1.2.4.2.nix {}; HUnit_1_2_4_3 = callPackage ../development/libraries/haskell/HUnit/1.2.4.3.nix {}; - HUnit = self.HUnit_1_2_4_3; + HUnit_1_2_5_1 = callPackage ../development/libraries/haskell/HUnit/1.2.5.1.nix {}; + HUnit = self.HUnit_1_2_5_1; hxt = callPackage ../development/libraries/haskell/hxt {}; @@ -926,6 +979,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); IORefCAS = callPackage ../development/libraries/haskell/IORefCAS {}; + IOSpec = callPackage ../development/libraries/haskell/IOSpec {}; + ioStorage = callPackage ../development/libraries/haskell/io-storage {}; irc = callPackage ../development/libraries/haskell/irc { @@ -936,6 +991,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); ivor = callPackage ../development/libraries/haskell/ivor {}; + JuicyPixels = callPackage ../development/libraries/haskell/JuicyPixels {}; + jpeg = callPackage ../development/libraries/haskell/jpeg {}; JsContracts = callPackage ../development/libraries/haskell/JsContracts { @@ -957,6 +1014,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); languageHaskellExtract = callPackage ../development/libraries/haskell/language-haskell-extract {}; + lambdabot = callPackage ../development/libraries/haskell/lambdabot {}; + + lambdabotUtils = callPackage ../development/libraries/haskell/lambdabot-utils {}; + largeword = callPackage ../development/libraries/haskell/largeword {}; lazysmallcheck = callPackage ../development/libraries/haskell/lazysmallcheck {}; @@ -965,21 +1026,25 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); libmpd = callPackage ../development/libraries/haskell/libmpd {}; + liblastfm = callPackage ../development/libraries/haskell/liblastfm {}; + liftedBase = callPackage ../development/libraries/haskell/lifted-base {}; ListLike = callPackage ../development/libraries/haskell/ListLike {}; + lrucache = callPackage ../development/libraries/haskell/lrucache {}; + ltk = callPackage ../development/libraries/haskell/ltk {}; logfloat = callPackage ../development/libraries/haskell/logfloat {}; + logict = callPackage ../development/libraries/haskell/logict {}; + mathFunctions = callPackage ../development/libraries/haskell/math-functions {}; mainlandPretty = callPackage ../development/libraries/haskell/mainland-pretty {}; - maude = callPackage ../development/libraries/haskell/maude { - parsec = self.parsec3; - }; + maude = callPackage ../development/libraries/haskell/maude {}; MaybeT = callPackage ../development/libraries/haskell/MaybeT {}; @@ -989,6 +1054,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); mimeMail = callPackage ../development/libraries/haskell/mime-mail {}; + mimeTypes = callPackage ../development/libraries/haskell/mime-types {}; + MissingH = callPackage ../development/libraries/haskell/MissingH {}; mmap = callPackage ../development/libraries/haskell/mmap {}; @@ -1003,6 +1070,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); monadLoops = callPackage ../development/libraries/haskell/monad-loops {}; + monadLogger = callPackage ../development/libraries/haskell/monad-logger {}; + monadPar_0_1_0_3 = callPackage ../development/libraries/haskell/monad-par/0.1.0.3.nix {}; monadPar_0_3 = callPackage ../development/libraries/haskell/monad-par/0.3.nix {}; monadPar = self.monadPar_0_3; @@ -1053,23 +1122,29 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); network_2_3_0_2 = callPackage ../development/libraries/haskell/network/2.3.0.2.nix {}; network_2_3_0_5 = callPackage ../development/libraries/haskell/network/2.3.0.5.nix {}; network_2_3_0_13 = callPackage ../development/libraries/haskell/network/2.3.0.13.nix {}; - network_2_3_0_14 = callPackage ../development/libraries/haskell/network/2.3.0.14.nix {}; - network = self.network_2_3_0_14; + network_2_3_1_0 = callPackage ../development/libraries/haskell/network/2.3.1.0.nix {}; + network = self.network_2_3_1_0; networkConduit = callPackage ../development/libraries/haskell/network-conduit {}; + newtype = callPackage ../development/libraries/haskell/newtype {}; + nonNegative = callPackage ../development/libraries/haskell/non-negative {}; numericPrelude = callPackage ../development/libraries/haskell/numeric-prelude {}; NumInstances = callPackage ../development/libraries/haskell/NumInstances {}; + numbers = callPackage ../development/libraries/haskell/numbers {}; + numtype = callPackage ../development/libraries/haskell/numtype {}; OneTuple = callPackage ../development/libraries/haskell/OneTuple {}; ObjectName = callPackage ../development/libraries/haskell/ObjectName {}; + oeis = callPackage ../development/libraries/haskell/oeis {}; + OpenAL = callPackage ../development/libraries/haskell/OpenAL {}; OpenGL_2_2_1_1 = callPackage ../development/libraries/haskell/OpenGL/2.2.1.1.nix {}; @@ -1125,6 +1200,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); persistent = callPackage ../development/libraries/haskell/persistent {}; + persistentPostgresql = callPackage ../development/libraries/haskell/persistent-postgresql {}; + persistentSqlite = callPackage ../development/libraries/haskell/persistent-sqlite {}; persistentTemplate = callPackage ../development/libraries/haskell/persistent-template {}; @@ -1137,12 +1214,20 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); poolConduit = callPackage ../development/libraries/haskell/pool-conduit {}; + postgresqlLibpq = callPackage ../development/libraries/haskell/postgresql-libpq { + postgresql = pkgs.postgresql91; + }; + + postgresqlSimple = callPackage ../development/libraries/haskell/postgresql-simple {}; + ppm = callPackage ../development/libraries/haskell/ppm {}; prettyShow = callPackage ../development/libraries/haskell/pretty-show {}; primitive = callPackage ../development/libraries/haskell/primitive {}; + processExtras = callPackage ../development/libraries/haskell/process-extras {}; + processLeksah = callPackage ../development/libraries/haskell/leksah/process-leksah.nix {}; prolog = callPackage ../development/libraries/haskell/prolog {}; @@ -1256,6 +1341,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); semigroups = callPackage ../development/libraries/haskell/semigroups {}; + semigroupoids = callPackage ../development/libraries/haskell/semigroupoids {}; + shelly = callPackage ../development/libraries/haskell/shelly {}; simpleSendfile = callPackage ../development/libraries/haskell/simple-sendfile {}; @@ -1264,8 +1351,14 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); smallcheck = callPackage ../development/libraries/haskell/smallcheck {}; + snap = callPackage ../development/libraries/haskell/snap/snap.nix {}; + snapCore = callPackage ../development/libraries/haskell/snap/core.nix {}; + snapLoaderDynamic = callPackage ../development/libraries/haskell/snap/loader-dynamic.nix {}; + + snapLoaderStatic = callPackage ../development/libraries/haskell/snap/loader-static.nix {}; + snapServer = callPackage ../development/libraries/haskell/snap/server.nix {}; socks = callPackage ../development/libraries/haskell/socks {}; @@ -1286,11 +1379,14 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); stringsearch = callPackage ../development/libraries/haskell/stringsearch {}; + stylishHaskell = callPackage ../development/libraries/haskell/stylish-haskell {}; + syb_0_2_2 = callPackage ../development/libraries/haskell/syb/0.2.2.nix {}; syb_0_3 = callPackage ../development/libraries/haskell/syb/0.3.nix {}; syb_0_3_3 = callPackage ../development/libraries/haskell/syb/0.3.3.nix {}; syb_0_3_6_1 = callPackage ../development/libraries/haskell/syb/0.3.6.1.nix {}; syb_0_3_6_2 = callPackage ../development/libraries/haskell/syb/0.3.6.2.nix {}; + syb_0_3_7 = callPackage ../development/libraries/haskell/syb/0.3.7.nix {}; syb = null; # by default, we assume that syb ships with GHC, which is # true for the older GHC versions @@ -1322,9 +1418,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); Shellac = callPackage ../development/libraries/haskell/Shellac/Shellac.nix {}; - ShellacHaskeline = callPackage ../development/libraries/haskell/Shellac/Shellac-haskeline.nix {}; - - ShellacReadline = callPackage ../development/libraries/haskell/Shellac/Shellac-readline.nix {}; + show = callPackage ../development/libraries/haskell/show {}; SMTPClient = callPackage ../development/libraries/haskell/SMTPClient {}; @@ -1336,7 +1430,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); stm_2_1_2_1 = callPackage ../development/libraries/haskell/stm/2.1.2.1.nix {}; stm_2_2_0_1 = callPackage ../development/libraries/haskell/stm/2.2.0.1.nix {}; stm_2_3 = callPackage ../development/libraries/haskell/stm/2.3.nix {}; - stm = self.stm_2_3; + stm_2_4 = callPackage ../development/libraries/haskell/stm/2.4.nix {}; + stm = self.stm_2_4; storableComplex = callPackage ../development/libraries/haskell/storable-complex {}; @@ -1364,17 +1459,13 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); tagsoup = callPackage ../development/libraries/haskell/tagsoup {}; - tagsoup_0_10_1 = callPackage ../development/libraries/haskell/tagsoup/0.10.1nix {}; - temporary = callPackage ../development/libraries/haskell/temporary {}; Tensor = callPackage ../development/libraries/haskell/Tensor {}; terminfo = callPackage ../development/libraries/haskell/terminfo {}; - testFramework_0_6 = callPackage ../development/libraries/haskell/test-framework/0.6.nix {}; - testFramework_0_5 = callPackage ../development/libraries/haskell/test-framework/0.5.nix {}; - testFramework = self.testFramework_0_6; + testFramework = callPackage ../development/libraries/haskell/test-framework {}; testFrameworkHunit = callPackage ../development/libraries/haskell/test-framework-hunit {}; @@ -1395,8 +1486,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); text_0_11_1_5 = callPackage ../development/libraries/haskell/text/0.11.1.5.nix {}; text_0_11_1_13 = callPackage ../development/libraries/haskell/text/0.11.1.13.nix {}; text_0_11_2_0 = callPackage ../development/libraries/haskell/text/0.11.2.0.nix {}; - text_0_11_2_2 = callPackage ../development/libraries/haskell/text/0.11.2.2.nix {}; - text = self.text_0_11_2_2; + text_0_11_2_3 = callPackage ../development/libraries/haskell/text/0.11.2.3.nix {}; + text = self.text_0_11_2_3; thespian = callPackage ../development/libraries/haskell/thespian {}; @@ -1404,6 +1495,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); thLift = callPackage ../development/libraries/haskell/th-lift {}; + thOrphans = callPackage ../development/libraries/haskell/th-orphans {}; + threadmanager = callPackage ../development/libraries/haskell/threadmanager {}; time_1_1_2_4 = callPackage ../development/libraries/haskell/time/1.1.2.4.nix {}; @@ -1437,10 +1530,16 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); unixCompat = callPackage ../development/libraries/haskell/unix-compat {}; + unixTime = callPackage ../development/libraries/haskell/unix-time {}; + + unlambda = callPackage ../development/libraries/haskell/unlambda {}; + unorderedContainers = callPackage ../development/libraries/haskell/unordered-containers {}; url = callPackage ../development/libraries/haskell/url {}; + urlencoded = callPackage ../development/libraries/haskell/urlencoded {}; + utf8Light = callPackage ../development/libraries/haskell/utf8-light {}; utf8String = callPackage ../development/libraries/haskell/utf8-string {}; @@ -1465,6 +1564,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); vectorSpace = callPackage ../development/libraries/haskell/vector-space {}; + vectorSpacePoints = callPackage ../development/libraries/haskell/vector-space-points {}; + void = callPackage ../development/libraries/haskell/void {}; vty = callPackage ../development/libraries/haskell/vty {}; @@ -1515,8 +1616,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); }; X11_1_5_0_1 = callPackage ../development/libraries/haskell/X11/1.5.0.1.nix {}; - X11_1_6_0 = callPackage ../development/libraries/haskell/X11/1.6.0.nix {}; - X11 = self.X11_1_6_0; + X11_1_6_0_1 = callPackage ../development/libraries/haskell/X11/1.6.0.1.nix {}; + X11 = self.X11_1_6_0_1; X11Xft = callPackage ../development/libraries/haskell/X11-xft {}; @@ -1530,6 +1631,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); xmlConduit = callPackage ../development/libraries/haskell/xml-conduit {}; + xmlhtml = callPackage ../development/libraries/haskell/xmlhtml {}; + xmlTypes = callPackage ../development/libraries/haskell/xml-types {}; xssSanitize = callPackage ../development/libraries/haskell/xss-sanitize {}; @@ -1625,7 +1728,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); haddock_2_9_2 = callPackage ../development/tools/documentation/haddock/2.9.2.nix {}; haddock_2_9_4 = callPackage ../development/tools/documentation/haddock/2.9.4.nix {}; haddock_2_10_0 = callPackage ../development/tools/documentation/haddock/2.10.0.nix {}; - haddock = self.haddock_2_10_0; + haddock_2_11_0 = callPackage ../development/tools/documentation/haddock/2.11.0.nix {}; + haddock_2_12_0 = callPackage ../development/tools/documentation/haddock/2.12.0.nix {}; + haddock = self.haddock_2_12_0; happy_1_18_4 = callPackage ../development/tools/parsing/happy/1.18.4.nix {}; happy_1_18_5 = callPackage ../development/tools/parsing/happy/1.18.5.nix {}; @@ -1664,19 +1769,13 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); darcs = callPackage ../applications/version-management/darcs { tar = self.tar_0_3_2_0; + haskeline = self.haskeline_0_6_4_7; }; leksah = callPackage ../applications/editors/leksah { QuickCheck = self.QuickCheck2; }; - mathblog = callPackage ../applications/misc/mathblog { - testFramework = self.testFramework_0_5; - testFrameworkHunit = self.testFrameworkHunit.override { - testFramework = self.testFramework_0_5; - }; - }; - xmobar = callPackage ../applications/misc/xmobar { stm = self.stm_2_3; }; @@ -1707,6 +1806,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); cabalInstall_0_14_0 = callPackage ../tools/package-management/cabal-install/0.14.0.nix {}; cabalInstall = self.cabalInstall_0_14_0; + jailbreakCabal = callPackage ../development/tools/haskell/jailbreak-cabal {}; + lhs2tex = callPackage ../tools/typesetting/lhs2tex {}; myhasktags = callPackage ../tools/misc/myhasktags {}; diff --git a/pkgs/top-level/node-packages.nix b/pkgs/top-level/node-packages.nix new file mode 100644 index 00000000000..7c083c7e0ee --- /dev/null +++ b/pkgs/top-level/node-packages.nix @@ -0,0 +1,942 @@ +{ pkgs, stdenv, nodejs, fetchurl }: + +let self = { + buildNodePackage = import ../development/web/nodejs/build-node-package.nix { + inherit stdenv nodejs; + }; + + patchLatest = srcAttrs: + let src = fetchurl srcAttrs; in + pkgs.runCommand src.name {} '' + tar xf ${src} + sed -i -e "s/: \"latest\"/: \"*\"/" package/package.json + tar cf $out package + ''; + + "abbrev" = self."abbrev-1"; + + "abbrev-1" = self.buildNodePackage rec { + name = "abbrev-1.0.3"; + src = fetchurl { + url = "http://registry.npmjs.org/abbrev/-/${name}.tgz"; + sha256 = "d444c07f411418828a5e81ac85569afe638e6441a562086faa0209ec7bdf55f2"; + }; + deps = [ + + ]; + }; + + "active-x-obfuscator" = self."active-x-obfuscator-0.0.1"; + + "active-x-obfuscator-0.0.1" = self.buildNodePackage rec { + name = "active-x-obfuscator-0.0.1"; + src = fetchurl { + url = "http://registry.npmjs.org/active-x-obfuscator/-/${name}.tgz"; + sha256 = "069cc18a0e7790ec106b267d28b47c691220f119a8daec925dd47f06866ce1c6"; + }; + deps = [ + self."zeparser-0.0.5" + ]; + }; + + "ansi" = self."ansi-~0.1.2"; + + "ansi-~0.1.2" = self.buildNodePackage rec { + name = "ansi-0.1.2"; + src = fetchurl { + url = "http://registry.npmjs.org/ansi/-/${name}.tgz"; + sha256 = "6f2288b1db642eb822578f4ee70bf26bf97173cc7d3f10f496070fb96250006b"; + }; + deps = [ + + ]; + }; + + "backbone" = self."backbone-0.9.2"; + + "backbone-0.9.2" = self.buildNodePackage rec { + name = "backbone-0.9.2"; + src = fetchurl { + url = "http://registry.npmjs.org/backbone/-/${name}.tgz"; + sha256 = "0a5ebc8d32949ea2870a684e8430a8b4dec75a163ecf2740eb5fb4865393bb32"; + }; + deps = [ + self."underscore->=1.3.1" + ]; + }; + + "block-stream" = self."block-stream-*"; + + "block-stream-*" = self.buildNodePackage rec { + name = "block-stream-0.0.6"; + src = fetchurl { + url = "http://registry.npmjs.org/block-stream/-/${name}.tgz"; + sha256 = "2fc365b42b8601c8ee150d453f6cc762a01054b7fb28bdfcfcbce7c97e93601b"; + }; + deps = [ + self."inherits-~1.0.0" + ]; + }; + + "browserchannel" = self."browserchannel-0.4.1"; + + "browserchannel-0.4.1" = self.buildNodePackage rec { + name = "browserchannel-0.4.1"; + src = fetchurl { + url = "http://registry.npmjs.org/browserchannel/-/${name}.tgz"; + sha256 = "f5d038347cee6802bb6f30f53bcf2adf196d241505b77ffca3d5f8a76a109c5f"; + }; + deps = [ + self."coffee-script-~1" + self."hat" + self."connect-~1.7" + self."timerstub" + self."request-~2" + ]; + }; + + "bson" = self."bson-0.1.0"; + + "bson-0.1.0" = self.buildNodePackage rec { + name = "bson-0.1.0"; + src = fetchurl { + url = "http://registry.npmjs.org/bson/-/${name}.tgz"; + sha256 = "32618266420f4d2688e957a6a145aab6a1402c950b7b7c7c1d0520cbd08251c9"; + }; + deps = [ + + ]; + }; + + "bytes" = self."bytes-0.1.0"; + + "bytes-0.1.0" = self.buildNodePackage rec { + name = "bytes-0.1.0"; + src = fetchurl { + url = "http://registry.npmjs.org/bytes/-/${name}.tgz"; + sha256 = "32954618600f6566ecd95aec0ea0ae3318a1b4a29bf6a7970462c29a843bf701"; + }; + deps = [ + + ]; + }; + + "coffee-script" = self."coffee-script-1.3.3"; + "coffee-script-~1" = self."coffee-script-1.3.3"; + + "coffee-script-~1.1.2" = self.buildNodePackage rec { + name = "coffee-script-1.1.3"; + src = fetchurl { + url = "http://registry.npmjs.org/coffee-script/-/${name}.tgz"; + sha256 = "3b431da901f753bde0ab26245c7111e1e4b8be1bba0086cf4a7470d739acae87"; + }; + deps = [ + + ]; + }; + + "coffee-script-1.3.3" = self.buildNodePackage rec { + name = "coffee-script-1.3.3"; + src = fetchurl { + url = "http://registry.npmjs.org/coffee-script/-/${name}.tgz"; + sha256 = "deedd2cf9d5abe2bad724e6809bec40efa07215dae85f44d78cd37736bb50bc5"; + }; + deps = [ + + ]; + }; + + "commander" = self."commander-~0.6.1"; + + "commander-~0.6.1" = self.buildNodePackage rec { + name = "commander-0.6.1"; + src = fetchurl { + url = "http://registry.npmjs.org/commander/-/${name}.tgz"; + sha256 = "7b7fdd1bc4d16f6776169a64f133d629efe2e3a7cd338b1d0884ee909abbd729"; + }; + deps = [ + + ]; + }; + + "connect" = self."connect-2.4.4"; + + "connect-~1.7" = self.buildNodePackage rec { + name = "connect-1.7.3"; + src = fetchurl { + url = "http://registry.npmjs.org/connect/-/${name}.tgz"; + sha256 = "773fd6ca8c90e33cc28d012fb3d72d66eb99114b20d88228330458628f030d12"; + }; + deps = [ + self."qs->= 0.3.1" + self."mime->= 0.0.1" + ]; + }; + + "connect-2.4.4" = self.buildNodePackage rec { + name = "connect-2.4.4"; + src = fetchurl { + url = "http://registry.npmjs.org/connect/-/${name}.tgz"; + sha256 = "1f474ca9db05b9d58f3469ad4932722e49bec1f6ec35665ddea09155382914e9"; + }; + deps = [ + self."qs-0.4.2" + self."formidable-1.0.11" + self."crc-0.2.0" + self."cookie-0.0.4" + self."bytes-0.1.0" + self."send-0.0.4" + self."fresh-0.1.0" + self."pause-0.0.1" + self."debug" + ]; + }; + + "cookie" = self."cookie-0.0.4"; + + "cookie-0.0.4" = self.buildNodePackage rec { + name = "cookie-0.0.4"; + src = fetchurl { + url = "http://registry.npmjs.org/cookie/-/${name}.tgz"; + sha256 = "a917477c448a6a91ef73d550d8d8a6d4864e8fbd247b6f73baaca66c9bfc3b0b"; + }; + deps = [ + + ]; + }; + + "crc" = self."crc-0.2.0"; + + "crc-0.2.0" = self.buildNodePackage rec { + name = "crc-0.2.0"; + src = fetchurl { + url = "http://registry.npmjs.org/crc/-/${name}.tgz"; + sha256 = "027c180bbbddd0960e6000f7ef60623997dfa61b3c2ef141acf00c29a1763b5d"; + }; + deps = [ + + ]; + }; + + "cssmin" = self."cssmin-0.3.1"; + + "cssmin-0.3.1" = self.buildNodePackage rec { + name = "cssmin-0.3.1"; + src = fetchurl { + url = "http://registry.npmjs.org/cssmin/-/${name}.tgz"; + sha256 = "56f1854fd0c6cb4cf78cea861e7b617ccf1daf91b47fba5bc80abdf2529b3102"; + }; + deps = [ + + ]; + }; + + "datetime" = self."datetime-0.0.3"; + + "datetime-0.0.3" = self.buildNodePackage rec { + name = "datetime-0.0.3"; + src = fetchurl { + url = "http://registry.npmjs.org/datetime/-/${name}.tgz"; + sha256 = "d584a5b140ced7bd44199fc5e1b6cd55ec2d3c946dc990ced42f6ab2687747f0"; + }; + deps = [ + self."vows->=0.5.4" + ]; + }; + + "debug" = self."debug-*"; + + "debug-*" = self.buildNodePackage rec { + name = "debug-0.7.0"; + src = fetchurl { + url = "http://registry.npmjs.org/debug/-/${name}.tgz"; + sha256 = "113c041fb01fd8db2a1b83320529849ccbb23794a4c3799a0154312de2a5d618"; + }; + deps = [ + + ]; + }; + + "diff" = self."diff-~1.0.3"; + + "diff-~1.0.3" = self.buildNodePackage rec { + name = "diff-1.0.3"; + src = fetchurl { + url = "http://registry.npmjs.org/diff/-/${name}.tgz"; + sha256 = "88e1bb04e3707c5601ec0841e170f8892a3b929bf8c4030f826cd32c1fa21472"; + }; + deps = [ + + ]; + }; + + "eyes" = self."eyes->=0.1.6"; + + "eyes->=0.1.6" = self.buildNodePackage rec { + name = "eyes-0.1.8"; + src = fetchurl { + url = "http://registry.npmjs.org/eyes/-/${name}.tgz"; + sha256 = "4fa6db8f2c9926fb39a211c622d7eb3a76efbc4878559f9bd155d647a6963735"; + }; + deps = [ + + ]; + }; + + "formidable" = self."formidable-1.0.11"; + + "formidable-1.0.11" = self.buildNodePackage rec { + name = "formidable-1.0.11"; + src = fetchurl { + url = "http://registry.npmjs.org/formidable/-/${name}.tgz"; + sha256 = "39b345d14d69c27fe262e12f16900cef6be220510788866e0a12c9fedd03766e"; + }; + deps = [ + + ]; + }; + + "fresh" = self."fresh-0.1.0"; + + "fresh-0.1.0" = self.buildNodePackage rec { + name = "fresh-0.1.0"; + src = fetchurl { + url = "http://registry.npmjs.org/fresh/-/${name}.tgz"; + sha256 = "c402fbd25e26c0167bf288e1ba791716808bfaa5de32b76ae68e8e8a3d7e2b33"; + }; + deps = [ + + ]; + }; + + "fstream" = self."fstream-0.1.18"; + "fstream-~0.1.8" = self."fstream-0.1.18"; + "fstream-~0.1.13" = self."fstream-0.1.18"; + + "fstream-0.1.18" = self.buildNodePackage rec { + name = "fstream-0.1.18"; + src = fetchurl { + url = "http://registry.npmjs.org/fstream/-/${name}.tgz"; + sha256 = "fd5791dd0ce8d7b707fa171ac5bd482e09f80cd09ec8176b45d547416893372d"; + }; + deps = [ + self."rimraf-2" + self."mkdirp-0.3" + self."graceful-fs-~1.1.2" + self."inherits-~1.0.0" + ]; + }; + + "glob" = self."glob-3"; + + "glob-3" = self.buildNodePackage rec { + name = "glob-3.1.12"; + src = fetchurl { + url = "http://registry.npmjs.org/glob/-/${name}.tgz"; + sha256 = "a37c02e9a91915fe4e3232229676e842803151dde831d1046620ec96118f6036"; + }; + deps = [ + self."minimatch-0.2" + self."graceful-fs-~1.1.2" + self."inherits-1" + ]; + }; + + "graceful-fs" = self."graceful-fs-1.1.10"; + "graceful-fs-1" = self."graceful-fs-1.1.10"; + "graceful-fs-~1.1" = self."graceful-fs-1.1.10"; + "graceful-fs-~1.1.2" = self."graceful-fs-1.1.10"; + + "graceful-fs-1.1.10" = self.buildNodePackage rec { + name = "graceful-fs-1.1.10"; + src = fetchurl { + url = "http://registry.npmjs.org/graceful-fs/-/${name}.tgz"; + sha256 = "1f9b7da8b0c75db49e0e5d2aaecc6f1dd3fca2bdbb2aecf95d1dbdec7f0cee24"; + }; + deps = [ + + ]; + }; + + "hat" = self."hat-0.0.3"; + + "hat-0.0.3" = self.buildNodePackage rec { + name = "hat-0.0.3"; + src = fetchurl { + url = "http://registry.npmjs.org/hat/-/${name}.tgz"; + sha256 = "7bf52b3b020ca333a42eb67411090912b21abb6ac746d587022a0955b16e5f5c"; + }; + deps = [ + + ]; + }; + + "hiredis" = self."hiredis-*"; + + "hiredis-*" = self.buildNodePackage rec { + name = "hiredis-0.1.14"; + src = fetchurl { + url = "http://registry.npmjs.org/hiredis/-/${name}.tgz"; + sha256 = "9d7ce0a7ae81cf465a0c26c07fb618b6ffd98ca344f14369114abf548d75637a"; + }; + deps = [ + + ]; + }; + + "inherits" = self."inherits-1.0.0"; + "inherits-1" = self."inherits-1.0.0"; + "inherits-1.x" = self."inherits-1.0.0"; + "inherits-~1.0.0" = self."inherits-1.0.0"; + + "inherits-1.0.0" = self.buildNodePackage rec { + name = "inherits-1.0.0"; + src = fetchurl { + url = "http://registry.npmjs.org/inherits/-/${name}.tgz"; + sha256 = "2be196fa6bc6a0c65fecd737af457589ef88b22a95d5dc31aab01d92ace48186"; + }; + deps = [ + + ]; + }; + + "less" = self."less-1.3.0"; + + "less-1.3.0" = self.buildNodePackage rec { + name = "less-1.3.0"; + src = fetchurl { + url = "http://registry.npmjs.org/less/-/${name}.tgz"; + sha256 = "a182824764d5feefe8a66c5f9c7fe8b92d24a7677942fd650b9092bbd3f63d1b"; + }; + deps = [ + + ]; + }; + + "lru-cache" = self."lru-cache-~2.0.0"; + + "lru-cache-~2.0.0" = self.buildNodePackage rec { + name = "lru-cache-2.0.1"; + src = fetchurl { + url = "http://registry.npmjs.org/lru-cache/-/${name}.tgz"; + sha256 = "3b4fd68f0bd75f5abf69e349b6ffa918bfe4990ff36d2d88dc74f334a9ed627e"; + }; + deps = [ + + ]; + }; + + "mime" = self."mime-1.2.6"; + + "mime->= 0.0.1" = self.buildNodePackage rec { + name = "mime-1.2.7"; + src = fetchurl { + url = "http://registry.npmjs.org/mime/-/${name}.tgz"; + sha256 = "a80244918c9c75fa4d0b37f311920c7d5270aab9a05aca9a74783764ad152df6"; + }; + deps = [ + + ]; + }; + + "mime-1.2.6" = self.buildNodePackage rec { + name = "mime-1.2.6"; + src = fetchurl { + url = "http://registry.npmjs.org/mime/-/${name}.tgz"; + sha256 = "7460134d6b4686d64fd1e7b878d34e2bdd258ad29b6665cf62e6d92659e81591"; + }; + deps = [ + + ]; + }; + + "minimatch" = self."minimatch-0.2"; + + "minimatch-0.2" = self.buildNodePackage rec { + name = "minimatch-0.2.6"; + src = fetchurl { + url = "http://registry.npmjs.org/minimatch/-/${name}.tgz"; + sha256 = "f0030112575a815ff304fa3bc64ee7e60ab8bfddb281602bc37eca0cddd48350"; + }; + deps = [ + self."lru-cache-~2.0.0" + ]; + }; + + "mkdirp" = self."mkdirp-0.3"; + + "mkdirp-0.3" = self.buildNodePackage rec { + name = "mkdirp-0.3.4"; + src = fetchurl { + url = "http://registry.npmjs.org/mkdirp/-/${name}.tgz"; + sha256 = "f87444f2376c56bf47846f3b885aae926c5d9504328923b166794b78c0e08425"; + }; + deps = [ + + ]; + }; + + "mongodb" = self."mongodb-1.1.0-beta"; + + "mongodb-1.1.0-beta" = self.buildNodePackage rec { + name = "mongodb-1.1.0-beta"; + src = fetchurl { + url = "http://registry.npmjs.org/mongodb/-/${name}.tgz"; + sha256 = "05e5a798d4c3a499af1e77a33eb13a31d4fb688a63e97b3fe970a3bccea39ab3"; + }; + deps = [ + self."bson-0.1.0" + ]; + }; + + "mrclean" = self."mrclean-0.1.0"; + + "mrclean-0.1.0" = self.buildNodePackage rec { + name = "mrclean-0.1.0"; + src = fetchurl { + url = "http://registry.npmjs.org/mrclean/-/${name}.tgz"; + sha256 = "5a8921007d8d3db990d41924d220f90efc8cbeb1f425c52fe0fe28be22223705"; + }; + deps = [ + + ]; + }; + + "node-gyp" = self."node-gyp-*"; + + "node-gyp-*" = self.buildNodePackage rec { + name = "node-gyp-0.6.8"; + src = fetchurl { + url = "http://registry.npmjs.org/node-gyp/-/${name}.tgz"; + sha256 = "b40064d825c492c544389812ecea2089606c31cbe4f3ee9e68048ea56a9aed4d"; + }; + deps = [ + self."glob-3" + self."graceful-fs-1" + self."fstream-~0.1.13" + self."minimatch-0.2" + self."mkdirp-0.3" + self."nopt-2" + self."npmlog-0" + self."osenv-0" + self."request-2.9" + self."rimraf-2" + self."semver-1" + self."tar-~0.1.12" + self."which-1" + ]; + }; + + "nopt" = self."nopt-2"; + + "nopt-2" = self.buildNodePackage rec { + name = "nopt-2.0.0"; + src = fetchurl { + url = "http://registry.npmjs.org/nopt/-/${name}.tgz"; + sha256 = "112e9bea8b745a2e5a59d239e6f6f02e720e080ab8cdca89b6b8f0143ae718b5"; + }; + deps = [ + self."abbrev-1" + ]; + }; + + "npm2nix" = self."npm2nix-0.1.3"; + + "npm2nix-0.1.3" = self.buildNodePackage rec { + name = "npm2nix-0.1.3"; + src = fetchurl { + url = https://bitbucket.org/shlevy/npm2nix/get/0.1.3.tar.gz; + sha256 = "1728fzmixcyg4g8mqcgn5yf7d4nin9zyqv8bs8b6660swhfdn4il"; + name = "${name}.tgz"; + }; + deps = [ + self."semver-1" + ]; + }; + + "npmlog" = self."npmlog-0"; + + "npmlog-0" = self.buildNodePackage rec { + name = "npmlog-0.0.2"; + src = fetchurl { + url = "http://registry.npmjs.org/npmlog/-/${name}.tgz"; + sha256 = "ce98d4d3380390c0259695cce407e2e96d2970c5caee1461a62ecbd38e8caed4"; + }; + deps = [ + self."ansi-~0.1.2" + ]; + }; + + "options" = self."options-*"; + + "options-*" = self.buildNodePackage rec { + name = "options-0.0.3"; + src = fetchurl { + url = "http://registry.npmjs.org/options/-/${name}.tgz"; + sha256 = "06cfe21b54b45f8cf7bb0a184d6ea6de3adb2dc471bf0663d06c791b4d48536d"; + }; + deps = [ + + ]; + }; + + "osenv" = self."osenv-0"; + + "osenv-0" = self.buildNodePackage rec { + name = "osenv-0.0.3"; + src = fetchurl { + url = "http://registry.npmjs.org/osenv/-/${name}.tgz"; + sha256 = "aafbb23637b7338c9025f9da336f31f96674d7926c30f209e4d93ce16d5251c4"; + }; + deps = [ + + ]; + }; + + "pause" = self."pause-0.0.1"; + + "pause-0.0.1" = self.buildNodePackage rec { + name = "pause-0.0.1"; + src = fetchurl { + url = "http://registry.npmjs.org/pause/-/${name}.tgz"; + sha256 = "d37b84046db0c28c9768be649e8f02bd991ede34b276b5dba7bade23b523235e"; + }; + deps = [ + + ]; + }; + + "policyfile" = self."policyfile-0.0.4"; + + "policyfile-0.0.4" = self.buildNodePackage rec { + name = "policyfile-0.0.4"; + src = fetchurl { + url = "http://registry.npmjs.org/policyfile/-/${name}.tgz"; + sha256 = "e19e9e57d6262ab7965212ec5456eae2c07438de3b09fd8f3cba36a61a14c43f"; + }; + deps = [ + + ]; + }; + + "qs" = self."qs-0.5.0"; + "qs->= 0.3.1" = self."qs-0.5.0"; + + "qs-0.4.2" = self.buildNodePackage rec { + name = "qs-0.4.2"; + src = fetchurl { + url = "http://registry.npmjs.org/qs/-/${name}.tgz"; + sha256 = "c44875d3aa882693cf73185b46fed63c1a89c34dce600b191b41dd90fb019b86"; + }; + deps = [ + + ]; + }; + + "qs-0.5.0" = self.buildNodePackage rec { + name = "qs-0.5.0"; + src = fetchurl { + url = "http://registry.npmjs.org/qs/-/${name}.tgz"; + sha256 = "229a99fc833d50307833a13d898f3de137f2823593220273295e7e1dc81ab993"; + }; + deps = [ + + ]; + }; + + "range-parser" = self."range-parser-0.0.4"; + + "range-parser-0.0.4" = self.buildNodePackage rec { + name = "range-parser-0.0.4"; + src = fetchurl { + url = "http://registry.npmjs.org/range-parser/-/${name}.tgz"; + sha256 = "8e1bcce3544330b51644ea0cb4d25f0daa4b43008a75da27e285635f4ac4b1ce"; + }; + deps = [ + + ]; + }; + + "redis" = self."redis-0.7.2"; + + "redis-0.6.7" = self.buildNodePackage rec { + name = "redis-0.6.7"; + src = fetchurl { + url = "http://registry.npmjs.org/redis/-/${name}.tgz"; + sha256 = "6a65c0204a773ca4adec0635d747c80a7565ba5e2028775c7d0e95d23df088bb"; + }; + deps = [ + + ]; + }; + + "redis-0.7.2" = self.buildNodePackage rec { + name = "redis-0.7.2"; + src = fetchurl { + url = "http://registry.npmjs.org/redis/-/${name}.tgz"; + sha256 = "d56d99e15dd35f6fabf545d9e91545553d60eaeb32ecf5caa1f357458df161ab"; + }; + deps = [ + self."hiredis" + ]; + }; + + "request" = self."request-~2"; + + "request-2.9" = self.buildNodePackage rec { + name = "request-2.9.203"; + src = fetchurl { + url = "http://registry.npmjs.org/request/-/${name}.tgz"; + sha256 = "2af8f83a63c7227383fbdd6114e470e0921af86a037c4e82f42883120f35f836"; + }; + deps = [ + + ]; + }; + + "request-~2" = self.buildNodePackage rec { + name = "request-2.11.0"; + src = fetchurl { + url = "http://registry.npmjs.org/request/-/${name}.tgz"; + sha256 = "01e5c144c755c8ee1a1ec93077b684bd63efb8df32d54675e20737e8e1c1afa6"; + }; + deps = [ + + ]; + }; + + "rimraf" = self."rimraf-2"; + + "rimraf-2" = self.buildNodePackage rec { + name = "rimraf-2.0.2"; + src = fetchurl { + url = "http://registry.npmjs.org/rimraf/-/${name}.tgz"; + sha256 = "3efcc60c9f6715a8746f3e0b82770468247f3e256778ef20733f334377392ab0"; + }; + deps = [ + self."graceful-fs-~1.1" + ]; + }; + + "semver" = self."semver-1"; + + "semver-1" = self.buildNodePackage rec { + name = "semver-1.0.14"; + src = fetchurl { + url = "http://registry.npmjs.org/semver/-/${name}.tgz"; + sha256 = "560df522ae0e8834d8b07f6ca9c60bd8836e844642361abde108018cbe9ca82f"; + }; + deps = [ + + ]; + }; + + "send" = self."send-0.0.4"; + + "send-0.0.4" = self.buildNodePackage rec { + name = "send-0.0.4"; + src = fetchurl { + url = "http://registry.npmjs.org/send/-/${name}.tgz"; + sha256 = "7e028fa3760884d8103414f079dc4bcc99d0b72bc21bcaa9d66a319d59010d6c"; + }; + deps = [ + self."debug" + self."mime-1.2.6" + self."fresh-0.1.0" + self."range-parser-0.0.4" + ]; + }; + + "showdown" = self."showdown-0.0.1"; + + "showdown-0.0.1" = self.buildNodePackage rec { + name = "showdown-0.0.1"; + src = fetchurl { + url = "http://registry.npmjs.org/showdown/-/${name}.tgz"; + sha256 = "669a3284344a4cb51b0327af8d84b9e35c895ef1cedbafada5284a31f4d4783d"; + }; + deps = [ + + ]; + }; + + "socket.io" = self."socket.io-0.9.6"; + + "socket.io-0.9.6" = self.buildNodePackage rec { + name = "socket.io-0.9.6"; + src = fetchurl { + url = "http://registry.npmjs.org/socket.io/-/${name}.tgz"; + sha256 = "444e346e2701e2212590461a1fcf656f5d685ceb209e473517603286f09e743c"; + }; + deps = [ + self."socket.io-client-0.9.6" + self."policyfile-0.0.4" + self."redis-0.6.7" + ]; + }; + + "socket.io-client" = self."socket.io-client-0.9.6"; + + "socket.io-client-0.9.6" = self.buildNodePackage rec { + name = "socket.io-client-0.9.6"; + src = fetchurl { + url = "http://registry.npmjs.org/socket.io-client/-/${name}.tgz"; + sha256 = "eab65186515d5206fe18b9ced75aae8c803dbcd18295a9a1cb71e5ae772ba399"; + }; + deps = [ + self."uglify-js-1.2.5" + self."ws-0.4.x" + self."xmlhttprequest-1.2.2" + self."active-x-obfuscator-0.0.1" + ]; + }; + + "tar" = self."tar-~0.1.12"; + + "tar-~0.1.12" = self.buildNodePackage rec { + name = "tar-0.1.13"; + src = fetchurl { + url = "http://registry.npmjs.org/tar/-/${name}.tgz"; + sha256 = "fdf79b5e172badf924a12b501686e5cbf33c3ec7631eccc29c0e3e9fdcbb5ffe"; + }; + deps = [ + self."inherits-1.x" + self."block-stream" + self."fstream-~0.1.8" + ]; + }; + + "timerstub" = self."timerstub-*"; + + "timerstub-*" = self.buildNodePackage rec { + name = "timerstub-0.1.3"; + src = fetchurl { + url = "http://registry.npmjs.org/timerstub/-/${name}.tgz"; + sha256 = "0ecbd05a10e0db1d628505c8a3b6ae07246bb8cf1074c435ddc26f22fcb5e153"; + }; + deps = [ + self."coffee-script-~1.1.2" + ]; + }; + + "tinycolor" = self."tinycolor-0.x"; + + "tinycolor-0.x" = self.buildNodePackage rec { + name = "tinycolor-0.0.1"; + src = fetchurl { + url = "http://registry.npmjs.org/tinycolor/-/${name}.tgz"; + sha256 = "f5aaf5df002750c4af19181988c8789c9e230445747e511dde7c660424f286a0"; + }; + deps = [ + + ]; + }; + + "uglify-js" = self."uglify-js-1.2.6"; + + "uglify-js-1.2.5" = self.buildNodePackage rec { + name = "uglify-js-1.2.5"; + src = fetchurl { + url = "http://registry.npmjs.org/uglify-js/-/${name}.tgz"; + sha256 = "111fa1b844885b94df8cd73eb864bd96ff2e9173e8eb7045cc778fa237304a74"; + }; + deps = [ + + ]; + }; + + "uglify-js-1.2.6" = self.buildNodePackage rec { + name = "uglify-js-1.2.6"; + src = fetchurl { + url = "http://registry.npmjs.org/uglify-js/-/${name}.tgz"; + sha256 = "6d9202c8332e78868510a5441de4d54d8c2e08901ea7945eb332be8d7670788d"; + }; + deps = [ + + ]; + }; + + "underscore" = self."underscore-1.3.3"; + "underscore->=1.3.1" = self."underscore-1.3.3"; + + "underscore-1.3.3" = self.buildNodePackage rec { + name = "underscore-1.3.3"; + src = fetchurl { + url = "http://registry.npmjs.org/underscore/-/${name}.tgz"; + sha256 = "e710644e53f5a6d75a41a3e19d8c35eedbce0db1e886e470daf9f909c9d1ea8a"; + }; + deps = [ + + ]; + }; + + "vows" = self."vows->=0.5.4"; + + "vows->=0.5.4" = self.buildNodePackage rec { + name = "vows-0.6.4"; + src = fetchurl { + url = "http://registry.npmjs.org/vows/-/${name}.tgz"; + sha256 = "017586c2fbdd5cd15aacdc870ea0c1b1ab60558306457ddc9b0aa4dae8290597"; + }; + deps = [ + self."eyes->=0.1.6" + self."diff-~1.0.3" + ]; + }; + + "which" = self."which-1"; + + "which-1" = self.buildNodePackage rec { + name = "which-1.0.5"; + src = fetchurl { + url = "http://registry.npmjs.org/which/-/${name}.tgz"; + sha256 = "e26f39d7b152c700636472ab4da57bfb9af17972c49a9e2a06f9ff347d8fad42"; + }; + deps = [ + + ]; + }; + + "ws" = self."ws-0.4.x"; + + "ws-0.4.x" = self.buildNodePackage rec { + name = "ws-0.4.21"; + src = self.patchLatest { + url = "http://registry.npmjs.org/ws/-/${name}.tgz"; + sha256 = "f21bc0058730355e1ff9d6ccf84a4cb56a2fc28e939edd15395770ea9e87fa0e"; + }; + deps = [ + self."commander-~0.6.1" + self."tinycolor-0.x" + self."options" + ]; + }; + + "xmlhttprequest" = self."xmlhttprequest-1.2.2"; + + "xmlhttprequest-1.2.2" = self.buildNodePackage rec { + name = "xmlhttprequest-1.2.2"; + src = fetchurl { + url = "http://registry.npmjs.org/xmlhttprequest/-/${name}.tgz"; + sha256 = "44ce4ed6e5f7b5df84f27590fa142ecd175f53da4807b9f06c0c4733e23bd95d"; + }; + deps = [ + + ]; + }; + + "zeparser" = self."zeparser-0.0.5"; + + "zeparser-0.0.5" = self.buildNodePackage rec { + name = "zeparser-0.0.5"; + src = fetchurl { + url = "http://registry.npmjs.org/zeparser/-/${name}.tgz"; + sha256 = "8b5a57ae84a7b7adf8827d1469c8f66d08d1660bd1375a07381877cd1bb9ed0b"; + }; + deps = [ + + ]; + }; +}; + +in self diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index e761f6556d1..eeba996990d 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -107,6 +107,15 @@ rec { }; }; + AuthenDecHpwd = buildPerlPackage rec { + name = "Authen-DecHpwd-2.006"; + src = fetchurl { + url = "mirror://cpan/authors/id/Z/ZE/ZEFRAM/${name}.tar.gz"; + sha256 = "67f45fef6a23b7548f387b675cbf7881bf9da62d7d007cbf90d3a4b851b99eb7"; + }; + propagatedBuildInputs = [ ScalarString DataInteger DigestCRC ]; + }; + AuthenHtpasswd = buildPerlPackage rec { name = "Authen-Htpasswd-0.171"; src = fetchurl { @@ -116,6 +125,16 @@ rec { propagatedBuildInputs = [ ClassAccessor CryptPasswdMD5 DigestSHA1 IOLockedFile ]; }; + AuthenPassphrase = buildPerlPackage rec { + name = "Authen-Passphrase-0.008"; + src = fetchurl { + url = "mirror://cpan/authors/id/Z/ZE/ZEFRAM/${name}.tar.gz"; + sha256 = "55db4520617d859d88c0ee54965da815b7226d792b8cdc8debf92073559e0463"; + }; + propagatedBuildInputs = [ModuleRuntime ParamsClassify CryptPasswdMD5 CryptDES + DataEntropy CryptUnixCryptXS CryptEksblowfish CryptMySQL DigestMD4 AuthenDecHpwd]; + }; + AuthenSASL = buildPerlPackage rec { name = "Authen-SASL-2.1401"; src = fetchurl { @@ -386,6 +405,7 @@ rec { CatalystDevel DBIxClassSchemaLoader MooseXNonMoose NamespaceClean HashMerge DBIxClassCursorCached ]; + meta.platforms = stdenv.lib.platforms.linux; }; CatalystRuntime = buildPerlPackage rec{ @@ -594,10 +614,10 @@ rec { }; CGISession = buildPerlPackage rec { - name = "CGI-Session-4.42"; + name = "CGI-Session-4.46"; src = fetchurl { url = "mirror://cpan/authors/id/M/MA/MARKSTOS/${name}.tar.gz"; - sha256 = "186lqqmfvisw3i74anvnsaqlbp6ww3wyhlsgdpni0mlcnh56h4gw"; + sha256 = "c04b725be6a1b9bf22387cc6427eb951408ccba1c52471a43a80306f31e68e1b"; }; buildInputs = [ DBFile ]; }; @@ -721,6 +741,15 @@ rec { }; }; + ClassMix = buildPerlPackage rec { + name = "Class-Mix-0.005"; + src = fetchurl { + url = "mirror://cpan/authors/id/Z/ZE/ZEFRAM/${name}.tar.gz"; + sha256 = "054d0db62df90f22601f2a18fc84e9ca026d81601f5940b2fcc543e39d69b36b"; + }; + propagatedBuildInputs = [ParamsClassify]; + }; + ClassMOP = Moose; ClassSingleton = buildPerlPackage rec { @@ -798,7 +827,7 @@ rec { }; CompressRawZlib = import ../development/perl-modules/Compress-Raw-Zlib { - inherit fetchurl buildPerlPackage; + inherit fetchurl buildPerlPackage stdenv; inherit (pkgs) zlib; }; @@ -907,6 +936,26 @@ rec { buildInputs = [CryptCBC]; }; + CryptDHGMP = buildPerlPackage rec { + name = "Crypt-DH-GMP-0.00010"; + src = fetchurl { + url = "mirror://cpan/authors/id//D/DM/DMAKI/${name}.tar.gz"; + sha256 = "7d947cd48a98880df4fb5b0785758bef9ae1357eba7c376ad0fca3fd262a5fe9"; + }; + buildInputs = [ DevelChecklib TestRequires pkgs.gmp ]; + NIX_CFLAGS_COMPILE = "-I${pkgs.gmp}/include"; + NIX_CFLAGS_LINK = "-L${pkgs.gmp}/lib -lgmp"; + }; + + CryptEksblowfish = buildPerlPackage rec { + name = "Crypt-Eksblowfish-0.009"; + src = fetchurl { + url = "mirror://cpan/authors/id/Z/ZE/ZEFRAM/${name}.tar.gz"; + sha256 = "3cc7126d5841107237a9be2dc5c7fbc167cf3c4b4ce34678a8448b850757014c"; + }; + propagatedBuildInputs = [ClassMix]; + }; + CryptPasswdMD5 = buildPerlPackage { name = "Crypt-PasswdMD5-1.3"; src = fetchurl { @@ -931,6 +980,31 @@ rec { }; }; + CryptMySQL = buildPerlPackage rec { + name = "Crypt-MySQL-0.04"; + src = fetchurl { + url = "mirror://cpan/authors/id/I/IK/IKEBE/${name}.tar.gz"; + sha256 = "93ebdfaaefcfe9ab683f0121c85f24475d8197f0bcec46018219e4111434dde3"; + }; + propagatedBuildInputs = [DigestSHA1]; + }; + + CryptRijndael = buildPerlPackage rec { + name = "Crypt-Rijndael-1.11"; + src = fetchurl { + url = "mirror://cpan/authors/id/B/BD/BDFOY/${name}.tar.gz"; + sha256 = "8f8833bc8839e0d4aa3c26d86d2f39ceb9b13e52a9f5e4fd928da2e71989d3b4"; + }; + }; + + CryptUnixCryptXS = buildPerlPackage rec { + name = "Crypt-UnixCrypt_XS-0.09"; + src = fetchurl { + url = "mirror://cpan/authors/id/B/BO/BORISZ/${name}.tar.gz"; + sha256 = "527c32b8b6eb50d52b081ceae4be2d748e718e40ea85940da59a3adeb3a33156"; + }; + }; + CryptSmbHash = buildPerlPackage rec { name = "Crypt-SmbHash-0.12"; src = fetchurl { @@ -939,6 +1013,27 @@ rec { }; }; + CryptOpenSSLRandom = buildPerlPackage rec { + name = "Crypt-OpenSSL-Random-0.04"; + src = fetchurl { + url = "mirror://cpan/authors/id/I/IR/IROBERTS/${name}.tar.gz"; + sha256 = "acf7eb81023cd1f40d8c60b893096d041513df2be2aefe145cc7ae1a3dcc78c7"; + }; + NIX_CFLAGS_COMPILE = "-I${pkgs.openssl}/include"; + NIX_CFLAGS_LINK = "-L${pkgs.openssl}/lib -lcrypto"; + }; + + CryptOpenSSLRSA = buildPerlPackage rec { + name = "Crypt-OpenSSL-RSA-0.28"; + src = fetchurl { + url = "mirror://cpan/authors/id/P/PE/PERLER/${name}.tar.gz"; + sha256 = "5357f977464bb3a8184cf2d3341851a10d5515b4b2b0dfb88bf78995c0ded7be"; + }; + propagatedBuildInputs = [ CryptOpenSSLRandom ]; + NIX_CFLAGS_COMPILE = "-I${pkgs.openssl}/include"; + NIX_CFLAGS_LINK = "-L${pkgs.openssl}/lib -lcrypto"; + }; + CryptSSLeay = buildPerlPackage rec { name = "Crypt-SSLeay-0.57"; src = fetchurl { @@ -973,6 +1068,23 @@ rec { }; }; + DataEntropy = buildPerlPackage rec { + name = "Data-Entropy-0.007"; + src = fetchurl { + url = "mirror://cpan/authors/id/Z/ZE/ZEFRAM/${name}.tar.gz"; + sha256 = "2611c4a1a3038594d79ea4ed14d9e15a9af8f77105f51667795fe4f8a53427e4"; + }; + propagatedBuildInputs = [ParamsClassify DataFloat CryptRijndael HTTPLite]; + }; + + DataFloat = buildPerlPackage rec { + name = "Data-Float-0.012"; + src = fetchurl { + url = "mirror://cpan/authors/id/Z/ZE/ZEFRAM/${name}.tar.gz"; + sha256 = "698ecb092a3284e260cd3c3208408feb791d7d0f06a02673f9125ab2d51cc2d8"; + }; + }; + DataHierarchy = buildPerlPackage { name = "Data-Hierarchy-0.34"; src = fetchurl { @@ -982,6 +1094,14 @@ rec { propagatedBuildInputs = [TestException]; }; + DataInteger = buildPerlPackage rec { + name = "Data-Integer-0.004"; + src = fetchurl { + url = "mirror://cpan/authors/id/Z/ZE/ZEFRAM/${name}.tar.gz"; + sha256 = "3a52f7717d1ebda3af40036d72cbcadd1984210737743997abdad141d620f67e"; + }; + }; + DataOptList = buildPerlPackage rec { name = "Data-OptList-0.107"; src = fetchurl { @@ -1015,7 +1135,7 @@ rec { sha256 = "1998syyprmqnhpgznmk7ia3zd8saw34q7pbaprxarcz7a3bncyjc"; }; buildInputs = [ TestRequires ]; - propagatedBuildInputs = + propagatedBuildInputs = [ ClassLoad Moose TaskWeaken TieToObject NamespaceClean ]; }; @@ -1100,8 +1220,17 @@ rec { propagatedBuildInputs = [ ClassLoad ClassSingleton ParamsValidate TryTiny ]; }; + DevelChecklib = buildPerlPackage rec { + name = "Devel-CheckLib-0.98"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MA/MATTN/${name}.tar.gz"; + sha256 = "2b6b62665403bcdce67b53eb3bee7b57b6576026640c01aa57c7126e32ce20da"; + }; + propagatedBuildInputs = [ IOCaptureOutput ]; + }; + DBDSQLite = import ../development/perl-modules/DBD-SQLite { - inherit fetchurl buildPerlPackage DBI; + inherit stdenv fetchurl buildPerlPackage DBI; inherit (pkgs) sqlite; }; @@ -1111,7 +1240,7 @@ rec { }; DBDPg = import ../development/perl-modules/DBD-Pg { - inherit fetchurl buildPerlPackage DBI; + inherit stdenv fetchurl buildPerlPackage DBI; inherit (pkgs) postgresql; }; @@ -1224,6 +1353,14 @@ rec { ]; }; + DigestCRC = buildPerlPackage rec { + name = "Digest-CRC-0.18"; + src = fetchurl { + url = "mirror://cpan/authors/id/O/OL/OLIMAUL/${name}.tar.gz"; + sha256 = "5c5329f37c46eb79835169508583da8767d9839350b69bb2b48ac6f594f70374"; + }; + }; + DigestHMAC = buildPerlPackage { name = "Digest-HMAC-1.01"; src = fetchurl { @@ -1233,6 +1370,14 @@ rec { propagatedBuildInputs = [DigestSHA1]; }; + DigestMD4 = buildPerlPackage rec { + name = "Digest-MD4-1.5"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MI/MIKEM/DigestMD4/${name}.tar.gz"; + sha256 = "c7d7a32f5c2710c929b5688a7b057ec8ddbc51cf278f623e771fc02dcabd6a1f"; + }; + }; + DigestSHA = buildPerlPackage rec { name = "Digest-SHA-5.47"; src = fetchurl { @@ -1425,11 +1570,11 @@ rec { ] ++ stdenv.lib.optional stdenv.isLinux LinuxInotify2; }; - Filechdir = buildPerlPackage { - name = "File-chdir-0.1002"; + Filechdir = buildPerlPackage rec { + name = "File-chdir-0.1006"; src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DAGOLDEN/File-chdir-0.1002.tar.gz; - sha256 = "1fc2l754bxsizli3injm4wqf8dn03iq16rmfn62l99nxpibl5k6p"; + url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/${name}.tar.gz"; + sha256 = "b26e91f8b5480544da599412612ff9287007be9703d41c35251f09c5ff19879a"; }; }; @@ -1525,6 +1670,14 @@ rec { propagatedBuildInputs = [ TestScript ]; }; + FontAFM = buildPerlPackage rec { + name = "Font-AFM-1.20"; + src = fetchurl { + url = "mirror://cpan/authors/id/G/GA/GAAS/${name}.tar.gz"; + sha256 = "32671166da32596a0f6baacd0c1233825a60acaf25805d79c81a3f18d6088bc1"; + }; + }; + FontTTF = buildPerlPackage { name = "Font-TTF-0.43"; src = fetchurl { @@ -1672,12 +1825,12 @@ rec { url = "mirror://cpan/modules/by-module/HTML/${name}.tar.gz"; sha256 = "1yg9fy6s8f1jscfxf7a9hm91x43cjhk3ijw46z94sw8133h50rvy"; }; - propagatedBuildInputs = + propagatedBuildInputs = [ ClassAccessorChained Clone ConfigAny DateCalc ListMoreUtils EmailValid DataVisitor DateTime DateTimeFormatBuilder DateTimeFormatStrptime DateTimeFormatNatural - Readonly YAMLLibYAML NumberFormat HashFlatten + Readonly YAMLLibYAML NumberFormat HashFlatten HTMLTokeParserSimple RegexpCommon CaptchaReCAPTCHA HTMLScrubber FileShareDir TemplateToolkit CryptCBC CryptDES PathClass @@ -1737,11 +1890,11 @@ rec { buildInputs = [TestPod]; }; - HTMLTree = buildPerlPackage { - name = "HTML-Tree-3.23"; + HTMLTree = buildPerlPackage rec { + name = "HTML-Tree-4.2"; src = fetchurl { - url = mirror://cpan/authors/id/P/PE/PETEK/HTML-Tree-3.23.tar.gz; - sha256 = "1pn80f4g1wixs030f40b80wrj12kwfinwycrx3f10drg4v7ml5zm"; + url = "mirror://cpan/authors/id/J/JF/JFEARN/${name}.tar.gz"; + sha256 = "80e4e3caa5e0e025dee5ed383a8d4cc7479ae4802184c4757dafd147a8fca7c9"; }; propagatedBuildInputs = [HTMLParser]; }; @@ -1794,6 +1947,14 @@ rec { }; }; + HTTPLite = buildPerlPackage rec { + name = "HTTP-Lite-2.4"; + src = fetchurl { + url = "mirror://cpan/authors/id/N/NE/NEILB/${name}.tar.gz"; + sha256 = "66f4fc0f93eeb42c09737f83b21de1944212ae9b2acb784d5103e8208491477b"; + }; + }; + HTTPMessage = buildPerlPackage rec { name = "HTTP-Message-6.02"; src = fetchurl { @@ -1812,6 +1973,15 @@ rec { buildInputs = [ TestMore ]; }; + HTTPRequest = buildPerlPackage rec { + name = "HTTP-Message-6.03"; + src = fetchurl { + url = "mirror://cpan/modules/by-module/HTTP/${name}.tar.gz"; + sha256 = "c736e083bdf0eea1bb73e2dc3b66db0a8283942c0f69063afadb9a7cfa80011b"; + }; + propagatedBuildInputs = [ HTTPDate URI HTMLParser LWP ]; + }; + HTTPRequestAsCGI = buildPerlPackage rec { name = "HTTP-Request-AsCGI-1.2"; src = fetchurl { @@ -1848,6 +2018,14 @@ rec { }; }; + IOCaptureOutput = buildPerlPackage rec { + name = "IO-CaptureOutput-1.1102"; + src = fetchurl { + url = "mirror://cpan/modules/by-module/IO/${name}.tar.gz"; + sha256 = "2ea16dbecb21a3c2be49a93fb1e7e51275bed3f7ef3ac30cbdbff5d0178d43c7"; + }; + }; + IOCompress = buildPerlPackage rec { name = "IO-Compress-2.037"; src = fetchurl { @@ -1884,6 +2062,16 @@ rec { }; }; + IOSocketInet6 = buildPerlPackage rec { + name = "IO-Socket-INET6-2.69"; + src = fetchurl { + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz"; + sha256 = "accd565643969d905e199e28e60e833213ccc2026c372432df01e49b044c3045"; + }; + propagatedBuildInputs = [Socket6]; + doCheck = false; + }; + IOSocketSSL = buildPerlPackage rec { name = "IO-Socket-SSL-1.44"; src = fetchurl { @@ -2031,6 +2219,14 @@ rec { }; }; + IPCSignal = buildPerlPackage rec { + name = "IPC-Signal-1.00"; + src = fetchurl { + url = "mirror://cpan/authors/id/R/RO/ROSCH/${name}.tar.gz"; + sha256 = "1l3g0zrcwf2whwjhbpwdcridb7c77mydwxvfykqg1h6hqb4gj8bw"; + }; + }; + JSON = buildPerlPackage rec { name = "JSON-2.53"; src = fetchurl { @@ -2218,10 +2414,30 @@ rec { doCheck = false; # tries to connect to https://www.apache.org/. }; + LWPxParanoidAgent = buildPerlPackage rec { + name = "LWPx-ParanoidAgent-1.07"; + src = fetchurl { + url = "mirror://cpan/authors/id/B/BR/BRADFITZ/${name}.tar.gz"; + sha256 = "bd7ccbe6ed6b64195a967e9b2b04c185b7b97e8ec5a8835bb45dbcd42a18e76a"; + }; + doCheck = false; # 3 tests fail, probably because they try to connect to the network + propagatedBuildInputs = [ LWP NetDNS ]; + }; + maatkit = import ../development/perl-modules/maatkit { inherit fetchurl buildPerlPackage stdenv DBDmysql; }; + MailDKIM = buildPerlPackage rec { + name = "Mail-DKIM-0.39"; + src = fetchurl { + url = "mirror://cpan/authors/id/J/JA/JASLONG/${name}.tar.gz"; + sha256 = "b1425a540f514c483e80566fb3decc2c1db4162306f6ae8794cef72a2d73557b"; + }; + propagatedBuildInputs = [ CryptOpenSSLRSA NetDNS MailTools ]; + doCheck = false; # tries to access the domain name system + }; + MailIMAPClient = buildPerlPackage { name = "Mail-IMAPClient-2.2.9"; src = fetchurl { @@ -2256,6 +2472,15 @@ rec { }; }; + mimeConstruct = buildPerlPackage rec { + name = "mime-construct-1.11"; + src = fetchurl { + url = "mirror://cpan/authors/id/R/RO/ROSCH/${name}.tar.gz"; + sha256 = "00wk9950i9q6qwp1vdq9xdddgk54lqd0bhcq2hnijh8xnmhvpmsc"; + }; + buildInputs = [ ProcWaitStat ]; + }; + MIMETypes = buildPerlPackage rec { name = "MIME-Types-1.27"; src = fetchurl { @@ -2541,6 +2766,14 @@ rec { propagatedBuildInputs = [ BHooksEndOfScope DevelHide PackageStash ]; }; + NetAddrIP = buildPerlPackage rec { + name = "NetAddr-IP-4.062"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MI/MIKER/${name}.tar.gz"; + sha256 = "08c037afe314ca2e6369f8aa92eb4b8937f493f977f9f1f35ca396c1de8ed0c6"; + }; + }; + NetAmazonEC2 = buildPerlPackage rec { name = "Net-Amazon-EC2-0.14-stanaka-bc66577e13"; src = fetchurl { @@ -2693,6 +2926,24 @@ rec { }; }; + NetOpenIDCommon = buildPerlPackage rec { + name = "Net-OpenID-Common-1.14"; + src = fetchurl { + url = "mirror://cpan/authors/id/W/WR/WROG/${name}.tar.gz"; + sha256 = "24ac83539b188d85bd2c7bd67e355aab0ede3f98170b23cb50bd30b11b4387ff"; + }; + propagatedBuildInputs = [ CryptDHGMP URI HTMLParser HTTPRequest XMLSimple ]; + }; + + NetOpenIDConsumer = buildPerlPackage rec { + name = "Net-OpenID-Consumer-1.13"; + src = fetchurl { + url = "mirror://cpan/authors/id/W/WR/WROG/${name}.tar.gz"; + sha256 = "4ab927b6756366fa4cef2b54088645849f32fc7e0cd8de0a50001bbf62946fd8"; + }; + propagatedBuildInputs = [ NetOpenIDCommon JSON ]; + }; + PackageDeprecationManager = buildPerlPackage rec { name = "Package-DeprecationManager-0.11"; src = fetchurl { @@ -2895,6 +3146,15 @@ rec { doCheck = false; }; + ProcWaitStat = buildPerlPackage rec { + name = "Proc-WaitStat-1.00"; + src = fetchurl { + url = "mirror://cpan//authors/id/R/RO/ROSCH/${name}.tar.gz"; + sha256 = "1g3l8jzx06x4l4p0x7fyn4wvg6plfzl420irwwb9v447wzsn6xfh"; + }; + propagatedBuildInputs = [ IPCSignal ]; + }; + PSGI = buildPerlPackage rec { name = "PSGI-1.03"; src = fetchurl { @@ -3027,6 +3287,14 @@ rec { }; }; + ScalarString = buildPerlPackage rec { + name = "Scalar-String-0.002"; + src = fetchurl { + url = "mirror://cpan/authors/id/Z/ZE/ZEFRAM/${name}.tar.gz"; + sha256 = "d3a45cc137bb9f7d8848d5a10a5142d275a98f8dcfd3adb60593cee9d33fa6ae"; + }; + }; + ScopeGuard = buildPerlPackage { name = "Scope-Guard-0.03"; src = fetchurl { @@ -3051,6 +3319,15 @@ rec { }; }; + Socket6 = buildPerlPackage rec { + name = "Socket6-0.23"; + src = fetchurl { + url = "mirror://cpan/authors/id/U/UM/UMEMOTO/${name}.tar.gz"; + sha256 = "eda753f0197e8c3c8d4ab20a634561ce84011fa51aa5ff40d4dbcb326ace0833"; + }; + buildInputs = [ pkgs.which ]; + }; + SortVersions = buildPerlPackage rec { name = "Sort-Versions-1.5"; src = fetchurl { @@ -3898,6 +4175,20 @@ rec { }; }; + WWWCurl = buildPerlPackage rec { + name = "WWW-Curl-4.15"; + src = fetchurl { + url = "mirror://cpan/modules/by-module/WWW/${name}.tar.gz"; + sha256 = "18az7k0jsr642lp6dfy0b2s7vx0cd7sj9dgk93wff73safa09x1y"; + }; + buildInputs = [ pkgs.curl ]; + preConfigure = + '' + substituteInPlace Makefile.PL --replace '"cpp"' '"gcc -E"' + ''; + doCheck = false; # performs network access + }; + WWWMechanize = buildPerlPackage rec { name = "WWW-Mechanize-1.54"; src = fetchurl { @@ -3929,10 +4220,10 @@ rec { }; XMLLibXML = buildPerlPackage rec { - name = "XML-LibXML-1.86"; + name = "XML-LibXML-2.0001"; src = fetchurl { url = "mirror://cpan/modules/by-module/XML/${name}.tar.gz"; - sha256 = "0wgf9898vmjac4mr2k4zvz6aw7nx0yvfv8f093y6w44vv6prxchp"; + sha256 = "1zx4fqi531yzaf1c5cw1qwb9vy37fksz35a7pp6pic9v8jvz09x6"; }; SKIP_SAX_INSTALL = 1; buildInputs = [ pkgs.libxml2 ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a547294103b..0cd489fb176 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -33,12 +33,11 @@ let pythonPackages = python.modules // rec { afew = buildPythonPackage rec { - rev = "8abd64bfdcd83a486b2a3977c08fe071523b2551"; - name = "afew-1.0pre${rev}"; + name = "afew-1.0pre"; src = fetchurl { - url = "https://github.com/teythoon/afew/tarball/${rev}"; + url = "https://github.com/teythoon/afew/tarball/master"; name = "${name}.tar.bz"; - sha256 = "9b140d0eb0e5013419983604bb09a51f087a4abdf0a390c24a9596f867dc8c05"; + sha256 = "949710f8dcf503f42f2a2d77ea71e48ccf70155a764f75ad29cc93edc120809b"; }; propagatedBuildInputs = [ notmuch pkgs.dbacl ]; @@ -60,18 +59,17 @@ let pythonPackages = python.modules // rec { alot = buildPythonPackage rec { - version = "0.3.1"; - name = "alot-${version}"; + name = "alot-0.3.1"; src = fetchurl { - url = "https://github.com/pazz/alot/tarball/${version}"; + url = "https://github.com/pazz/alot/tarball/master"; name = "${name}.tar.bz"; - md5 = "6c5986d9192863879e95a3f8f30ccb75"; + sha256 = "06683de36688615d3d526198c93133e1131897c888ffa31e83f1ad292eae57af"; }; doCheck = false; - propagatedBuildInputs = [ notmuch urwid twisted magic configobj ]; + propagatedBuildInputs = [ notmuch urwid twisted magic configobj pygpgme ]; postInstall = '' wrapProgram $out/bin/alot \ @@ -140,6 +138,20 @@ let pythonPackages = python.modules // rec { }; + area53 = buildPythonPackage (rec { + name = "area53-b2c9cdcabd"; + + src = fetchgit { + url = git://github.com/mariusv/Area53.git; + rev = "b2c9cdcabd"; + sha256 = "b0c12b8c48ed9180c7475fab18de50d63e1b517cfb46da4d2c66fc406fe902bc"; + }; + installCommand = "python setup.py install --prefix=$out"; + doCheck = false; + propagatedBuildInputs = [ boto ]; + }); + + argparse = buildPythonPackage (rec { name = "argparse-1.1"; @@ -171,6 +183,7 @@ let pythonPackages = python.modules // rec { }; }); + astng = buildPythonPackage rec { name = "logilab-astng-0.21.1"; @@ -509,11 +522,28 @@ let pythonPackages = python.modules // rec { django = buildPythonPackage rec { name = "Django-${version}"; - version = "1.4"; + version = "1.4.1"; src = fetchurl { - url = "http://www.djangoproject.com/m/releases/${version}/${name}.tar.gz"; - sha256 = "1sc8ajixaqfylb7jmmhn38hgbnqipylh1sqmpicx7rqhxbxvm5n0"; + url = "http://www.djangoproject.com/m/releases/1.4/${name}.tar.gz"; + sha256 = "16s0anvpaccbqmdrhl71z73k0dy2sl166nnc2fbd5lshlgmj13ad"; + }; + + doCheck = false; + + meta = { + description = "A high-level Python Web framework"; + homepage = https://www.djangoproject.com/; + }; + }; + + + django_1_3 = buildPythonPackage rec { + name = "Django-1.3.2"; + + src = fetchurl { + url = "http://www.djangoproject.com/m/releases/1.3/${name}.tar.gz"; + sha256 = "0r6pdm33x96aba9x36jvqpkh2bf1zixnzvr12mcc8qq8wc7hii3j"; }; doCheck = false; @@ -533,7 +563,7 @@ let pythonPackages = python.modules // rec { md5 = "24b8373916f53f74d701b99a6cf41409"; }; - propagatedBuildInputs = [ django ]; + propagatedBuildInputs = [ django_1_3 ]; meta = { description = "A database schema evolution tool for the Django web framework"; @@ -543,14 +573,14 @@ let pythonPackages = python.modules // rec { djblets = buildPythonPackage rec { - name = "Djblets-0.6.16"; + name = "Djblets-0.6.19"; src = fetchurl { - url = "http://downloads.reviewboard.org/releases/Djblets/0.6/Djblets-0.6.16.tar.gz"; - sha256 = "1793jy0y5w79p8395lvvdlmvdybgwvc5lvgzmk1csf08ba772vc4"; + url = "http://downloads.reviewboard.org/releases/Djblets/0.6/${name}.tar.gz"; + sha256 = "1hhvpi81yknvlaazq1cpgamp9vf3x1fcr0ba64q3j2yz1kgin1i8"; }; - propagatedBuildInputs = [ pkgs.pil django ]; + propagatedBuildInputs = [ pkgs.pil django_1_3 ]; meta = { description = "A collection of useful extensions for Django"; @@ -671,6 +701,24 @@ let pythonPackages = python.modules // rec { }; + flask = buildPythonPackage { + name = "flask-0.9"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/F/Flask/Flask-0.9.tar.gz"; + md5 = "4a89ef2b3ab0f151f781182bd0cc8933"; + }; + + propagatedBuildInputs = [ werkzeug jinja2 ]; + + meta = { + homepage = http://flask.pocoo.org/; + description = "A microframework based on Werkzeug, Jinja 2, and good intentions"; + license = "BSD"; + }; + }; + + flup = buildPythonPackage (rec { name = "flup-1.0.2"; @@ -719,6 +767,24 @@ let pythonPackages = python.modules // rec { }; }); + fuse = buildPythonPackage (rec { + baseName = "fuse"; + version = "0.2.1"; + name = "${baseName}-${version}"; + + src = fetchurl { + url = "http://downloads.sourceforge.net/sourceforge/fuse/fuse-python-${version}.tar.gz"; + sha256 = "06rmp1ap6flh64m81j0n3a357ij2vj9zwcvvw0p31y6hz1id9shi"; + }; + + buildInputs = [ pkgs.pkgconfig pkgs.fuse ]; + + meta = { + description = "Python bindings for FUSE."; + license = stdenv.lib.licenses.lgpl21; + }; + }); + genshi = buildPythonPackage { name = "genshi-0.6"; @@ -815,6 +881,27 @@ let pythonPackages = python.modules // rec { }; + gyp = buildPythonPackage rec { + rev = "1435"; + name = "gyp-r${rev}"; + + src = fetchsvn { + url = "http://gyp.googlecode.com/svn/trunk"; + inherit rev; + sha256 = "1wmd1svx5344alb8ff9vzdam1ccqdl0h7shp1xnsk843hqwc0fz0"; + }; + + doCheck = false; + + postUnpack = "find . -print0 | xargs -0 touch"; + + meta = { + homepage = http://code.google.com/p/gyp; + description = "Generate Your Projects"; + }; + }; + + httplib2 = buildPythonPackage rec { name = "httplib2-0.6.0"; @@ -887,6 +974,25 @@ let pythonPackages = python.modules // rec { }; + pylast = buildPythonPackage rec { + name = "pylast-${version}"; + version = "0.5.11"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/pylast/${name}.tar.gz"; + md5 = "506cf1b13020b3ed2f3c845ea0c9830e"; + }; + + doCheck = false; + + meta = { + homepage = http://code.google.com/p/pylast/; + description = "A python interface to last.fm (and compatibles)"; + license = pkgs.lib.licenses.asl20; + }; + }; + + libcloud = buildPythonPackage (rec { name = "libcloud-0.3.1"; @@ -1445,6 +1551,23 @@ let pythonPackages = python.modules // rec { }; + pep8 = buildPythonPackage rec { + name = "pep8-${version}"; + version = "1.3.3"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/pep8/${name}.tar.gz"; + md5 = "093a99ced0cc3b58c01549d7350f5a73"; + }; + + meta = { + homepage = http://pypi.python.org/pypi/pep8/; + description = "Python style guide checker"; + license = pkgs.lib.licenses.mit; + }; + }; + + pexpect = buildPythonPackage { name = "pexpect-2.3"; @@ -1650,6 +1773,53 @@ let pythonPackages = python.modules // rec { }; + pygpgme = buildPythonPackage rec { + version = "0.3"; + name = "pygpgme-${version}"; + + src = fetchurl { + url = "https://launchpad.net/pygpgme/trunk/${version}/+download/${name}.tar.gz"; + sha256 = "5fd887c407015296a8fd3f4b867fe0fcca3179de97ccde90449853a3dfb802e1"; + }; + + doCheck = false; + + propagatedBuildInputs = [ pkgs.gpgme ]; + + meta = { + homepage = "https://launchpad.net/pygpgme"; + description = "A Python wrapper for the GPGME library."; + license = pkgs.lib.licenses.lgpl21; + maintainers = [ stdenv.lib.maintainers.garbas ]; + platforms = python.meta.platforms; + }; + }; + + + pyinotify = pkgs.stdenv.mkDerivation rec { + name = "python-pyinotify-${version}"; + version = "0.9.3"; + + src = fetchgit { + url = "git://github.com/seb-m/pyinotify.git"; + rev = "refs/tags/${version}"; + sha256 = "d38ce95e4af00391e58246a8d7fe42bdb51d63054b09809600b2faef2a803472"; + }; + + buildInputs = [ python ]; + + installPhase = '' + python setup.py install --prefix=$out + ''; + + meta = { + homepage = https://github.com/seb-m/pyinotify/wiki; + description = "Monitor filesystems events on Linux platforms with inotify"; + license = pkgs.lib.licenses.mit; + }; + }; + + pyparsing = buildPythonPackage rec { name = "pyparsing-1.5.6"; @@ -1678,7 +1848,26 @@ let pythonPackages = python.modules // rec { propagatedBuildInputs = [pkgs.openldap pkgs.cyrus_sasl pkgs.openssl]; }; - + + pylibacl = buildPythonPackage (rec { + name = "pylibacl-0.5.1"; + + src = fetchurl { + url = "https://github.com/downloads/iustin/pylibacl/${name}.tar.gz"; + sha256 = "1idks7j9bn62xzsaxkvhl7bdq6ws8kv8aa0wahfh7724qlbbcf1k"; + }; + + doCheck = false; + + buildInputs = [ pkgs.acl ]; + + meta = { + description = "A Python extension module for POSIX ACLs. It can be used to query, list, add, and remove ACLs from files and directories under operating systems that support them."; + license = stdenv.lib.licenses.lgpl21Plus; + }; + }); + + pylint = buildPythonPackage rec { name = "pylint-0.23.0"; @@ -1917,7 +2106,26 @@ let pythonPackages = python.modules // rec { }; }); - + + pyxattr = buildPythonPackage (rec { + name = "pyxattr-0.5.1"; + + src = fetchurl { + url = "https://github.com/downloads/iustin/pyxattr/${name}.tar.gz"; + sha256 = "0jmkffik6hdzs7ng8c65bggss2ai40nm59jykswdf5lpd36cxddq"; + }; + + doCheck = false; + + buildInputs = [ pkgs.attr ]; + + meta = { + description = "A Python extension module which gives access to the extended attributes for filesystem objects available in some operating systems."; + license = stdenv.lib.licenses.lgpl21Plus; + }; + }); + + pyyaml = buildPythonPackage (rec { name = "PyYAML-3.09"; @@ -1986,17 +2194,17 @@ let pythonPackages = python.modules // rec { reviewboard = buildPythonPackage rec { - name = "ReviewBoard-1.6.6"; + name = "ReviewBoard-1.6.9"; src = fetchurl { url = "http://downloads.reviewboard.org/releases/ReviewBoard/1.6/${name}.tar.gz"; - sha256 = "de965f48c9e63198d3c7c2bb2e8404170868e8c0ee4d6ab796abb9b1ccda6c1d"; + sha256 = "06pwbmqwsb0g2y8zg5hk5ibaivsl1af7v0vnkqranimf4yaa10mc"; }; propagatedBuildInputs = [ recaptcha_client pytz memcached dateutil paramiko flup pygments - djblets django django_evolution pkgs.pycrypto python.modules.sqlite3 - pysvn pkgs.pil + djblets django_1_3 django_evolution pkgs.pycrypto python.modules.sqlite3 + pysvn pkgs.pil psycopg2 ]; }; @@ -2011,11 +2219,6 @@ let pythonPackages = python.modules // rec { doCheck = false; - postInstall = '' - find $out -name easy-install.pth | xargs rm -v - find $out -name 'site.py*' | xargs rm -v - ''; - meta = { description = "RDFLib is a Python library for working with RDF, a simple yet powerful language for representing information."; homepage = http://www.rdflib.net/; @@ -2129,6 +2332,34 @@ let pythonPackages = python.modules // rec { }; }; + selenium = + buildPythonPackage rec { + name = "selenium-2.25.0"; + src = pkgs.fetchurl { + url = http://pypi.python.org/packages/source/s/selenium/selenium-2.25.0.tar.gz; + sha256 = "0iinpry1vr4dydh44sc0ny22sa9fqhy2302hf56pf8fakvza9m0a"; + }; + + buildInputs = [pkgs.xlibs.libX11]; + + # Recompiling x_ignore_nofocus.so as the original one dlopen's libX11.so.6 by some + # absolute paths. Replaced by relative path so it is found when used in nix. + x_ignore_nofocus = + pkgs.fetchsvn { + url = http://selenium.googlecode.com/svn/tags/selenium-2.25.0/cpp/linux-specific; + rev = 17641; + sha256 = "1wif9r6307qhlcp2zbg6n05yvxxn9ppkxh8gpsplcbyh22zi7bcd"; + }; + + preInstallPhases = "preInstall"; + preInstall = '' + cp ${x_ignore_nofocus}/* . + sed -i 's|dlopen(library,|dlopen("libX11.so.6",|' x_ignore_nofocus.c + gcc -c -fPIC x_ignore_nofocus.c -o x_ignore_nofocus.o + gcc -shared -Wl,-soname,x_ignore_nofocus.so -o x_ignore_nofocus.so x_ignore_nofocus.o + cp -v x_ignore_nofocus.so py/selenium/webdriver/firefox/${if pkgs.stdenv.is64bit then "amd64" else "x86"}/ + ''; + }; setuptoolsDarcs = buildPythonPackage { name = "setuptools-darcs-1.2.9"; @@ -2457,6 +2688,28 @@ let pythonPackages = python.modules // rec { }; }; + + urlgrabber = buildPythonPackage rec { + name = "urlgrabber-3.9.1"; + + src = fetchurl { + url = "http://urlgrabber.baseurl.org/download/${name}.tar.gz"; + sha256 = "4437076c8708e5754ea04540e46c7f4f233734ee3590bb8a96389264fb0650d0"; + }; + + doCheck = false; + + propagatedBuildInputs = [ pycurl ]; + + meta = { + homepage = "urlgrabber.baseurl.org"; + license = "LGPLv2+"; + description = "Python module for downloading files"; + maintainers = [ stdenv.lib.maintainers.qknight ]; + }; + }; + + urwid = buildPythonPackage (rec { name = "urwid-1.0.1"; @@ -2485,6 +2738,8 @@ let pythonPackages = python.modules // rec { patches = [ ../development/python-modules/virtualenv-change-prefix.patch ]; + propagatedBuildInputs = [ python.modules.readline python.modules.sqlite3 ]; + doCheck = false; meta = with stdenv.lib; { @@ -2552,6 +2807,22 @@ let pythonPackages = python.modules // rec { }; + werkzeug = buildPythonPackage { + name = "werkzeug-0.8.3"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/W/Werkzeug/Werkzeug-0.8.3.tar.gz"; + md5 = "12aa03e302ce49da98703938f257347a"; + }; + + meta = { + homepage = http://werkzeug.pocoo.org/; + description = "A WSGI utility library for Python"; + license = "BSD"; + }; + }; + + wxPython = wxPython28; @@ -2668,11 +2939,11 @@ let pythonPackages = python.modules // rec { }; cliapp = buildPythonPackage rec { - name = "cliapp-0.29"; + name = "cliapp-1.20120630"; src = fetchurl rec { - url = "http://code.liw.fi/debian/pool/main/p/python-cliapp/python-cliapp_0.29.orig.tar.gz"; - sha256 = "4a3f2e1705c5e9ac5a80a460ae9bad8e88c0778f7013638eda39e3ee0dd008b2"; + url = "http://code.liw.fi/debian/pool/main/p/python-cliapp/python-cliapp_1.20120630.orig.tar.gz"; + sha256 = "6beeb1fb3077561540094584ce36055266ac67b80f158b9b82fe4075096f4716"; }; buildInputs = [ sphinx ]; @@ -2708,11 +2979,11 @@ let pythonPackages = python.modules // rec { }; ttystatus = buildPythonPackage rec { - name = "ttystatus-0.18"; + name = "ttystatus-0.19"; src = fetchurl rec { - url = "http://code.liw.fi/debian/pool/main/p/python-ttystatus/python-ttystatus_0.18.orig.tar.gz"; - sha256 = "9fab747f3e1f474b66101354b06f943120d72d1f1e353b4692e7e6cca226b9cc"; + url = "http://code.liw.fi/debian/pool/main/p/python-ttystatus/python-ttystatus_0.19.orig.tar.gz"; + sha256 = "7cc112a4783f2e0c354c5244f8e50b18733b5957677b56a755c1016e04c0c28d"; }; buildInputs = [ sphinx ]; @@ -2728,11 +2999,11 @@ let pythonPackages = python.modules // rec { }; larch = buildPythonPackage rec { - name = "larch-0.31"; + name = "larch-1.20120527"; src = fetchurl rec { - url = "http://code.liw.fi/debian/pool/main/p/python-larch/python-larch_0.31.orig.tar.gz"; - sha256 = "18c243a45b35974c304c9b3d8b05718f1272f14c29cd3c9010800cf821064444"; + url = "http://code.liw.fi/debian/pool/main/p/python-larch/python-larch_1.20120527.orig.tar.gz"; + sha256 = "2865a1bfa6bd276bf746e8e7cb73d5199d0b6d00045d8c92e158626687d3bbe1"; }; buildInputs = [ sphinx ]; diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix index 36cf8d2910d..8003ad32105 100644 --- a/pkgs/top-level/release-small.nix +++ b/pkgs/top-level/release-small.nix @@ -24,7 +24,6 @@ with (import ./release-lib.nix); autoconf = all; automake110x = all; automake111x = all; - automake19x = all; avahi = allBut "i686-cygwin"; # Cygwin builds fail bash = all; bashInteractive = all; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 5e0aeea2da6..390c8855e56 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -26,7 +26,6 @@ with (import ./release-lib.nix); autoconf = all; automake110x = all; automake111x = all; - automake19x = all; avahi = allBut "i686-cygwin"; # Cygwin builds fail bash = all; bashInteractive = all; @@ -103,7 +102,7 @@ with (import ./release-lib.nix); ghdl = linux; ghostscript = linux; ghostscriptX = linux; - gimp = linux; + gimp_2_8 = linux; git = linux; gitFull = linux; glibc = linux; @@ -360,6 +359,7 @@ with (import ./release-lib.nix); firefox36Pkgs.firefox = linux; firefox12Pkgs.firefox = linux; firefox13Pkgs.firefox = linux; + firefox15Pkgs.firefox = linux; gnome = { gnome_panel = linux; @@ -447,7 +447,7 @@ with (import ./release-lib.nix); xlsclients = linux; xmessage = linux; xorgserver = linux; - xprop = linux; + xprop = linux; xrandr = linux; xrdb = linux; xset = linux; @@ -473,4 +473,3 @@ with (import ./release-lib.nix); }; } )) -