diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2013-12-10 13:00:02 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2013-12-10 13:00:02 +0100 |
commit | 089da3ee5c25f5d36d660d6c679cb0c963617fa7 (patch) | |
tree | c21e0b5ec1b1daa2cb08d2a9fdb460aa13d10c7f /pkgs | |
parent | db32c7ca8bf7daad6792c3e9597c68768aafd271 (diff) | |
parent | 393dcd9c84e104ab7ff7e35f5612dc221e58d29b (diff) | |
download | nixlib-089da3ee5c25f5d36d660d6c679cb0c963617fa7.tar nixlib-089da3ee5c25f5d36d660d6c679cb0c963617fa7.tar.gz nixlib-089da3ee5c25f5d36d660d6c679cb0c963617fa7.tar.bz2 nixlib-089da3ee5c25f5d36d660d6c679cb0c963617fa7.tar.lz nixlib-089da3ee5c25f5d36d660d6c679cb0c963617fa7.tar.xz nixlib-089da3ee5c25f5d36d660d6c679cb0c963617fa7.tar.zst nixlib-089da3ee5c25f5d36d660d6c679cb0c963617fa7.zip |
Merge master into x-updates
Conflicts (simple): pkgs/top-level/all-packages.nix
Diffstat (limited to 'pkgs')
63 files changed, 557 insertions, 95 deletions
diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix index 4a6797f9010b..890497b0c992 100644 --- a/pkgs/applications/audio/audacity/default.nix +++ b/pkgs/applications/audio/audacity/default.nix @@ -4,12 +4,12 @@ }: stdenv.mkDerivation rec { - version = "2.0.4"; + version = "2.0.5"; name = "audacity-${version}"; src = fetchurl { url = "http://audacity.googlecode.com/files/audacity-minsrc-${version}.tar.xz"; - sha256 = "0pl92filykzs4g2pn7i02kdqgja326wjgafzw2vcgwn3dwrs4avp"; + sha256 = "0y9bvc3a3zxsk31yg7bha029mzkjiw5i9m86kbyj7x8ps0fm91z2"; }; preConfigure = /* we prefer system-wide libs */ '' @@ -33,5 +33,6 @@ stdenv.mkDerivation rec { homepage = http://audacity.sourceforge.net; license = "GPLv2+"; platforms = with stdenv.lib.platforms; linux; + maintainers = with stdenv.lib.maintainers; [ the-kenny ]; }; } diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index 615ee6a93cc9..874cc321f8be 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation { ln -s $out/spotify-client/spotify $out/bin/spotify patchelf \ --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ - --set-rpath $out/spotify-client/Data:$out/lib:$out/spotify-client:${stdenv.lib.makeLibraryPath [ xlibs.libXScrnSaver xlibs.libX11 qt4 alsaLib stdenv.gcc.gcc freetype glib pango cairo atk gdk_pixbuf gtk GConf cups sqlite]}:${stdenv.gcc.gcc}/lib64 \ + --set-rpath $out/spotify-client/Data:$out/lib:$out/spotify-client:${stdenv.lib.makeLibraryPath [ xlibs.libXScrnSaver xlibs.libX11 qt4 alsaLib stdenv.gcc.gcc freetype glib pango cairo atk gdk_pixbuf gtk GConf cups sqlite xlibs.libXdamage ]}:${stdenv.gcc.gcc}/lib64 \ $out/spotify-client/spotify dpkg-deb -x ${qt4webkit} ./ @@ -78,7 +78,7 @@ stdenv.mkDerivation { mkdir -p $out/libexec/spotify gcc -shared ${./preload.c} -o $preload -ldl -DOUT=\"$out\" -fPIC - wrapProgram $out/bin/spotify --set LD_PRELOAD $preload --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ GConf libpng cups libgcrypt sqlite gst_plugins_base gstreamer]}:$out/lib" + wrapProgram $out/bin/spotify --set LD_PRELOAD $preload --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ GConf libpng cups libgcrypt sqlite gst_plugins_base gstreamer xlibs.libXdamage ]}:$out/lib" # Desktop file mkdir -p "$out/share/applications/" diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix index 04c82b21e859..6b84143d0138 100644 --- a/pkgs/applications/science/astronomy/stellarium/default.nix +++ b/pkgs/applications/science/astronomy/stellarium/default.nix @@ -1,14 +1,11 @@ -{stdenv, fetchurl, cmake, freetype, libpng, mesa, gettext, openssl, qt4, perl, libiconv}: +{ stdenv, fetchurl, cmake, freetype, libpng, mesa, gettext, openssl, qt4, perl, libiconv }: -let - name = "stellarium-0.12.1"; -in -stdenv.mkDerivation { - inherit name; +stdenv.mkDerivation rec { + name = "stellarium-0.12.4"; src = fetchurl { url = "mirror://sourceforge/stellarium/${name}.tar.gz"; - sha256 = "02qfp56mkg3bqggv3ndx8v6zfswg51gkczwiqy5c9y4rw28hazla"; + sha256 = "11367hv9niyz9v47lf31vjsqkgc8da0vy2nhiyxgmk1i49p1pbhg"; }; buildInputs = [ cmake freetype libpng mesa gettext openssl qt4 perl libiconv ]; diff --git a/pkgs/applications/science/electronics/verilog/default.nix b/pkgs/applications/science/electronics/verilog/default.nix index a4c803e2952c..f2c9d2e646f0 100644 --- a/pkgs/applications/science/electronics/verilog/default.nix +++ b/pkgs/applications/science/electronics/verilog/default.nix @@ -1,17 +1,18 @@ {stdenv, fetchurl, gperf, flex, bison}: stdenv.mkDerivation rec { - name = "verilog-0.9.3"; + name = "verilog-0.9.7"; src = fetchurl { url = "mirror://sourceforge/iverilog/${name}.tar.gz"; - sha256 = "dd68c8ab874a93805d1e93fa76ee1e91fc0c7b20822ded3e57b6536cd8c0d1ba"; + sha256 = "0m3liqw7kq24vn7k8wvi630ljz0awz23r3sd4rcklk7vgghp4pks"; }; buildInputs = [ gperf flex bison ]; meta = { description = "Icarus Verilog compiler"; + repositories.git = https://github.com/steveicarus/iverilog.git; homepage = http://www.icarus.com; license = "GPLv2+"; maintainers = with stdenv.lib.maintainers; [winden]; diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 9f7f26041ca6..ee1de54a4fb0 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -83,7 +83,7 @@ rec { }; svn2git = import ./svn2git { - inherit stdenv fetchgit ruby makeWrapper; + inherit stdenv fetchurl ruby makeWrapper; git = gitSVN; }; diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 050cfd1aabee..e364a8ea87bd 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -10,7 +10,7 @@ let - version = "1.8.4.3"; + version = "1.8.5.1"; svn = subversionClient.override { perlBindings = true; }; @@ -21,7 +21,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://git-core.googlecode.com/files/git-${version}.tar.gz"; - sha256 = "08fbdxh2cjd4hffm0nydwysh5zh6nrssbi9x01yy0n2y8rqzly0a"; + sha256 = "0i7fz0b79f3algs68m15wg4bq99ayg1crpy66cqylxq3mzbw8n8m"; }; patches = [ ./docbook2texi.patch ./symlinks-in-bin.patch ]; @@ -140,6 +140,6 @@ stdenv.mkDerivation { ''; platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.simons ]; + maintainers = with stdenv.lib.maintainers; [ simons the-kenny ]; }; } diff --git a/pkgs/applications/version-management/git-and-tools/stgit/default.nix b/pkgs/applications/version-management/git-and-tools/stgit/default.nix index a933ae84e603..6518f32ef7c6 100644 --- a/pkgs/applications/version-management/git-and-tools/stgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/stgit/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, python, git }: let - name = "stgit-0.15"; + name = "stgit-0.16"; in stdenv.mkDerivation { inherit name; src = fetchurl { url = "http://download.gna.org/stgit/${name}.tar.gz"; - sha256 = "0kgq9x0i7riwcl1lmmm40z0jiz5agr1kqxm2byv1qsf0q1ny47v9"; + sha256 = "0hla6401g2kicaakz4awk67yf8fhqbw1shn1p9ma5x6ca29s3w82"; }; buildInputs = [ python git ]; @@ -28,7 +28,7 @@ stdenv.mkDerivation { description = "StGit is a patch manager implemented on top of Git"; license = "GPL"; - maintainers = [ stdenv.lib.maintainers.simons ]; + maintainers = with stdenv.lib.maintainers; [ simons the-kenny ]; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/applications/version-management/git-and-tools/svn2git/default.nix b/pkgs/applications/version-management/git-and-tools/svn2git/default.nix index 6f5d36f6aa74..0053a1dfafbe 100644 --- a/pkgs/applications/version-management/git-and-tools/svn2git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/svn2git/default.nix @@ -1,12 +1,14 @@ -{ stdenv, fetchgit, ruby, makeWrapper, git }: +{ stdenv, fetchurl, ruby, makeWrapper, git }: -stdenv.mkDerivation rec { - name = "svn2git-2.1.0-20111206"; +let + version = "2.2.2"; +in +stdenv.mkDerivation { + name = "svn2git-${version}"; - src = fetchgit { - url = https://github.com/nirvdrum/svn2git; - rev = "5cd8d4b509affb66eb2dad50d7298c52b3b0d848"; - sha256 = "26aa17f68f605e958b623d803b4bd405e12d6c5d51056635873a2c59e4c7b9ca"; + src = fetchurl { + url = "https://github.com/nirvdrum/svn2git/archive/v${version}.tar.gz"; + sha256 = "14zinkpgybz15jvbfw0sb432w6f5w4sa5pdqycjwva8v8lxqn9mh"; }; buildInputs = [ ruby makeWrapper ]; @@ -17,14 +19,22 @@ stdenv.mkDerivation rec { '' mkdir -p $out cp -r lib $out/ - + mkdir -p $out/bin substituteInPlace bin/svn2git --replace '/usr/bin/env ruby' ${ruby}/bin/ruby cp bin/svn2git $out/bin/ chmod +x $out/bin/svn2git - + wrapProgram $out/bin/svn2git \ --set RUBYLIB $out/lib \ --prefix PATH : ${git}/bin ''; + + meta = { + homepage = https://github.com/nirvdrum/svn2git; + description = "Ruby tool for importing existing svn projects into git"; + license = stdenv.lib.licenses.mit; + + maintainers = [ stdenv.lib.maintainers.the-kenny ]; + }; } diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index de6ad9021505..f6ebc241bac2 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, xz, bzip2, perl, xlibs, libdvdnav, libbluray , zlib, a52dec, libmad, faad2, ffmpeg, alsaLib -, pkgconfig, dbus, fribidi, qt4, freefont_ttf +, pkgconfig, dbus, fribidi, qt4, freefont_ttf, libebml, libmatroska , libvorbis, libtheora, speex, lua5, libgcrypt, libupnp , libcaca, pulseaudio, flac, schroedinger, libxml2, librsvg , mpeg2dec, udev, gnutls, avahi, libcddb, jackaudio, SDL, SDL_image @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { udev gnutls avahi libcddb jackaudio SDL SDL_image libmtp unzip taglib libkate libtiger libv4l samba liboggz libass libdvbpsi libva xlibs.xlibs xlibs.libXv xlibs.libXvMC xlibs.libXpm xlibs.xcbutilkeysyms - libdc1394 libraw1394 libopus + libdc1394 libraw1394 libopus libebml libmatroska ]; nativeBuildInputs = [ pkgconfig ]; @@ -45,8 +45,9 @@ stdenv.mkDerivation rec { ${freefont_ttf}/share/fonts/truetype/FreeSerifBold.ttf ''; - meta = { + meta = with stdenv.lib; { description = "Cross-platform media player and streaming server"; homepage = http://www.videolan.org/vlc/; + platforms = platforms.linux; }; } diff --git a/pkgs/desktops/kde-4.10/kdenetwork/kopete-giflib5.patch b/pkgs/desktops/kde-4.10/kdenetwork/kopete-giflib5.patch new file mode 100644 index 000000000000..1755bdbce76d --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdenetwork/kopete-giflib5.patch @@ -0,0 +1,70 @@ +Index: b/kopete/protocols/wlm/wlmchatsession.cpp +=================================================================== +--- a/kopete/protocols/wlm/wlmchatsession.cpp ++++ b/kopete/protocols/wlm/wlmchatsession.cpp +@@ -63,10 +63,14 @@ + #include "wlmprotocol.h" + #include "wlmaccount.h" + #include "wlmchatsessioninkaction.h" + #ifdef HAVE_GIFLIB + #include <gif_lib.h> ++/* old giflib has no GIFLIB_MAJOR, define to avoid cpp warnings */ ++#ifndef GIFLIB_MAJOR ++#define GIFLIB_MAJOR 4 ++#endif + #endif + + WlmChatSession::WlmChatSession (Kopete::Protocol * protocol, + const Kopete::Contact * user, + Kopete::ContactPtrList others, +@@ -465,15 +469,19 @@ WlmChatSession::slotInviteContact (Kopet + static void + printGifErrorMessage() + { + #ifdef HAVE_GIFLIB + #ifdef HAVE_GIF_ERROR_STRING // giflib 4.2.0+ ++#if GIFLIB_MAJOR >= 5 ++ fprintf(stderr, "GIF-LIB error (exact reporting not implemented)\n"); ++#else + const char * errorString = GifErrorString(); + if (errorString) + fprintf(stderr, "GIF-LIB error: %s\n", errorString); + else + fprintf(stderr, "GIF-LIB undefined error: %d\n", GifError()); ++#endif + #else // older giflib versions, libungif + PrintGifError(); + #endif // HAVE_GIF_ERROR_STRING + #endif // HAVE_GIFLIB + } +@@ -481,10 +489,14 @@ printGifErrorMessage() + /* stolen from kpaint write_to_gif() */ + void + WlmChatSession::convertToGif( const QPixmap & ink, QString filename) + { + #ifdef HAVE_GIFLIB ++#if GIFLIB_MAJOR >= 5 ++#define FreeMapObject GifFreeMapObject ++#define MakeMapObject GifMakeMapObject ++#endif + int i, status; + GifFileType *GifFile; + ColorMapObject *screenColourmap; + ColorMapObject *imageColourmap; + QImage img = ink.toImage().convertToFormat(QImage::Format_Indexed8); +@@ -523,11 +535,15 @@ WlmChatSession::convertToGif( const QPix + screenColourmap->Colors[i].Green= 0; + screenColourmap->Colors[i].Blue= 0; + } + } + ++#if GIFLIB_MAJOR >= 5 ++ GifFile= EGifOpenFileName(QFile::encodeName(filename).constData(), 0, NULL); ++#else + GifFile= EGifOpenFileName(QFile::encodeName(filename).constData(), 0); ++#endif + if (!GifFile) { + FreeMapObject(imageColourmap); + FreeMapObject(screenColourmap); + return; + } diff --git a/pkgs/desktops/kde-4.10/kdenetwork/kopete.nix b/pkgs/desktops/kde-4.10/kdenetwork/kopete.nix index 7139c62981c6..b065ae610095 100644 --- a/pkgs/desktops/kde-4.10/kdenetwork/kopete.nix +++ b/pkgs/desktops/kde-4.10/kdenetwork/kopete.nix @@ -20,6 +20,7 @@ kde { cp -v ${./FindmsiLBC.cmake} kopete/cmake/modules/FindmsiLBC.cmake patch -p1 < ${./kopete-4.10.4-kopete-linphonemediaengine.patch} patch -p1 < ${./kopete-4.10.4-kopete-stun.patch} + patch -p1 < ${./kopete-giflib5.patch} ''; cmakeFlags = [ "-DBUILD_skypebuttons=TRUE" ]; diff --git a/pkgs/development/compilers/jdk/jdk7-linux.nix b/pkgs/development/compilers/jdk/jdk7-linux.nix new file mode 100644 index 000000000000..a7a5eccee9d5 --- /dev/null +++ b/pkgs/development/compilers/jdk/jdk7-linux.nix @@ -0,0 +1,134 @@ +{ swingSupport ? true +, stdenv +, requireFile +, unzip +, xlibs ? null +, installjdk ? true +, pluginSupport ? true +, installjce ? false +}: + +assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; +assert swingSupport -> xlibs != null; + +let + + /** + * The JRE libraries are in directories that depend on the CPU. + */ + architecture = + if stdenv.system == "i686-linux" then + "i386" + else if stdenv.system == "x86_64-linux" then + "amd64" + else + abort "jdk requires i686-linux or x86_64 linux"; + + jce = + if installjce then + requireFile { + name = "UnlimitedJCEPolicyJDK7.zip"; + url = http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html; + sha256 = "0qljzfxbikm8br5k7rkamibp1vkyjrf6blbxpx6hn4k46f62bhnh"; + } + else + null; +in + +stdenv.mkDerivation { + name = + if installjdk then "jdk-1.7.0_45" else "jre-1.7.0_45"; + + src = + if stdenv.system == "i686-linux" then + requireFile { + name = "jdk-7u45-linux-i586.tar.gz"; + url = http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html; + sha256 = "1q0nw2rwmavcrssyigq76p1h00hm8kd3rhb5bdv7rbdcs0jxrjsa"; + } + else if stdenv.system == "x86_64-linux" then + requireFile { + name = "jdk-7u45-linux-x64.tar.gz"; + url = http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html; + sha256 = "06jbz536zycqkdpc7zriay0jidmj9nriqva60afsgpv93kcf9spj"; + } + else + abort "jdk requires i686-linux or x86_64 linux"; + + buildInputs = if installjce then [ unzip ] else []; + + installPhase = '' + cd .. + if test -z "$installjdk"; then + mv $sourceRoot/jre $out + else + mv $sourceRoot $out + fi + + for file in $out/* + do + if test -f $file ; then + rm $file + fi + done + + if test -n "$installjdk"; then + for file in $out/jre/* + do + if test -f $file ; then + rm $file + fi + done + fi + + # construct the rpath + rpath= + for i in $libraries; do + rpath=$rpath''${rpath:+:}$i/lib + done + + if test -z "$installjdk"; then + jrePath=$out + else + jrePath=$out/jre + fi + + if test -n "$jce"; then + unzip $jce + cp -v jce/*.jar $jrePath/lib/security + fi + + rpath=$rpath''${rpath:+:}$jrePath/lib/${architecture}/jli + + # set all the dynamic linkers + find $out -type f -perm +100 \ + -exec patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ + --set-rpath "$rpath" {} \; + + find $out -name "*.so" -exec patchelf --set-rpath "$rpath" {} \; + + if test -z "$pluginSupport"; then + rm -f $out/bin/javaws + if test -n "$installjdk"; then + rm -f $out/jre/bin/javaws + fi + fi + + mkdir $jrePath/lib/${architecture}/plugins + ln -s $jrePath/lib/${architecture}/libnpjp2.so $jrePath/lib/${architecture}/plugins + ''; + + inherit installjdk pluginSupport; + + /** + * libXt is only needed on amd64 + */ + libraries = + [stdenv.gcc.libc] ++ + (if swingSupport then [xlibs.libX11 xlibs.libXext xlibs.libXtst xlibs.libXi xlibs.libXp xlibs.libXt] else []); + + passthru.mozillaPlugin = if installjdk then "/jre/lib/${architecture}/plugins" else "/lib/${architecture}/plugins"; + + meta.license = "unfree"; +} + diff --git a/pkgs/development/libraries/apr-util/default.nix b/pkgs/development/libraries/apr-util/default.nix index 8e49d3984606..89c2c31ef7a9 100644 --- a/pkgs/development/libraries/apr-util/default.nix +++ b/pkgs/development/libraries/apr-util/default.nix @@ -9,11 +9,11 @@ assert bdbSupport -> db4 != null; assert ldapSupport -> openldap != null; stdenv.mkDerivation rec { - name = "apr-util-1.5.2"; + name = "apr-util-1.5.3"; src = fetchurl { url = "mirror://apache/apr/${name}.tar.bz2"; - md5 = "89c1348aa79e898d7c34a6206311c9c2"; + sha256 = "0s1rpqjy5xr03k9s4xrsm5wvhj5286vlkf6jvqayw99yy5sb3vbq"; }; configureFlags = '' diff --git a/pkgs/development/libraries/faac/default.nix b/pkgs/development/libraries/faac/default.nix index 8e79afb5f9ef..8bfaaf3ea497 100644 --- a/pkgs/development/libraries/faac/default.nix +++ b/pkgs/development/libraries/faac/default.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { meta = { description = "Open source MPEG-4 and MPEG-2 AAC encoder"; homepage = http://www.audiocoding.com/faac.html; - license = "LGPL"; + # Incompatible with GPL. Some changes to the base code, included in faac, + # are under LGPL though. + license = "unfree"; }; } diff --git a/pkgs/development/libraries/giflib/4.1.nix b/pkgs/development/libraries/giflib/4.1.nix new file mode 100644 index 000000000000..35d66b3647b4 --- /dev/null +++ b/pkgs/development/libraries/giflib/4.1.nix @@ -0,0 +1,10 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation { + name = "giflib-4.1.6"; + src = fetchurl { + url = mirror://sourceforge/giflib/giflib-4.1.6.tar.bz2; + sha256 = "1v9b7ywz7qg8hli0s9vv1b8q9xxb2xvqq2mg1zpr73xwqpcwxhg1"; + }; +} + diff --git a/pkgs/development/libraries/gmime/default.nix b/pkgs/development/libraries/gmime/default.nix index 99859b9f34ef..a8a3943e409e 100644 --- a/pkgs/development/libraries/gmime/default.nix +++ b/pkgs/development/libraries/gmime/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, glib, zlib, libgpgerror }: stdenv.mkDerivation rec { - name = "gmime-2.6.15"; + name = "gmime-2.6.19"; src = fetchurl { url = "mirror://gnome/sources/gmime/2.6/${name}.tar.xz"; - sha256 = "16n9gmlwn6rphi59hrwy6dpn785s3r13h2kmrn3k61l2kfws1hml"; + sha256 = "0jm1fgbjgh496rsc0il2y46qd4bqq2ln9168p4zzh68mk4ml1yxg"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/haskell/IntervalMap/default.nix b/pkgs/development/libraries/haskell/IntervalMap/default.nix new file mode 100644 index 000000000000..e2b94abd7c8d --- /dev/null +++ b/pkgs/development/libraries/haskell/IntervalMap/default.nix @@ -0,0 +1,16 @@ +{ cabal, Cabal, deepseq, QuickCheck }: + +cabal.mkDerivation (self: { + pname = "IntervalMap"; + version = "0.3.0.2"; + sha256 = "14pbq5n2cn9gxjkmqpnbn7dx9963wp3sdbb180wm9l5xqi338s0l"; + buildDepends = [ deepseq ]; + testDepends = [ Cabal deepseq QuickCheck ]; + meta = { + homepage = "http://www.chr-breitkopf.de/comp/IntervalMap"; + description = "Maps from Intervals to values, with efficient search"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/ex-pool/default.nix b/pkgs/development/libraries/haskell/ex-pool/default.nix new file mode 100644 index 000000000000..9bf966e749af --- /dev/null +++ b/pkgs/development/libraries/haskell/ex-pool/default.nix @@ -0,0 +1,17 @@ +{ cabal, exceptions, hashable, stm, time, transformers, vector }: + +cabal.mkDerivation (self: { + pname = "ex-pool"; + version = "0.1.0.2"; + sha256 = "11q63yfr59r6cfzi635xj75nhcc2yi83snc75k638wyamxgvxng4"; + buildDepends = [ + exceptions hashable stm time transformers vector + ]; + meta = { + homepage = "https://github.com/kim/ex-pool"; + description = "Another fork of resource-pool, with a MonadIO and MonadCatch constraint"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/extensible-effects/default.nix b/pkgs/development/libraries/haskell/extensible-effects/default.nix new file mode 100644 index 000000000000..f97b5cd5e28c --- /dev/null +++ b/pkgs/development/libraries/haskell/extensible-effects/default.nix @@ -0,0 +1,20 @@ +{ cabal, HUnit, QuickCheck, testFramework, testFrameworkHunit +, testFrameworkQuickcheck2 +}: + +cabal.mkDerivation (self: { + pname = "extensible-effects"; + version = "1.2.1"; + sha256 = "066977hjhcg44v47hkjpf2gs48xsry74l4h8hp753jsvbfsv0030"; + testDepends = [ + HUnit QuickCheck testFramework testFrameworkHunit + testFrameworkQuickcheck2 + ]; + meta = { + homepage = "https://github.com/RobotGymnast/extensible-effects"; + description = "An Alternative to Monad Transformers"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/haskelldb/default.nix b/pkgs/development/libraries/haskell/haskelldb/default.nix new file mode 100644 index 000000000000..fde1d71b2b03 --- /dev/null +++ b/pkgs/development/libraries/haskell/haskelldb/default.nix @@ -0,0 +1,15 @@ +{ cabal, mtl, time }: + +cabal.mkDerivation (self: { + pname = "haskelldb"; + version = "2.2.2"; + sha256 = "1nwy05wsffagv62kbi8ahm6s591wal7cdl19p0fqi86qz05y9hkm"; + buildDepends = [ mtl time ]; + meta = { + homepage = "https://github.com/m4dc4p/haskelldb"; + description = "A library of combinators for generating and executing SQL statements"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + }; +}) diff --git a/pkgs/development/libraries/libopus/default.nix b/pkgs/development/libraries/libopus/default.nix index 11f7a370efa9..b1bf65d0fe67 100644 --- a/pkgs/development/libraries/libopus/default.nix +++ b/pkgs/development/libraries/libopus/default.nix @@ -1,15 +1,20 @@ { stdenv, fetchurl, fixedPoint ? false }: +let + version = "1.1"; +in stdenv.mkDerivation rec { - name = "libopus-1.0.3"; - + name = "libopus-${version}"; + src = fetchurl { - url = "http://downloads.xiph.org/releases/opus/opus-1.0.3.tar.gz"; - sha256 = "175l7hv7d03c4iz60g185nqvwrabc39ksil0d7g07i6vjaf0h6hr"; + url = "http://downloads.xiph.org/releases/opus/opus-${version}.tar.gz"; + sha256 = "158xprn2086arvdib3vbbygz7z6jqkw2nci7nlywzzwallap0wmr"; }; configureFlags = stdenv.lib.optionalString fixedPoint "--enable-fixed-point"; + doCheck = true; + meta = { description = "Open, royalty-free, highly versatile audio codec"; license = "BSD"; diff --git a/pkgs/development/tools/build-managers/gnumake-3.80/default.nix b/pkgs/development/tools/build-managers/gnumake/3.80/default.nix index b0926a7f531c..b0926a7f531c 100644 --- a/pkgs/development/tools/build-managers/gnumake-3.80/default.nix +++ b/pkgs/development/tools/build-managers/gnumake/3.80/default.nix diff --git a/pkgs/development/tools/build-managers/gnumake-3.80/log.patch b/pkgs/development/tools/build-managers/gnumake/3.80/log.patch index fa90acfe8de5..fa90acfe8de5 100644 --- a/pkgs/development/tools/build-managers/gnumake-3.80/log.patch +++ b/pkgs/development/tools/build-managers/gnumake/3.80/log.patch diff --git a/pkgs/development/tools/build-managers/gnumake/3.81.nix b/pkgs/development/tools/build-managers/gnumake/3.81/default.nix index 56d2326c916b..56d2326c916b 100644 --- a/pkgs/development/tools/build-managers/gnumake/3.81.nix +++ b/pkgs/development/tools/build-managers/gnumake/3.81/default.nix diff --git a/pkgs/development/tools/build-managers/gnumake/impure-dirs.patch b/pkgs/development/tools/build-managers/gnumake/3.81/impure-dirs.patch index f6646f1d0126..f6646f1d0126 100644 --- a/pkgs/development/tools/build-managers/gnumake/impure-dirs.patch +++ b/pkgs/development/tools/build-managers/gnumake/3.81/impure-dirs.patch diff --git a/pkgs/development/tools/build-managers/gnumake/log-3.81.patch b/pkgs/development/tools/build-managers/gnumake/3.81/log-3.81.patch index b98d85a08265..b98d85a08265 100644 --- a/pkgs/development/tools/build-managers/gnumake/log-3.81.patch +++ b/pkgs/development/tools/build-managers/gnumake/3.81/log-3.81.patch diff --git a/pkgs/development/tools/build-managers/gnumake/MAKEFLAGS-reexec.patch b/pkgs/development/tools/build-managers/gnumake/3.82/MAKEFLAGS-reexec.patch index a2f59657d4ca..a2f59657d4ca 100644 --- a/pkgs/development/tools/build-managers/gnumake/MAKEFLAGS-reexec.patch +++ b/pkgs/development/tools/build-managers/gnumake/3.82/MAKEFLAGS-reexec.patch diff --git a/pkgs/development/tools/build-managers/gnumake/archives-many-objs.patch b/pkgs/development/tools/build-managers/gnumake/3.82/archives-many-objs.patch index 73c0381ced45..73c0381ced45 100644 --- a/pkgs/development/tools/build-managers/gnumake/archives-many-objs.patch +++ b/pkgs/development/tools/build-managers/gnumake/3.82/archives-many-objs.patch diff --git a/pkgs/development/tools/build-managers/gnumake/construct-command-line.patch b/pkgs/development/tools/build-managers/gnumake/3.82/construct-command-line.patch index aa4a1afe3fd0..aa4a1afe3fd0 100644 --- a/pkgs/development/tools/build-managers/gnumake/construct-command-line.patch +++ b/pkgs/development/tools/build-managers/gnumake/3.82/construct-command-line.patch diff --git a/pkgs/development/tools/build-managers/gnumake/copy-on-expand.patch b/pkgs/development/tools/build-managers/gnumake/3.82/copy-on-expand.patch index 3f202b4db96b..3f202b4db96b 100644 --- a/pkgs/development/tools/build-managers/gnumake/copy-on-expand.patch +++ b/pkgs/development/tools/build-managers/gnumake/3.82/copy-on-expand.patch diff --git a/pkgs/development/tools/build-managers/gnumake/darwin-library_search-dylib.patch b/pkgs/development/tools/build-managers/gnumake/3.82/darwin-library_search-dylib.patch index de7e4f615212..de7e4f615212 100644 --- a/pkgs/development/tools/build-managers/gnumake/darwin-library_search-dylib.patch +++ b/pkgs/development/tools/build-managers/gnumake/3.82/darwin-library_search-dylib.patch diff --git a/pkgs/development/tools/build-managers/gnumake/default.nix b/pkgs/development/tools/build-managers/gnumake/3.82/default.nix index 4f3c7defa488..4f3c7defa488 100644 --- a/pkgs/development/tools/build-managers/gnumake/default.nix +++ b/pkgs/development/tools/build-managers/gnumake/3.82/default.nix diff --git a/pkgs/development/tools/build-managers/gnumake/glob-speedup.patch b/pkgs/development/tools/build-managers/gnumake/3.82/glob-speedup.patch index 45971f33590b..45971f33590b 100644 --- a/pkgs/development/tools/build-managers/gnumake/glob-speedup.patch +++ b/pkgs/development/tools/build-managers/gnumake/3.82/glob-speedup.patch diff --git a/pkgs/development/tools/build-managers/gnumake/3.82/impure-dirs.patch b/pkgs/development/tools/build-managers/gnumake/3.82/impure-dirs.patch new file mode 100644 index 000000000000..f6646f1d0126 --- /dev/null +++ b/pkgs/development/tools/build-managers/gnumake/3.82/impure-dirs.patch @@ -0,0 +1,34 @@ +diff -rc read.c read.c +*** read.c 2006-03-17 15:24:20.000000000 +0100 +--- read.c 2007-05-24 17:16:31.000000000 +0200 +*************** +*** 99,107 **** +--- 99,109 ---- + #endif + INCLUDEDIR, + #ifndef _AMIGA ++ #if 0 + "/usr/gnu/include", + "/usr/local/include", + "/usr/include", ++ #endif + #endif + 0 + }; +diff -rc reremake.c +*** remake.c 2006-03-20 03:36:37.000000000 +0100 +--- remake.c 2007-05-24 17:06:54.000000000 +0200 +*************** +*** 1452,1460 **** +--- 1452,1462 ---- + static char *dirs[] = + { + #ifndef _AMIGA ++ #if 0 + "/lib", + "/usr/lib", + #endif ++ #endif + #if defined(WINDOWS32) && !defined(LIBDIR) + /* + * This is completely up to the user at product install time. Just define diff --git a/pkgs/development/tools/build-managers/gnumake/intermediate-parallel.patch b/pkgs/development/tools/build-managers/gnumake/3.82/intermediate-parallel.patch index 9bb7add0bde2..9bb7add0bde2 100644 --- a/pkgs/development/tools/build-managers/gnumake/intermediate-parallel.patch +++ b/pkgs/development/tools/build-managers/gnumake/3.82/intermediate-parallel.patch diff --git a/pkgs/development/tools/build-managers/gnumake/log.patch b/pkgs/development/tools/build-managers/gnumake/3.82/log.patch index e6197fd8e78f..e6197fd8e78f 100644 --- a/pkgs/development/tools/build-managers/gnumake/log.patch +++ b/pkgs/development/tools/build-managers/gnumake/3.82/log.patch diff --git a/pkgs/development/tools/build-managers/gnumake/long-command-line.patch b/pkgs/development/tools/build-managers/gnumake/3.82/long-command-line.patch index 39ea05843bfd..39ea05843bfd 100644 --- a/pkgs/development/tools/build-managers/gnumake/long-command-line.patch +++ b/pkgs/development/tools/build-managers/gnumake/3.82/long-command-line.patch diff --git a/pkgs/development/tools/build-managers/gnumake/memory-corruption.patch b/pkgs/development/tools/build-managers/gnumake/3.82/memory-corruption.patch index b28c07353ec2..b28c07353ec2 100644 --- a/pkgs/development/tools/build-managers/gnumake/memory-corruption.patch +++ b/pkgs/development/tools/build-managers/gnumake/3.82/memory-corruption.patch diff --git a/pkgs/development/tools/build-managers/gnumake/oneshell.patch b/pkgs/development/tools/build-managers/gnumake/3.82/oneshell.patch index fbade127ce61..fbade127ce61 100644 --- a/pkgs/development/tools/build-managers/gnumake/oneshell.patch +++ b/pkgs/development/tools/build-managers/gnumake/3.82/oneshell.patch diff --git a/pkgs/development/tools/build-managers/gnumake/parallel-remake.patch b/pkgs/development/tools/build-managers/gnumake/3.82/parallel-remake.patch index a19fe7b7d629..a19fe7b7d629 100644 --- a/pkgs/development/tools/build-managers/gnumake/parallel-remake.patch +++ b/pkgs/development/tools/build-managers/gnumake/3.82/parallel-remake.patch diff --git a/pkgs/development/tools/build-managers/gnumake/4.0/darwin-library_search-dylib.patch b/pkgs/development/tools/build-managers/gnumake/4.0/darwin-library_search-dylib.patch new file mode 100644 index 000000000000..de7e4f615212 --- /dev/null +++ b/pkgs/development/tools/build-managers/gnumake/4.0/darwin-library_search-dylib.patch @@ -0,0 +1,17 @@ +Fixed default libpatttern on Darwin, imported from prefix overlay. +Got merged upstream: +https://savannah.gnu.org/bugs/?37197 +--- default.c.orig 2009-05-02 12:25:24 +0200 ++++ default.c 2009-05-02 12:25:58 +0200 +@@ -509,7 +509,11 @@ + #ifdef __MSDOS__ + ".LIBPATTERNS", "lib%.a $(DJDIR)/lib/lib%.a", + #else ++#ifdef __APPLE__ ++ ".LIBPATTERNS", "lib%.dylib lib%.a", ++#else + ".LIBPATTERNS", "lib%.so lib%.a", ++#endif + #endif + #endif + diff --git a/pkgs/development/tools/build-managers/gnumake/4.0/default.nix b/pkgs/development/tools/build-managers/gnumake/4.0/default.nix new file mode 100644 index 000000000000..6a76fa0302b6 --- /dev/null +++ b/pkgs/development/tools/build-managers/gnumake/4.0/default.nix @@ -0,0 +1,49 @@ +{stdenv, fetchurl}: + +let version = "4.0"; in +stdenv.mkDerivation { + name = "gnumake-${version}"; + + src = fetchurl { + url = "mirror://gnu/make/make-${version}.tar.bz2"; + sha256 = "1nyvn8mknw0mf7727lprva3lisl1y0n03lvar342rrpdmz3qc1p6"; + }; + + /* On Darwin, there are 3 test failures that haven't been investigated + yet. */ + doCheck = !stdenv.isDarwin && !stdenv.isFreeBSD; + + patches = + [ + # Purity: don't look for library dependencies (of the form + # `-lfoo') in /lib and /usr/lib. It's a stupid feature anyway. + # Likewise, when searching for included Makefiles, don't look in + # /usr/include and friends. + ./impure-dirs.patch + + # a bunch of patches from Gentoo, mostly should be from upstream (unreleased) + ./darwin-library_search-dylib.patch + ]; + patchFlags = "-p0"; + + meta = { + description = "GNU Make, a program controlling the generation of non-source files from sources"; + + longDescription = + '' Make is a tool which controls the generation of executables and + other non-source files of a program from the program's source files. + + Make gets its knowledge of how to build your program from a file + called the makefile, which lists each of the non-source files and + how to compute it from other files. When you write a program, you + should write a makefile for it, so that it is possible to use Make + to build and install the program. + ''; + + homepage = http://www.gnu.org/software/make/; + + license = "GPLv3+"; + maintainers = [ stdenv.lib.maintainers.ludo ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/development/tools/build-managers/gnumake/4.0/impure-dirs.patch b/pkgs/development/tools/build-managers/gnumake/4.0/impure-dirs.patch new file mode 100644 index 000000000000..f6646f1d0126 --- /dev/null +++ b/pkgs/development/tools/build-managers/gnumake/4.0/impure-dirs.patch @@ -0,0 +1,34 @@ +diff -rc read.c read.c +*** read.c 2006-03-17 15:24:20.000000000 +0100 +--- read.c 2007-05-24 17:16:31.000000000 +0200 +*************** +*** 99,107 **** +--- 99,109 ---- + #endif + INCLUDEDIR, + #ifndef _AMIGA ++ #if 0 + "/usr/gnu/include", + "/usr/local/include", + "/usr/include", ++ #endif + #endif + 0 + }; +diff -rc reremake.c +*** remake.c 2006-03-20 03:36:37.000000000 +0100 +--- remake.c 2007-05-24 17:06:54.000000000 +0200 +*************** +*** 1452,1460 **** +--- 1452,1462 ---- + static char *dirs[] = + { + #ifndef _AMIGA ++ #if 0 + "/lib", + "/usr/lib", + #endif ++ #endif + #if defined(WINDOWS32) && !defined(LIBDIR) + /* + * This is completely up to the user at product install time. Just define diff --git a/pkgs/development/tools/build-managers/simple-build-tool/default.nix b/pkgs/development/tools/build-managers/simple-build-tool/default.nix index 13a216799a2d..8f01486cfe72 100644 --- a/pkgs/development/tools/build-managers/simple-build-tool/default.nix +++ b/pkgs/development/tools/build-managers/simple-build-tool/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { cat > $out/bin/sbt << EOF #!/bin/sh SBT_OPTS="-Xms512M -Xmx1536M -Xss1M -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=384M" - ${jre}/bin/java $SBT_OPTS -jar ${src} "\$@" + ${jre}/bin/java \$SBT_OPTS -jar ${src} "\$@" EOF chmod +x $out/bin/sbt ''; diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix index 7437e2e2262c..d574f9c860f6 100644 --- a/pkgs/games/anki/default.nix +++ b/pkgs/games/anki/default.nix @@ -9,10 +9,10 @@ let in stdenv.mkDerivation rec { - name = "anki-2.0.12"; + name = "anki-2.0.18"; src = fetchurl { url = "http://ankisrs.net/download/mirror/${name}.tgz"; - sha256 = "1pccws3rgfpyxdx5xph5x72c4a46is0alfz73icn9ppgjdizzipr"; + sha256 = "1hpla3bgg7zh05f1dgycs5j4a01hnim66a8q2qzihf1r5zanr50j"; }; pythonPath = [ pyqt4 py.pysqlite py.sqlalchemy py.pyaudio ] @@ -66,6 +66,7 @@ stdenv.mkDerivation rec { * even practicing guitar chords! ''; license = "GPLv3"; + maintainers = with stdenv.lib.maintainers; [ the-kenny ]; platforms = stdenv.lib.platforms.mesaPlatforms; }; } diff --git a/pkgs/games/spring/springlobby.nix b/pkgs/games/spring/springlobby.nix index ac4869f78380..f522eef8eb91 100644 --- a/pkgs/games/spring/springlobby.nix +++ b/pkgs/games/spring/springlobby.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "springlobby-${version}"; - version = "0.176"; + version = "0.180"; src = fetchurl { url = "http://www.springlobby.info/tarballs/springlobby-${version}.tar.bz2"; - sha256 = "0a5pnd15rlvbkvnz2s0axy3i7m2jlrk91kjpwflnrcqlf42c2rk9"; + sha256 = "0v2pwrwiwiggyl95rcyfj3pdlwsss5vcmnyzd40r9swb9gyi55na"; }; buildInputs = [ diff --git a/pkgs/misc/emulators/wine/winetricks.nix b/pkgs/misc/emulators/wine/winetricks.nix index 71cc2767f698..e3fe48ec8a3c 100644 --- a/pkgs/misc/emulators/wine/winetricks.nix +++ b/pkgs/misc/emulators/wine/winetricks.nix @@ -1,19 +1,20 @@ -{ stdenv, fetchsvn, wine, perl, which, coreutils, zenity, curl, cabextract, unzip, p7zip } : +{ stdenv, fetchsvn, wine, perl, which, coreutils, zenity, curl +, cabextract, unzip, p7zip, gnused, gnugrep, bash } : stdenv.mkDerivation rec { - rev = "939"; + rev = "1078"; name = "winetricks-${rev}"; src = fetchsvn { url = "http://winetricks.googlecode.com/svn/trunk"; inherit rev; - sha256 = "01v13qw4sxmfm09g9amqycnzy743gdrhvv23rjr9255dzlrj1s8f"; + sha256 = "0ipvld0r5h6x2pgqkqa82q0w9flx6fn9aha8fd7axf5ji2gzmidm"; }; buildInputs = [ perl which ]; pathAdd = stdenv.lib.concatStringsSep "/bin:" # coreutils is for sha1sum - [ wine perl which coreutils zenity curl cabextract unzip p7zip ] + [ wine perl which coreutils zenity curl cabextract unzip p7zip gnused gnugrep bash ] + "/bin"; patch = ./winetricks.patch; @@ -24,6 +25,7 @@ stdenv.mkDerivation rec { description = "A script to install DLLs needed to work around problems in Wine"; license = "LGPLv2.1"; homepage = http://code.google.com/p/winetricks/; + maintainers = with stdenv.lib.maintainers; [ the-kenny ]; }; } diff --git a/pkgs/os-specific/linux/apparmor/default.nix b/pkgs/os-specific/linux/apparmor/default.nix index 858be431a91d..51fe768df834 100644 --- a/pkgs/os-specific/linux/apparmor/default.nix +++ b/pkgs/os-specific/linux/apparmor/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "apparmor-${version}"; - version = "2.8.1"; + version = "2.8.2"; src = fetchurl { url = "http://launchpad.net/apparmor/2.8/${version}/+download/${name}.tar.gz"; - sha256 = "1r0a5k14jbiik28m5gql0f3dbxl252jya7i120rrsbzqqnvw6nw7"; + sha256 = "1fyjvfkvl0fc7agmz64ck8c965940xvcljrczq1z66sydivkybvl"; }; buildInputs = [ diff --git a/pkgs/os-specific/linux/kernel/linux-3.12.nix b/pkgs/os-specific/linux/kernel/linux-3.12.nix index df5f596dc74e..842d2911f770 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.12.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.12.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.12.3"; + version = "3.12.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "b649c759646a630893c98855fb7e9e87e954105e3acac7b81ca85b1161572713"; + sha256 = "c56317810e5716dd2be7ad947a6bd174460f7cf9afb33b700a052aa91f73f9bb"; }; features.iwlwifi = true; diff --git a/pkgs/servers/http/apache-httpd/2.2.nix b/pkgs/servers/http/apache-httpd/2.2.nix index c91d6bbf761a..f6b31177157c 100644 --- a/pkgs/servers/http/apache-httpd/2.2.nix +++ b/pkgs/servers/http/apache-httpd/2.2.nix @@ -12,12 +12,12 @@ assert ldapSupport -> aprutil.ldapSupport && openldap != null; assert mpm == "prefork" || mpm == "worker" || mpm == "event"; stdenv.mkDerivation rec { - version = "2.2.25"; + version = "2.2.26"; name = "apache-httpd-${version}"; src = fetchurl { url = "mirror://apache/httpd/httpd-${version}.tar.bz2"; - sha1 = "e34222d1a8de38825397a1c70949bcc5836a1236"; + sha256 = "1dj29cl2bsk8ir8hxw0ajhbpbrrmsh8mwqfc1ipiqgv7slyqx45g"; }; buildInputs = [perl apr aprutil pcre] ++ diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix index 9e687e9c843a..2bbe9798de46 100644 --- a/pkgs/servers/http/apache-httpd/2.4.nix +++ b/pkgs/servers/http/apache-httpd/2.4.nix @@ -14,12 +14,12 @@ assert sslSupport -> aprutil.sslSupport && openssl != null; assert ldapSupport -> aprutil.ldapSupport && openldap != null; stdenv.mkDerivation rec { - version = "2.4.6"; + version = "2.4.7"; name = "apache-httpd-${version}"; src = fetchurl { url = "mirror://apache/httpd/httpd-${version}.tar.bz2"; - sha1 = "16d8ec72535ded65d035122b0d944b0e64eaa2a2"; + sha256 = "06z7ij0avr8f3rvp6ifk3dn8j73i17cn4avz4fp1as43061qsdk4"; }; buildInputs = [perl] ++ diff --git a/pkgs/servers/memcached/default.nix b/pkgs/servers/memcached/default.nix index 1c3c3f706e48..ef77c3191cab 100644 --- a/pkgs/servers/memcached/default.nix +++ b/pkgs/servers/memcached/default.nix @@ -12,6 +12,7 @@ stdenv.mkDerivation { meta = { description = "A distributed memory object caching system"; + repositories.git = https://github.com/memcached/memcached.git; homepage = http://memcached.org/; license = "bsd"; maintainers = [ stdenv.lib.maintainers.coconnor ]; diff --git a/pkgs/tools/backup/rdiff-backup/default.nix b/pkgs/tools/backup/rdiff-backup/default.nix index d52cbdebb677..d58815f6d6dd 100644 --- a/pkgs/tools/backup/rdiff-backup/default.nix +++ b/pkgs/tools/backup/rdiff-backup/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, python, librsync, gnused }: stdenv.mkDerivation { - name = "rdiff-backup-1.2.8"; + name = "rdiff-backup-1.3.3"; src = fetchurl { - url = mirror://savannah/rdiff-backup/rdiff-backup-1.2.8.tar.gz; - sha256 = "1nwmmh816f96h0ff1jxk95ad38ilbhbdl5dgibx1d4cl81dsi48d"; + url = mirror://savannah/rdiff-backup/rdiff-backup-1.3.3.tar.gz; + sha256 = "01hcwf5rgqi303fa4kdjkbpa7n8mvvh7h9gpgh2b23nz73k0q0zf"; }; phases = "unpackPhase installPhase"; @@ -15,11 +15,12 @@ stdenv.mkDerivation { "/import sys/ asys.path += [ \"$out/lib/python2.7/site-packages/\" ]" ''; - buildInputs = [python librsync gnused ]; + buildInputs = [ python librsync gnused ]; meta = { description = "backup system trying to combine best a mirror and an incremental backup system"; homepage = http://rdiff-backup.nongnu.org/; license = "GPL-2"; + maintainers = with stdenv.lib.maintainers; [ the-kenny ]; }; } diff --git a/pkgs/tools/filesystems/dosfstools/default.nix b/pkgs/tools/filesystems/dosfstools/default.nix index a98def328352..b9f101059186 100644 --- a/pkgs/tools/filesystems/dosfstools/default.nix +++ b/pkgs/tools/filesystems/dosfstools/default.nix @@ -1,17 +1,18 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "dosfstools-3.0.21"; + name = "dosfstools-3.0.24"; src = fetchurl { url = "http://daniel-baumann.ch/files/software/dosfstools/${name}.tar.xz"; - sha256 = "12c9ilcpknm7hg3czkc50azndd0yjdj4jjnvizhwqxy3g0gm2960"; + sha256 = "1hblhb98wm9gm60y32psdqm5jprs4a6dqzrapzgb6bw7r3kvf88y"; }; makeFlags = "PREFIX=$(out)"; meta = { description = "Utilities for creating and checking FAT and VFAT file systems"; + repositories.git = git://daniel-baumann.ch/git/software/dosfstools.git; homepage = http://www.daniel-baumann.ch/software/dosfstools/; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 86ef76178081..77d7efdb5f68 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, python, zip }: let - version = "2013.10.23.2"; + version = "2013.12.08.1"; in stdenv.mkDerivation rec { name = "youtube-dl-${version}"; src = fetchurl { url = "http://youtube-dl.org/downloads/${version}/${name}.tar.gz"; - sha256 = "d3f4c9e0da165395856e690314caa5eef4382bd994dd46f041a520bf9747c35d"; + sha256 = "0sqdc0fbk6xlfd5d2iy4r9kr5inl0122zzri08zndpl4cbzawhaq"; }; buildInputs = [ python ]; @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://rg3.github.com/youtube-dl/"; + repositories.git = https://github.com/rg3/youtube-dl.git; description = "Command-line tool to download videos from YouTube.com and other sites"; platforms = with stdenv.lib.platforms; linux ++ darwin; diff --git a/pkgs/tools/networking/dropbear/default.nix b/pkgs/tools/networking/dropbear/default.nix index 933267eff23d..00e747da7c7e 100644 --- a/pkgs/tools/networking/dropbear/default.nix +++ b/pkgs/tools/networking/dropbear/default.nix @@ -2,11 +2,11 @@ sftpPath ? "/var/run/current-system/sw/libexec/sftp-server" }: stdenv.mkDerivation rec { - name = "dropbear-2013.60"; + name = "dropbear-2013.62"; src = fetchurl { url = "http://matt.ucc.asn.au/dropbear/releases/${name}.tar.bz2"; - sha256 = "1fw1hrcavfqjmsn34dhkrzh8w06yfqvfss2rkvvnxnad7d2m432c"; + sha256 = "1ylz0zd68cxdgs4x4cpc2y8h75395y10bxb1qflv0m6cpc166rf6"; }; dontDisableStatic = enableStatic; diff --git a/pkgs/tools/networking/p2p/amule/default.nix b/pkgs/tools/networking/p2p/amule/default.nix index 44384507a79d..039fca35ab3a 100644 --- a/pkgs/tools/networking/p2p/amule/default.nix +++ b/pkgs/tools/networking/p2p/amule/default.nix @@ -12,11 +12,11 @@ let edf = enabled: flag: if enabled then "--enable-" + flag else "--disable-" + flag; in mkDerivation rec { - name = "aMule-2.2.6"; + name = "aMule-2.3.1"; src = fetchurl { url = "mirror://sourceforge/amule/${name}.tar.bz2"; - sha256 = "08l1931hcg1ia8yvhgx70hx64mknjnfn6l78m0ja44w13mgjpqvc"; + sha256 = "17g6xh6k7rqy2sjp9l4m7h4in96cqwk5gfgg4fhlymzc6jfa3vfj"; }; buildInputs = diff --git a/pkgs/tools/networking/p2p/libtorrent/default.nix b/pkgs/tools/networking/p2p/libtorrent/default.nix index fb0a889d3eeb..ea376fd2a7bd 100644 --- a/pkgs/tools/networking/p2p/libtorrent/default.nix +++ b/pkgs/tools/networking/p2p/libtorrent/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pkgconfig, openssl, libsigcxx }: let - version = "0.13.2"; + version = "0.13.3"; in stdenv.mkDerivation { name = "libtorrent-${version}"; src = fetchurl { url = "http://libtorrent.rakshasa.no/downloads/libtorrent-${version}.tar.gz"; - sha256 = "ed2f2dea16c29cac63fa2724f6658786d955f975861fa6811bcf1597ff8a5e4f"; + sha256 = "0xsnyd1hnfvfq67y5s0ddhj2lhxmfms4djblaa0d1y5phdkpsc9l"; }; buildInputs = [ pkgconfig openssl libsigcxx ]; diff --git a/pkgs/tools/networking/p2p/rtorrent/default.nix b/pkgs/tools/networking/p2p/rtorrent/default.nix index b503c1d91521..78eaf81e8191 100644 --- a/pkgs/tools/networking/p2p/rtorrent/default.nix +++ b/pkgs/tools/networking/p2p/rtorrent/default.nix @@ -1,24 +1,22 @@ { stdenv, fetchurl, libtorrent, ncurses, pkgconfig, libsigcxx, curl -, zlib, openssl }: +, zlib, openssl +}: -let - version = "0.9.2"; -in -stdenv.mkDerivation { - name = "rtorrent-${version}"; +stdenv.mkDerivation rec { + name = "rtorrent-0.9.3"; src = fetchurl { - url = "http://libtorrent.rakshasa.no/downloads/rtorrent-${version}.tar.gz"; - sha256 = "5c8f8c780bee376afce3c1cde2f5ecb928f40bac23b2b8171deed5cf3c888c3d"; + url = "http://libtorrent.rakshasa.no/downloads/${name}.tar.gz"; + sha256 = "043krhsiawigf8yjd5qfkdn5iqrssph1705dsx5fgbxipr0wm4wy"; }; buildInputs = [ libtorrent ncurses pkgconfig libsigcxx curl zlib openssl ]; - postInstall = '' - mkdir -p $out/share/man/man1 $out/share/rtorrent - mv doc/rtorrent.1 $out/share/man/man1/rtorrent.1 - mv doc/rtorrent.rc $out/share/rtorrent/rtorrent.rc - ''; + # postInstall = '' + # mkdir -p $out/share/man/man1 $out/share/rtorrent + # mv doc/rtorrent.1 $out/share/man/man1/rtorrent.1 + # mv doc/rtorrent.rc $out/share/rtorrent/rtorrent.rc + # ''; meta = { homepage = "http://libtorrent.rakshasa.no/"; diff --git a/pkgs/tools/security/clamav/default.nix b/pkgs/tools/security/clamav/default.nix index 858320004b84..8315078c80f9 100644 --- a/pkgs/tools/security/clamav/default.nix +++ b/pkgs/tools/security/clamav/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, zlib, bzip2, libiconv }: stdenv.mkDerivation rec { name = "clamav-${version}"; - version = "0.97.8"; + version = "0.98"; src = fetchurl { url = "mirror://sourceforge/clamav/clamav-${version}.tar.gz"; - sha256 = "04pwm8a84silnvgimn2wi2wgwdzwpskybx72mp10ni1dd7yvswnq"; + sha256 = "1dmkaa6sqynv4v74s9izq7m7kk8d78rvwyd123q4gva6gx9m0d0i"; }; buildInputs = [ zlib bzip2 libiconv ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 94b16df6ae03..31cfcc41b5dc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2820,6 +2820,8 @@ let oraclejdk = pkgs.jdkdistro true false; + oraclejdk7 = pkgs.oraclejdk7distro true false; + oraclejre = lowPrio (pkgs.jdkdistro false false); jrePlugin = lowPrio (pkgs.jdkdistro false true); @@ -2833,6 +2835,11 @@ let (if pluginSupport then appendToName "plugin" else x: x) (callPackage ../development/compilers/jdk/jdk6-linux.nix { }); + oraclejdk7distro = installjdk: pluginSupport: + assert supportsJDK; + (if pluginSupport then appendToName "plugin" else x: x) + (callPackage ../development/compilers/jdk/jdk7-linux.nix { inherit installjdk; }); + jikes = callPackage ../development/compilers/jikes { }; julia = callPackage ../development/compilers/julia { @@ -2926,6 +2933,7 @@ let camlimages = callPackage ../development/ocaml-modules/camlimages { libpng = libpng12; + giflib = giflib_4_1; }; ocaml_cairo = callPackage ../development/ocaml-modules/ocaml-cairo { }; @@ -3643,10 +3651,11 @@ let gnum4 = callPackage ../development/tools/misc/gnum4 { }; - gnumake = callPackage ../development/tools/build-managers/gnumake { }; - - gnumake380 = callPackage ../development/tools/build-managers/gnumake-3.80 { }; - gnumake381 = callPackage ../development/tools/build-managers/gnumake/3.81.nix { }; + gnumake380 = callPackage ../development/tools/build-managers/gnumake/3.80 { }; + gnumake381 = callPackage ../development/tools/build-managers/gnumake/3.81 { }; + gnumake382 = callPackage ../development/tools/build-managers/gnumake/3.82 { }; + gnumake40 = callPackage ../development/tools/build-managers/gnumake/4.0 { }; + gnumake = gnumake382; gob2 = callPackage ../development/tools/misc/gob2 { }; @@ -4332,6 +4341,7 @@ let glsurf = callPackage ../applications/science/math/glsurf { inherit (ocamlPackages) lablgl findlib camlimages ocaml_mysql mlgmp; libpng = libpng12; + giflib = giflib_4_1; }; gmime = callPackage ../development/libraries/gmime { }; @@ -5095,6 +5105,7 @@ let libupnp = callPackage ../development/libraries/pupnp { }; giflib = callPackage ../development/libraries/giflib { }; + giflib_4_1 = callPackage ../development/libraries/giflib/4.1.nix { }; libungif = callPackage ../development/libraries/giflib/libungif.nix { }; @@ -5400,7 +5411,9 @@ let openjpeg = callPackage ../development/libraries/openjpeg { lcms = lcms2; }; - openscenegraph = callPackage ../development/libraries/openscenegraph {}; + openscenegraph = callPackage ../development/libraries/openscenegraph { + giflib = giflib_4_1; + }; openssl = callPackage ../development/libraries/openssl { fetchurl = fetchurlBoot; @@ -7464,7 +7477,9 @@ let arora = callPackage ../applications/networking/browsers/arora { }; - aseprite = callPackage ../applications/editors/aseprite { }; + aseprite = callPackage ../applications/editors/aseprite { + giflib = giflib_4_1; + }; audacious = callPackage ../applications/audio/audacious { }; @@ -8494,7 +8509,7 @@ let jackSupport = config.mumble.jackSupport or false; }; - murmur = callPackage ../applications/networking/mumble/murmur.nix { + murmur = callPackage ../applications/networking/mumble/murmur.nix { avahi = avahi.override { withLibdnssdCompat = true; }; @@ -10347,6 +10362,7 @@ let vice = callPackage ../misc/emulators/vice { libX11 = xlibs.libX11; + giflib = giflib_4_1; }; viewnior = callPackage ../applications/graphics/viewnior { }; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 747ce660b511..40446bcd3660 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -975,6 +975,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x esqueleto = callPackage ../development/libraries/haskell/esqueleto {}; + exPool = callPackage ../development/libraries/haskell/ex-pool { hashable = self.hashable_1_2_1_0; }; + exceptionMtl = callPackage ../development/libraries/haskell/exception-mtl {}; exceptionTransformers = callPackage ../development/libraries/haskell/exception-transformers {}; @@ -992,6 +994,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x fileLocation = callPackage ../development/libraries/haskell/file-location {}; + extensibleEffects = callPackage ../development/libraries/haskell/extensible-effects {}; + extensibleExceptions_0_1_1_0 = callPackage ../development/libraries/haskell/extensible-exceptions/0.1.1.0.nix {}; extensibleExceptions_0_1_1_2 = callPackage ../development/libraries/haskell/extensible-exceptions/0.1.1.2.nix {}; extensibleExceptions_0_1_1_3 = callPackage ../development/libraries/haskell/extensible-exceptions/0.1.1.3.nix {}; @@ -1170,6 +1174,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x hashtables = callPackage ../development/libraries/haskell/hashtables {}; + haskelldb = callPackage ../development/libraries/haskell/haskelldb {}; + haskeline = callPackage ../development/libraries/haskell/haskeline {}; haskelineClass = callPackage ../development/libraries/haskell/haskeline-class {}; @@ -1361,6 +1367,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x intervals = callPackage ../development/libraries/haskell/intervals {}; + IntervalMap = callPackage ../development/libraries/haskell/IntervalMap {}; + ioChoice = callPackage ../development/libraries/haskell/io-choice {}; IORefCAS = callPackage ../development/libraries/haskell/IORefCAS {}; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index cc62eaec86d4..cccd1363864b 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -309,7 +309,6 @@ let vim = linux; vimHugeX = linux; VisualBoyAdvance = linux; - vlc = linux; vncrec = linux; vorbisTools = linux; vpnc = linux; |