diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000000..6405b7860f2 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +*~ +,* diff --git a/pkgs/applications/audio/ardour/ardour3.nix b/pkgs/applications/audio/ardour/ardour3.nix index c34576016ad..c803ec07618 100644 --- a/pkgs/applications/audio/ardour/ardour3.nix +++ b/pkgs/applications/audio/ardour/ardour3.nix @@ -2,8 +2,8 @@ , 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 @@ -19,11 +19,14 @@ stdenv.mkDerivation { sha256 = "0a68xb3l36m5908y3airxw1b3bymhrjrf1l492mgcvviq6pn7pmk"; }; - 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/linuxsampler/default.nix b/pkgs/applications/audio/linuxsampler/default.nix index a100390c270..1ef081c84d0 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}"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ alsaLib asio autoconf automake bison jackaudio libgig libsndfile - libtool pkgconfig + libtool lv2 pkgconfig ]; meta = with stdenv.lib; { 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/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/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..f3fb575c6e5 100644 --- a/pkgs/applications/misc/ikiwiki/default.nix +++ b/pkgs/applications/misc/ikiwiki/default.nix @@ -1,32 +1,49 @@ -{ 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 , 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.20120629"; + + 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 = "7e39cdb727f261ce20fde5f0b05966680589a3d028c569780addd4b530382f07"; }; 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 ] + ++ 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 +59,26 @@ 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 ''; + 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/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 889c2ad8318..4c3a02dcecc 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -1,5 +1,8 @@ { stdenv, getConfig, fetchurl, makeWrapper, which +# this is needed in order to build the versions older than 21.x +, subversion + # default dependencies , bzip2, flac, speex , libevent, expat, libjpeg @@ -26,6 +29,7 @@ let mkConfigurable = stdenv.lib.mapAttrs (flag: default: getConfig ["chromium" flag] default); config = mkConfigurable { + channel = "stable"; selinux = false; nacl = false; openssl = true; @@ -36,7 +40,7 @@ let pulseaudio = getConfig ["pulseaudio"] true; }; - sourceInfo = import ./source.nix; + sourceInfo = builtins.getAttr config.channel (import ./sources.nix); mkGypFlags = with stdenv.lib; let sanitize = value: @@ -69,12 +73,14 @@ let use_system_v8 = false; }; + needsSubversion = stdenv.lib.versionOlder sourceInfo.version "21.0.0.0"; + defaultDependencies = [ bzip2 flac speex libevent expat libjpeg libpng libxml2 libxslt xdg_utils yasm zlib - ]; + ] ++ stdenv.lib.optional needsSubversion subversion; in stdenv.mkDerivation rec { name = "${packageName}-${version}"; 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..93cc3a993b1 --- /dev/null +++ b/pkgs/applications/networking/browsers/chromium/sources.nix @@ -0,0 +1,19 @@ +# This file is autogenerated from update.sh in the same directory. +# VHASH: 545cfbcd1fc31d037d1e6b5382995075d2a875a51d181cc26851e49dbd2227d8 +{ + dev = { + version = "22.0.1207.1"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-22.0.1207.1.tar.bz2"; + sha256 = "1kzzaaczz1mwsfw7fn8la6h4yls2wy537ypabqgwyim01jhfmilp"; + }; + beta = { + version = "21.0.1180.41"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-21.0.1180.41.tar.bz2"; + sha256 = "1225ny7y5msyk44lb5dspd4aq0yiaawsb5xi9g8iimiv80j4h34a"; + }; + stable = { + version = "20.0.1132.57"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-20.0.1132.57.tar.bz2"; + sha256 = "06v4ybvaj3gx1v4visfyfzbq2q3xasa8xlf05f4wi2bf62vcc98j"; + }; +} diff --git a/pkgs/applications/networking/browsers/chromium/update.sh b/pkgs/applications/networking/browsers/chromium/update.sh index 066cd1c147f..c9dd69df9a2 100755 --- a/pkgs/applications/networking/browsers/chromium/update.sh +++ b/pkgs/applications/networking/browsers/chromium/update.sh @@ -1,34 +1,50 @@ #!/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() +get_channels() { - curl -s "$bucket_url" | sed -ne ' H;/<[Kk][Ee][Yy]>chromium-[^<]*chromium-\([^<.]\+\(\.[^<.]\+\)\+\)\.tar\.bz2<.*$/\1/p - }'; + for chline in $(echo "$1" | cut -d, -f-2); + do + channel="${chline%%,*}"; + version="${chline##*,}"; + + url="${bucket_url%/}/chromium-$version.tar.bz2"; + + sha256="$(nix-prefetch-url "$url")"; + + echo " $channel = {"; + echo " version = \"$version\";"; + echo " url = \"$url\";"; + echo " sha256 = \"$sha256\";"; + echo " };"; + done; } cd "$(dirname "$0")"; -version="$(get_newest_version)"; +versions="$(curl -s "$channels_url" | sed -n -e 's/^linux,\(\([^,]\+,\)\{2\}\).*$/\1/p')"; -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; +if [ -e "$output_file" ]; +then + vhash="$(echo "$versions" | sha256sum | cut -d' ' -f1)"; + old_vhash="$(sed -n 's/# *VHASH: *//p' "$output_file")"; + + if [ "x$vhash" = "x$old_vhash" ]; + then + echo "$output_file is already up to date, bailing out." >&2; exit 1; fi; fi; -url="${bucket_url%/}/chromium-$version.tar.bz2"; +channels="$(get_channels "$versions")"; -sha256="$(nix-prefetch-url "$url")"; - -cat > source.nix < "$output_file" <<-EOF +# This file is autogenerated from update.sh in the same directory. +# VHASH: $vhash { - version = "$version"; - url = "$url"; - sha256 = "$sha256"; +$channels } EOF 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..86588f2ed97 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 @@ -46,12 +46,12 @@ stdenv.mkDerivation { if stdenv.system == "x86_64-linux" then fetchurl { url = "http://dl.google.com/linux/direct/google-talkplugin_current_x86_64.rpm"; - sha256 = "1dma067h7qj8rbcnm0n7wy3wd1clkysq9xj4kaxijbb5zrw06k3q"; + sha256 = "1lgvv6bkdc5knghyn4gsg5gp7h3qyr4rb978gsi39gkvcazksm0b"; } else if stdenv.system == "i686-linux" then fetchurl { url = "http://dl.google.com/linux/direct/google-talkplugin_current_i386.rpm"; - sha256 = "02ymhhbfby0sn9132cvdr6jp9c7sk6hfg0jwg1fc3kzjg7q3y7fs"; + sha256 = "0k9j27pklwb3vih2cydz9552p9270p73hdi14f0bmn6afxjxd13m"; } else throw "Google Talk does not support your platform."; 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/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/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/yafc/default.nix b/pkgs/applications/networking/yafc/default.nix index a6c3c43417e..7089c7507db 100644 --- a/pkgs/applications/networking/yafc/default.nix +++ b/pkgs/applications/networking/yafc/default.nix @@ -1,21 +1,19 @@ -{stdenv, fetchurl, readline, openssh}: +{stdenv, fetchurl, readline, libssh, intltool}: -stdenv.mkDerivation { - name = "yafc-1.1.1"; +stdenv.mkDerivation rec { + name = "yafc"; + version = "1.2.0"; src = fetchurl { - url = mirror://sourceforge/yafc/yafc-1.1.1.tar.bz2; - sha256 = "ab72b2ed89fb75dbe8ebd119458cf513392225f367cccfad881e9780aefcd7e6"; + url = "https://github.com/downloads/sebastinas/yafc/${name}-${version}.tar.xz"; + sha256 = "0h5cbvvfkigvzfqqzvgqpn8m0ilyng3rgyh85c0mi48klzv8kb58"; }; - 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/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/mr/default.nix b/pkgs/applications/version-management/mr/default.nix new file mode 100644 index 00000000000..ca272504517 --- /dev/null +++ b/pkgs/applications/version-management/mr/default.nix @@ -0,0 +1,57 @@ +{ stdenv, fetchgit, fetchgitrevision, perl }: + +stdenv.mkDerivation rec { + + version = "1.12"; + name = "mr-" + version; + + src = fetchgit { + url = "git://git.kitenet.net/mr.git"; + rev = "353f63c968368edea9b14261f510c34ce4e0c97f"; + }; + + buildInputs = [perl]; + + buildPhase = '' + make build + ''; + + installPhase = '' + ensureDir $out/bin + ensureDir $out/share/man/man1 + cp mr $out/bin + cp webcheckout $out/bin + cp mr.1 $out/share/man/man1 + cp 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/virtualization/xen/default.nix b/pkgs/applications/virtualization/xen/default.nix index ce799242e12..d898daad2a7 100644 --- a/pkgs/applications/virtualization/xen/default.nix +++ b/pkgs/applications/virtualization/xen/default.nix @@ -6,7 +6,7 @@ with stdenv.lib; let - version = "4.0.3"; + version = "4.1.2"; libDir = if stdenv.is64bit then "lib64" else "lib"; @@ -30,23 +30,24 @@ let } ]; -in + ipxeSrc = + { url = http://xenbits.xensource.com/xen-extfiles/ipxe-git-v1.0.0.tar.gz; + sha256 = "d3128bfda9a1542049c278755f85bbcbb8441da7bfd702d511ce237fcf86a723"; + }; +in stdenv.mkDerivation { name = "xen-${version}"; src = fetchurl { url = "http://bits.xensource.com/oss-xen/release/${version}/xen-${version}.tar.gz"; - sha256 = "0p4i7mm8cdsr8i9z3dij6nriyvz6la2rhm7jkyk2n8h62nnxi1b5"; + sha256 = "7d9c93057cf480d3f1efa792b19285a84fa3c06060ea5c5c453be00887389b0d"; }; patches = [ # Xen looks for headers in /usr/include and for libraries using # ldconfig. Don't do that. ./has-header.patch - - # GCC 4.5 compatibility. - ./gcc-4.5.patch ]; buildInputs = @@ -102,12 +103,18 @@ stdenv.mkDerivation { --replace 'XENDOM_CONFIG=/etc/sysconfig/xendomains' "" \ --replace /bin/ls ls + grep -rl /etc/xen * | xargs sed -i 's|/etc/xen|$out/etc/xen|g' + # Xen's stubdoms need various sources that it usually fetches at # build time using wget. We can't have that. ${flip concatMapStrings stubdomSrcs (x: let src = fetchurl x; in '' cp ${src} stubdom/${src.name} '')} + ${let src = fetchurl ipxeSrc; in '' + cp ${src} tools/firmware/etherboot/ipxe.tar.gz + ''} + # Hack to get `gcc -m32' to work without having 32-bit Glibc headers. mkdir -p tools/include/gnu touch tools/include/gnu/stubs-32.h diff --git a/pkgs/applications/virtualization/xen/gcc-4.5.patch b/pkgs/applications/virtualization/xen/gcc-4.5.patch deleted file mode 100644 index a8412d69fd3..00000000000 --- a/pkgs/applications/virtualization/xen/gcc-4.5.patch +++ /dev/null @@ -1,39 +0,0 @@ -http://lists.xensource.com/archives/html/xen-devel/2010-07/msg01276.html - -diff -ru -x '*~' xen-4.0.1-orig//extras/mini-os/arch/x86/mm.c xen-4.0.1//extras/mini-os/arch/x86/mm.c ---- xen-4.0.1-orig//extras/mini-os/arch/x86/mm.c 2010-08-25 12:22:07.000000000 +0200 -+++ xen-4.0.1//extras/mini-os/arch/x86/mm.c 2010-12-22 20:10:05.000000000 +0100 -@@ -281,7 +281,7 @@ - /* - * Mark portion of the address space read only. - */ --extern void shared_info; -+extern char shared_info[PAGE_SIZE]; - static void set_readonly(void *text, void *etext) - { - unsigned long start_address = -diff -ru -x '*~' xen-4.0.1-orig//extras/mini-os/minios.mk xen-4.0.1//extras/mini-os/minios.mk ---- xen-4.0.1-orig//extras/mini-os/minios.mk 2010-08-25 12:22:07.000000000 +0200 -+++ xen-4.0.1//extras/mini-os/minios.mk 2010-12-22 20:03:11.000000000 +0100 -@@ -10,6 +10,7 @@ - DEF_CFLAGS += $(call cc-option,$(CC),-fno-stack-protector,) - DEF_CFLAGS += $(call cc-option,$(CC),-fgnu89-inline) - DEF_CFLAGS += -Wstrict-prototypes -Wnested-externs -Wpointer-arith -Winline -+DEF_CFLAGS += -Wno-uninitialized - DEF_CPPFLAGS += -D__XEN_INTERFACE_VERSION__=$(XEN_INTERFACE_VERSION) - - DEF_ASFLAGS += -D__ASSEMBLY__ -diff -ru -x '*~' xen-4.0.1-orig//extras/mini-os/netfront.c xen-4.0.1//extras/mini-os/netfront.c ---- xen-4.0.1-orig//extras/mini-os/netfront.c 2010-08-25 12:22:07.000000000 +0200 -+++ xen-4.0.1//extras/mini-os/netfront.c 2010-12-22 19:56:59.000000000 +0100 -@@ -25,8 +25,8 @@ - - - --#define NET_TX_RING_SIZE __RING_SIZE((struct netif_tx_sring *)0, PAGE_SIZE) --#define NET_RX_RING_SIZE __RING_SIZE((struct netif_rx_sring *)0, PAGE_SIZE) -+#define NET_TX_RING_SIZE __CONST_RING_SIZE(netif_tx, PAGE_SIZE) -+#define NET_RX_RING_SIZE __CONST_RING_SIZE(netif_rx, PAGE_SIZE) - #define GRANT_INVALID_REF 0 - - 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/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/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/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/sbcl/src-for-default.nix b/pkgs/development/compilers/sbcl/src-for-default.nix index 66e389947a0..467ed05a6a4 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.57"; + name="sbcl-1.0.57"; + hash="1vvifyq0lapx6p6wz6jknsgch3lbyr7m785844wdgkdx2hh8ch51"; + url="http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.57/sbcl-1.0.57-source.tar.bz2"; + advertisedUrl="http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.57/sbcl-1.0.57-source.tar.bz2"; } 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..0e1e21ed962 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 ]; diff --git a/pkgs/development/interpreters/php/5.3.nix b/pkgs/development/interpreters/php/5.3.nix index d071070f9a6..48eb8ac5ee9 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.14"; name = "php-${version}"; @@ -157,7 +157,7 @@ composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in { src = args.fetchurl { url = "http://nl.php.net/get/php-${version}.tar.bz2/from/this/mirror"; - sha256 = "16yr678bgks6hlhmmmi5s9ivhcx1f1bhvxkk3zrlkr3bn4sp46pg"; + sha256 = "1cqw0knkrb7wn49ki5kcly4i0hjnd12sf9l4rhk0vny5hdp5n1y8"; 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/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/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/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/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/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/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/haskell/HUnit/1.2.5.0.nix b/pkgs/development/libraries/haskell/HUnit/1.2.5.0.nix new file mode 100644 index 00000000000..cf5a68b803c --- /dev/null +++ b/pkgs/development/libraries/haskell/HUnit/1.2.5.0.nix @@ -0,0 +1,15 @@ +{ cabal, deepseq }: + +cabal.mkDerivation (self: { + pname = "HUnit"; + version = "1.2.5.0"; + sha256 = "0yxa3clrrjwg9faa3vsqb44xdzhdgwji56lrh7sa7dgq8bv1h6nr"; + 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/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/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/Vec/default.nix b/pkgs/development/libraries/haskell/Vec/default.nix index 77cc9e37a9d..996cfd1a78c 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"; + sha256 = "1lyi7di92q1f0k08nj7766nm0ygaqdrjdphnb6imvyrsmjrspaqk"; 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/accelerate-cuda/default.nix b/pkgs/development/libraries/haskell/accelerate-cuda/default.nix index aae77de6c6c..4ed0f4ea5e3 100644 --- a/pkgs/development/libraries/haskell/accelerate-cuda/default.nix +++ b/pkgs/development/libraries/haskell/accelerate-cuda/default.nix @@ -12,6 +12,9 @@ cabal.mkDerivation (self: { hashable hashtables languageCQuote mainlandPretty mtl srcloc transformers unorderedContainers ]; + patchPhase = '' + sed -i -e 's|\|defaultMainWithHooks autoconfUserHooks|' Setup.hs + ''; meta = { homepage = "http://www.cse.unsw.edu.au/~chak/project/accelerate/"; description = "Accelerate backend for NVIDIA GPUs"; diff --git a/pkgs/development/libraries/haskell/async/default.nix b/pkgs/development/libraries/haskell/async/default.nix index 15cef9b35f1..ca759009817 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.1"; + sha256 = "132xr0sb3j02s134my4p7khj95d3v3jlpxqjrgn6h8brw0gp6wcq"; buildDepends = [ stm ]; meta = { homepage = "https://github.com/simonmar/async"; 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/benchpress/default.nix b/pkgs/development/libraries/haskell/benchpress/default.nix index 8be4478ce63..9d1720541bf 100644 --- a/pkgs/development/libraries/haskell/benchpress/default.nix +++ b/pkgs/development/libraries/haskell/benchpress/default.nix @@ -5,6 +5,9 @@ cabal.mkDerivation (self: { version = "0.2.2.4"; sha256 = "0cabjx0gkbk5blqkm9pmnz8kmi3573367365gny4r3m431iwxgnf"; buildDepends = [ mtl time ]; + patchPhase = '' + sed -i -e 's|base .*,|base,|' -e 's|mtl .*,|mtl,|' benchpress.cabal + ''; meta = { homepage = "http://github.com/tibbe/benchpress"; description = "Micro-benchmarking with detailed statistics"; 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/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/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-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/gitit/default.nix b/pkgs/development/libraries/haskell/gitit/default.nix index 7f15c201999..148750e9ddc 100644 --- a/pkgs/development/libraries/haskell/gitit/default.nix +++ b/pkgs/development/libraries/haskell/gitit/default.nix @@ -18,6 +18,9 @@ cabal.mkDerivation (self: { safe SHA syb tagsoup text time url utf8String xhtml xml xssSanitize zlib ]; + patchPhase = '' + sed -i -e 's|hslogger.*,|hslogger,|' gitit.cabal + ''; meta = { homepage = "http://gitit.net"; description = "Wiki using happstack, git or darcs, and pandoc"; 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..621a7e9c4c5 --- /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.2"; + sha256 = "0y7imgzcnh6x36m5f6mns5ay1xhxy5p6i5nh16p2ywzjj0padcg8"; + 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/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix index 11e4d90205c..8dfeb9413d3 100644 --- a/pkgs/development/libraries/haskell/hakyll/default.nix +++ b/pkgs/development/libraries/haskell/hakyll/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "hakyll"; - version = "3.3.0.1"; - sha256 = "1rymj7j97803hy7nv235m29m0rird1c0ik81mkaicdfiabkihmrq"; + version = "3.4.0.0"; + sha256 = "1m69kzjbsspf69qc3yq6qhpnk3vd3k5qa7zssazm8717sgrb2z9m"; buildDepends = [ binary blazeHtml blazeMarkup citeprocHs cryptohash filepath hamlet mtl pandoc parsec regexBase regexTdfa snapCore snapServer tagsoup diff --git a/pkgs/development/libraries/haskell/happstack/happstack-server.nix b/pkgs/development/libraries/haskell/happstack/happstack-server.nix index 97cfd0173b9..39f93102da0 100644 --- a/pkgs/development/libraries/haskell/happstack/happstack-server.nix +++ b/pkgs/development/libraries/haskell/happstack/happstack-server.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "happstack-server"; - version = "7.0.2"; - sha256 = "0p4vy1h3nkq7riipizljc9wz64y3jfiyq5vzv1r963badk3q0xzb"; + version = "7.0.3"; + sha256 = "06r5h1jhb4h9hra7radhr3rq404283nwv4mhppfxsh4adk5ng0qy"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/hastache/default.nix b/pkgs/development/libraries/haskell/hastache/default.nix index ef11e344b44..54decaa5ecb 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.1"; + sha256 = "1d6d3bmmfx1jh38hhmvaq1ncdxlfjc0mc7jvbxqgr00dg73wfgdk"; 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/hledger-lib/default.nix b/pkgs/development/libraries/haskell/hledger-lib/default.nix index fb517c3cef1..ef244bcb768 100644 --- a/pkgs/development/libraries/haskell/hledger-lib/default.nix +++ b/pkgs/development/libraries/haskell/hledger-lib/default.nix @@ -4,8 +4,8 @@ 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 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..815ca1b87fd 100644 --- a/pkgs/development/libraries/haskell/hledger/default.nix +++ b/pkgs/development/libraries/haskell/hledger/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "hledger"; - version = "0.18.1"; - sha256 = "0nrs9qawvny6dl0pj3f183sgwmam9dsb2dfhp8hqnxx48g1p01lk"; + version = "0.18.2"; + sha256 = "1i0rix3h5vrq9j01fzgwyhs2n8nfzhidi4rjlvn402ps0w6j15ld"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/hoauth/default.nix b/pkgs/development/libraries/haskell/hoauth/default.nix new file mode 100644 index 00000000000..e118f765097 --- /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.4"; + sha256 = "0a8a77smzhxmynfi0ayvsgibpw9aav2f7pi9j3dxjas14zg9qv2k"; + 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/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/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..a765b015a31 100644 --- a/pkgs/development/libraries/haskell/language-c-quote/default.nix +++ b/pkgs/development/libraries/haskell/language-c-quote/default.nix @@ -4,8 +4,8 @@ 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 diff --git a/pkgs/development/libraries/haskell/largeword/default.nix b/pkgs/development/libraries/haskell/largeword/default.nix index 0c526652399..7f01336f281 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.2"; + sha256 = "0ylbl9rffhqw9ahasn23n00h7v5yqmghmqkrq446zdr72bq23hk2"; 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/logict/default.nix b/pkgs/development/libraries/haskell/logict/default.nix new file mode 100644 index 00000000000..4e67e4ffb4c --- /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.1"; + sha256 = "0k3acw6fwhqz4qaz7k85fx5b43hwc926il0mljc69gjrgw0c8nzv"; + 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/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/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-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/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/persistent-postgresql/default.nix b/pkgs/development/libraries/haskell/persistent-postgresql/default.nix new file mode 100644 index 00000000000..c1022e13749 --- /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 = "0.9.1"; + sha256 = "0kzw4lq4i6lj149aws4ca4z43jmwvcbjr5gf5lk0pwcmzp6chr32"; + 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/postgresql-libpq/default.nix b/pkgs/development/libraries/haskell/postgresql-libpq/default.nix new file mode 100644 index 00000000000..19f729a5641 --- /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"; + sha256 = "10i3yc5fxlmnrb8j9p2a9w7h49p3ain36qpshlb34chdk9xh3l7g"; + 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..a142abdbceb --- /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.1.4.3"; + sha256 = "0q0mkkd22hji7ns25i86shy1504d0d4mc3fqljpfffm6m36855kc"; + 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..16c1b96f042 --- /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.0"; + sha256 = "0bq8nz2iapmngmkx2vlyk4ffw20b34yw5q7h7j6r3zrjzq42prsp"; + 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/shelly/default.nix b/pkgs/development/libraries/haskell/shelly/default.nix index 7b63732024e..2d2b3ca495d 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.13.0.1"; + sha256 = "1iw2hbnr9pwfvz6hhmnmg4h2h58ggppbjy3vs0i08hc33nms1lvy"; 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..766e1ef9617 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.5"; + sha256 = "1g9plryh86lc03rf1s8m36wyc2yqp4y6f02viq9c4g1k85rkbs53"; buildDepends = [ network ]; meta = { description = "Cross platform library for the sendfile system call"; 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/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/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/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/tls/default.nix b/pkgs/development/libraries/haskell/tls/default.nix index 71067cd75ff..9a89c082959 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.6"; + sha256 = "0bcmq7pvdbgnc8ls949m3x9sxj5svsrdpagjns1iq575jg38jx3g"; isLibrary = true; isExecutable = true; buildDepends = [ 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/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/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix index b21ce4b00f0..17d3eb4427e 100644 --- a/pkgs/development/libraries/haskell/yesod-core/default.nix +++ b/pkgs/development/libraries/haskell/yesod-core/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "yesod-core"; - version = "1.0.1.2"; - sha256 = "1c9ay0xv2s1kcj92ai0bj1gbml4k4w62n2mw7c5r6m88k8wmxh6z"; + version = "1.0.1.3"; + sha256 = "1rdj622zi12v9d7cxkn8w4q43k8c6gfz8wrpmvya76gqmg6h2gil"; buildDepends = [ aeson blazeBuilder blazeHtml blazeMarkup caseInsensitive cereal clientsession conduit cookie failure fastLogger hamlet httpTypes diff --git a/pkgs/development/libraries/haskell/yesod-json/default.nix b/pkgs/development/libraries/haskell/yesod-json/default.nix index 7ff0abedc1a..b91ca879afa 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.0.1.0"; + sha256 = "0baxyy4mddgpfzm4scfizz8pi6y7a135kjwfhss51m6xx36s84zl"; buildDepends = [ aeson attoparsecConduit blazeBuilder conduit safe shakespeareJs text transformers vector wai waiExtra yesodCore yesodRoutes 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/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..d2cbdf841b0 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 gtkSupport ]; configureFlags = "--disable-ltdl-install " + "--with-ltdl-include=${libtool}/include " 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/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/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/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/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/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/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/cabal2nix/default.nix b/pkgs/development/tools/haskell/cabal2nix/default.nix index 091417cb8a3..b5983dec6fb 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.38"; + sha256 = "1kybxrkddbzr1cqpqplbflhakf9njb9hvamhdwvlanlk8985h8jg"; 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..471b22a5825 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.30"; + sha256 = "1c52h7pi759dnqzfq46nyckp75aswpqkf2n7aag2np955ky7rd05"; 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/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/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/web/nodejs/default.nix b/pkgs/development/web/nodejs/default.nix index 98e4736b4f1..ef45825a584 100644 --- a/pkgs/development/web/nodejs/default.nix +++ b/pkgs/development/web/nodejs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl, python, zlib, v8 }: +{ stdenv, fetchurl, openssl, python, zlib, v8, linkV8Headers ? false }: stdenv.mkDerivation rec { version = "0.6.19"; @@ -25,6 +25,8 @@ stdenv.mkDerivation rec { postInstall = '' sed -e 's|^#!/usr/bin/env node$|#!'$out'/bin/node|' -i $out/lib/node_modules/npm/bin/npm-cli.js + '' + stdenv.lib.optionalString linkV8Headers '' # helps binary npms + ln -s ${v8}/include/* $out/include '' + stdenv.lib.optionalString stdenv.isDarwin '' install_name_tool -change libv8.dylib ${v8}/lib/libv8.dylib $out/bin/node ''; diff --git a/pkgs/games/kobodeluxe/default.nix b/pkgs/games/kobodeluxe/default.nix index 1d700d5cf03..70288e549a4 100644 --- a/pkgs/games/kobodeluxe/default.nix +++ b/pkgs/games/kobodeluxe/default.nix @@ -9,6 +9,12 @@ stdenv.mkDerivation { buildInputs = [ SDL SDL_image]; + prePatch = '' + sed -e 's/char \*tok/const char \*tok/' -i graphics/window.cpp + ''; + + patches = [ ./glibc29.patch ]; + meta = { homepage = http://olofson.net/kobodl/; description = "Enhanced version of Akira Higuchi's game XKobo for Un*x systems with X11"; diff --git a/pkgs/games/kobodeluxe/glibc29.patch b/pkgs/games/kobodeluxe/glibc29.patch new file mode 100644 index 00000000000..7a9ef355a82 --- /dev/null +++ b/pkgs/games/kobodeluxe/glibc29.patch @@ -0,0 +1,83 @@ +--- a/enemies.h ++++ b/enemies.h +@@ -70,9 +70,9 @@ + extern const enemy_kind bomb2; + extern const enemy_kind bombdeto; + extern const enemy_kind cannon; +-extern const enemy_kind pipe1; ++extern const enemy_kind pipeone; + extern const enemy_kind core; +-extern const enemy_kind pipe2; ++extern const enemy_kind pipetwo; + extern const enemy_kind rock; + extern const enemy_kind ring; + extern const enemy_kind enemy_m1; +@@ -430,7 +430,7 @@ + + inline int _enemy::is_pipe() + { +- return ((_state != notuse) && ((ek == &pipe1) || (ek == &pipe2))); ++ return ((_state != notuse) && ((ek == &pipeone) || (ek == &pipetwo))); + } + + +--- a/enemy.cpp ++++ b/enemy.cpp +@@ -713,7 +713,7 @@ + + void _enemy::kill_cannon() + { +- enemies.make(&pipe1, CS2PIXEL(x), CS2PIXEL(y)); ++ enemies.make(&pipeone, CS2PIXEL(x), CS2PIXEL(y)); + sound.g_base_node_explo(x, y); + release(); + } +@@ -755,10 +755,10 @@ + + void _enemy::kill_core() + { +- enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 3); +- enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 7); +- enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 1); +- enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 5); ++ enemies.make(&pipetwo, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 3); ++ enemies.make(&pipetwo, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 7); ++ enemies.make(&pipetwo, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 1); ++ enemies.make(&pipetwo, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 5); + enemies.make(&explosion4, CS2PIXEL(x), CS2PIXEL(y)); + sound.g_base_core_explo(x, y); + release(); +@@ -851,7 +851,7 @@ + screen.set_map(x1, y1, m ^ a); + release(); + } +-const enemy_kind pipe1 = { ++const enemy_kind pipeone = { + 0, + &_enemy::make_pipe1, + &_enemy::move_pipe1, +@@ -978,19 +978,19 @@ + } + p ^= a; + if(p & U_MASK) +- enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 1); ++ enemies.make(&pipetwo, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 1); + if(p & R_MASK) +- enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 3); ++ enemies.make(&pipetwo, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 3); + if(p & D_MASK) +- enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 5); ++ enemies.make(&pipetwo, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 5); + if(p & L_MASK) +- enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 7); ++ enemies.make(&pipetwo, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 7); + manage.add_score(10); + release(); + } + + +-const enemy_kind pipe2 = { ++const enemy_kind pipetwo = { + 0, + &_enemy::make_pipe2, + &_enemy::move_pipe2, 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..dbf3381f0f4 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);}); diff --git a/pkgs/lib/types.nix b/pkgs/lib/types.nix index 2c85ee0077a..956368138aa 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; 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/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/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/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/kernel/linux-3.2.nix b/pkgs/os-specific/linux/kernel/linux-3.2.nix index aa5ef29a609..ab1ec38ba52 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.23"; 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 = "1fmxr9qdz239aqf63j1648rvfngysqqk8qzwb1wjsn5hzrahsxmw"; }; 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..b51154d0ca2 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.6"; 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 = "0302q8m4xq0pidsd8ga0568sb620pk4il2kb8gi7dhsq615himjh"; }; config = configWithPlatform stdenv.platform; 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/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/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/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index bc60400146d..dbf877ebaeb 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -3,12 +3,14 @@ , glib, kbd }: +assert stdenv.gcc.libc or null != null; + stdenv.mkDerivation rec { - name = "systemd-185"; + name = "systemd-187"; src = fetchurl { url = "http://www.freedesktop.org/software/systemd/${name}.tar.xz"; - sha256 = "1iwp41xvpq0x2flhhs8lpyjbfyg1220ahmy7037zdjy26w9g82br"; + sha256 = "1m7fzcqqgwqdjrrdp41i81q6y0cgjbknrznsvjqwh7nc027k6fqs"; }; buildInputs = @@ -47,6 +49,8 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-DKBD_LOADKEYS=\"${kbd}/bin/loadkeys\" -DKBD_SETFONT=\"${kbd}/bin/setfont\""; + makeFlags = "CPPFLAGS=-I${stdenv.gcc.libc}/include"; + installFlags = "localstatedir=$(TMPDIR)/var sysconfdir=$(out)/etc"; # Get rid of configuration-specific data. 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/mail/spamassassin/default.nix b/pkgs/servers/mail/spamassassin/default.nix new file mode 100644 index 00000000000..8f22d08b759 --- /dev/null +++ b/pkgs/servers/mail/spamassassin/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchurl, buildPerlPackage, perl, HTMLParser, NetDNS, NetAddrIP, DBFile +, HTTPDate, MailDKIM +}: + +# 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"; + }; + + propagatedBuildInputs = [ HTMLParser NetDNS NetAddrIP DBFile + HTTPDate MailDKIM ]; + + makeFlags = "PERL_BIN=${perl}/bin/perl"; + + doCheck = false; + + 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/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/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/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/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/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/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index 00f37bd61e3..e5bd2ab77e3 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 }: +, 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. @@ -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,6 +50,11 @@ 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."; 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/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/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..1ed19bb9b25 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.1pre2749_ccc52ad"; src = fetchurl { - url = "http://hydra.nixos.org/build/2727338/download/4/${name}.tar.bz2"; - sha256 = "99466467b01102d8a2e1022283259ac490427b9a45c3c4784af027977014d7c5"; + url = "http://hydra.nixos.org/build/2841643/download/4/${name}.tar.bz2"; + sha256 = "eae2135dd70d2734080ee644a597e131f60e71991dbabdabf67ab0818ff1f6fc"; }; 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/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/typesetting/lhs2tex/default.nix b/pkgs/tools/typesetting/lhs2tex/default.nix index a78feaadb18..5ac339e92ec 100644 --- a/pkgs/tools/typesetting/lhs2tex/default.nix +++ b/pkgs/tools/typesetting/lhs2tex/default.nix @@ -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/virtualization/amazon-ec2-api-tools/default.nix b/pkgs/tools/virtualization/amazon-ec2-api-tools/default.nix index 1d146aa449e..a85d4223b71 100644 --- a/pkgs/tools/virtualization/amazon-ec2-api-tools/default.nix +++ b/pkgs/tools/virtualization/amazon-ec2-api-tools/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { src = fetchurl { url = http://s3.amazonaws.com/ec2-downloads/ec2-api-tools.zip; - sha256 = "0p0rk3bhk35b3dxdy8wjnbbj5zh1va63yfvdk5jxnzdzplds8v65"; + sha256 = "15mxjay8pr6cvlmp9hdsg5z7zc15bicjrc30f27rknq72zyhxi8h"; }; buildInputs = [ unzip makeWrapper ]; 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c59993528ce..14c4273e266 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -131,7 +131,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 @@ -419,6 +419,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 { }; @@ -439,9 +441,7 @@ let 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 { }; @@ -955,6 +955,8 @@ let less = callPackage ../tools/misc/less { }; + logstash = callPackage ../tools/misc/logstash { }; + klavaro = callPackage ../games/klavaro {}; minidlna = callPackage ../tools/networking/minidlna { }; @@ -1056,6 +1058,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) { @@ -1196,6 +1200,8 @@ let optipng = callPackage ../tools/graphics/optipng { }; + ossec = callPackage ../tools/security/ossec {}; + p7zip = callPackage ../tools/archivers/p7zip { }; pal = callPackage ../tools/misc/pal { }; @@ -1500,6 +1506,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 { }; @@ -1777,6 +1785,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 { }; }; @@ -2510,6 +2520,8 @@ let swiProlog = callPackage ../development/compilers/swi-prolog { }; + tbb = callPackage ../development/libraries/tbb { }; + tinycc = callPackage ../development/compilers/tinycc { }; urweb = callPackage ../development/compilers/urweb { }; @@ -2834,11 +2846,7 @@ 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 { }; @@ -2851,6 +2859,12 @@ let && !stdenv.isFreeBSD; }; + automake112x = callPackage ../development/tools/misc/automake/automake-1.12.x.nix { + doCheck = !stdenv.isArm && !stdenv.isCygwin + # 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 { }; @@ -3234,13 +3248,6 @@ let 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 { }; @@ -3325,7 +3332,7 @@ let cppunit = callPackage ../development/libraries/cppunit { }; cppnetlib = callPackage ../development/libraries/cppnetlib { - boost = boostFull; + boost = boostHeaders; }; cracklib = callPackage ../development/libraries/cracklib { }; @@ -3953,6 +3960,8 @@ let libdiscid = callPackage ../development/libraries/libdiscid { }; + libdivsufsort = callPackage ../development/libraries/libdivsufsort { }; + libdmtx = callPackage ../development/libraries/libdmtx { }; libdnet = callPackage ../development/libraries/libdnet { }; @@ -4624,6 +4633,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; @@ -4662,6 +4675,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 { }; @@ -4684,6 +4701,8 @@ let soqt = callPackage ../development/libraries/soqt { }; + sord = callPackage ../development/libraries/sord {}; + speechd = callPackage ../development/libraries/speechd { }; speech_tools = callPackage ../development/libraries/speech-tools {}; @@ -4692,6 +4711,8 @@ let sphinxbase = callPackage ../development/libraries/sphinxbase { }; + sratom = callPackage ../development/libraries/audio/sratom { }; + srtp = callPackage ../development/libraries/srtp {}; sqlite = lowPrio (callPackage ../development/libraries/sqlite { @@ -4716,6 +4737,8 @@ let strigi = callPackage ../development/libraries/strigi {}; + suil = callPackage ../development/libraries/audio/suil { }; + suitesparse = callPackage ../development/libraries/suitesparse { }; sword = callPackage ../development/libraries/sword { }; @@ -5100,16 +5123,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 { }; @@ -5129,9 +5162,7 @@ let ejabberd = callPackage ../servers/xmpp/ejabberd { }; - couchdb = callPackage ../servers/http/couchdb { - spidermonkey = spidermonkey_185; - }; + elasticmq = callPackage ../servers/elasticmq { }; felix = callPackage ../servers/felix { }; @@ -5146,7 +5177,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 { }; @@ -5206,7 +5237,7 @@ let monetdb = callPackage ../servers/sql/monetdb { }; mongodb = callPackage ../servers/nosql/mongodb { - boost = boost147; + boost = boost149; useV8 = (getConfig ["mongodb" "useV8"] false); }; @@ -5273,6 +5304,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. @@ -5365,6 +5401,10 @@ let inherit (perlPackages) LocaleGettext TermReadKey RpcXML; }; + 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 { }; @@ -5405,9 +5445,7 @@ let inherit (xlibs) xproto; }; - dmraid = builderDefsPackage ../os-specific/linux/dmraid { - inherit devicemapper; - }; + dmraid = callPackage ../os-specific/linux/dmraid { }; drbd = callPackage ../os-specific/linux/drbd { }; @@ -5636,6 +5674,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 = @@ -5774,6 +5818,7 @@ 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); @@ -6105,6 +6150,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; @@ -6194,6 +6243,8 @@ let inherit fontforge; }; + lmmath = callPackage ../data/fonts/lmodern/lmmath.nix {}; + lmodern = callPackage ../data/fonts/lmodern { }; manpages = callPackage ../data/documentation/man-pages { }; @@ -6236,6 +6287,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 { }; @@ -6345,6 +6398,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) { @@ -6916,10 +6973,7 @@ let 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; }; imagemagick = callPackage ../applications/graphics/ImageMagick { @@ -7016,7 +7070,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 { }; @@ -7048,7 +7104,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 }; @@ -7077,6 +7133,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 { }; @@ -7497,7 +7555,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; }; @@ -7680,7 +7737,7 @@ let }; xpra = callPackage ../tools/X11/xpra { - pyrex = pyrex095; + inherit (pythonPackages) notify; }; xscreensaver = callPackage ../misc/screensavers/xscreensaver { @@ -8474,10 +8531,14 @@ let stateDir = getConfig [ "nix" "stateDir" ] "/nix/var"; }; + nixUnstable = nix; + + /* nixUnstable = callPackage ../tools/package-management/nix/unstable.nix { storeDir = getConfig [ "nix" "storeDir" ] "/nix/store"; stateDir = getConfig [ "nix" "stateDir" ] "/nix/var"; }; + */ nixCustomFun = src: preConfigure: enableScripts: configureFlags: import ../tools/package-management/nix/custom.nix { @@ -8573,9 +8634,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; @@ -8584,7 +8645,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 @@ -8609,7 +8670,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-packages.nix b/pkgs/top-level/haskell-packages.nix index c329fbc7478..34144c3237d 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -126,7 +126,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); 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 + HUnit = self.HUnit_1_2_5_0; # 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 @@ -137,8 +137,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); 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 + stm = self.stm_2_4; # 7.5 ok + syb = self.syb_0_3_7; # 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 @@ -473,6 +473,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 {}; @@ -584,6 +586,10 @@ 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 {}; + + dataMemocombinators = callPackage ../development/libraries/haskell/data-memocombinators {}; + dataReify = callPackage ../development/libraries/haskell/data-reify {}; datetime = callPackage ../development/libraries/haskell/datetime {}; @@ -730,6 +736,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 {}; @@ -856,6 +864,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 +916,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_0 = callPackage ../development/libraries/haskell/HUnit/1.2.5.0.nix {}; + HUnit = self.HUnit_1_2_5_0; hxt = callPackage ../development/libraries/haskell/hxt {}; @@ -926,6 +937,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 +949,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 +972,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 {}; @@ -973,13 +992,13 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); 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 +1008,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 {}; @@ -1064,12 +1085,16 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); 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 +1150,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 +1164,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 {}; @@ -1291,6 +1326,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); 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 @@ -1326,6 +1362,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); ShellacReadline = callPackage ../development/libraries/haskell/Shellac/Shellac-readline.nix {}; + show = callPackage ../development/libraries/haskell/show {}; + SMTPClient = callPackage ../development/libraries/haskell/SMTPClient {}; split = callPackage ../development/libraries/haskell/split {}; @@ -1336,7 +1374,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 {}; @@ -1437,6 +1476,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); unixCompat = callPackage ../development/libraries/haskell/unix-compat {}; + unlambda = callPackage ../development/libraries/haskell/unlambda {}; + unorderedContainers = callPackage ../development/libraries/haskell/unordered-containers {}; url = callPackage ../development/libraries/haskell/url {}; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index e761f6556d1..9008459c63e 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -939,6 +939,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 { @@ -1015,7 +1036,7 @@ rec { sha256 = "1998syyprmqnhpgznmk7ia3zd8saw34q7pbaprxarcz7a3bncyjc"; }; buildInputs = [ TestRequires ]; - propagatedBuildInputs = + propagatedBuildInputs = [ ClassLoad Moose TaskWeaken TieToObject NamespaceClean ]; }; @@ -1425,11 +1446,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 +1546,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 +1701,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 +1766,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]; }; @@ -1884,6 +1913,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 { @@ -2222,6 +2261,16 @@ rec { 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 { @@ -2541,6 +2590,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 { @@ -3051,6 +3108,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 +3964,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 { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4d61c2e473b..4a8760a8e76 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 \ @@ -688,6 +686,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"; @@ -1667,6 +1683,29 @@ 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; + }; + }; + + pyparsing = buildPythonPackage rec { name = "pyparsing-1.5.6"; @@ -2569,6 +2608,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; @@ -2685,11 +2740,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 ]; @@ -2725,11 +2780,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 ]; @@ -2745,11 +2800,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 59777fe99be..3201afb44a0 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 18bad093294..5391b3a51c5 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;