diff options
Diffstat (limited to 'pkgs/applications')
105 files changed, 1342 insertions, 692 deletions
diff --git a/pkgs/applications/audio/amarok/default.nix b/pkgs/applications/audio/amarok/default.nix index ab39babc48ade..d1e79bae0828b 100644 --- a/pkgs/applications/audio/amarok/default.nix +++ b/pkgs/applications/audio/amarok/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "amarok"; - version = "2.4.0"; + version = "2.4.3"; src = fetchurl { url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.bz2"; - sha256 = "52be0e926d1362828a4bf64e2a174dc009c85f6f33da4ca589f0f09ab9b7085c"; + sha256 = "0242psqci1b6wfhrrds14h4c4qin9s83cxk1259d9hqcsgn4ir3c"; }; QT_PLUGIN_PATH="${qtscriptgenerator}/lib/qt4/plugins"; diff --git a/pkgs/applications/audio/ardour/ardour3.nix b/pkgs/applications/audio/ardour/ardour3.nix index 6705afcfb54ca..dea27cb6a5527 100644 --- a/pkgs/applications/audio/ardour/ardour3.nix +++ b/pkgs/applications/audio/ardour/ardour3.nix @@ -5,16 +5,16 @@ librdf_raptor, librdf_rasqal, libsamplerate, libsigcxx, libsndfile, libusb, libuuid, libxml2, libxslt, pango, perl, pkgconfig, python }: let - rev = "9484"; + rev = "9942"; in stdenv.mkDerivation { - name = "ardour-3.0-${rev}"; + name = "ardour3-svn-${rev}"; src = fetchsvn { url = http://subversion.ardour.org/svn/ardour2/branches/3.0; inherit rev; - sha256 = "13j490kw66sslxibfab8hmm2k6gapvsriqa4av02y438dr1k4skf"; + sha256 = "5f463e5a67bcb1ee6b4d24c25307419ea14ce52130819054b775e377c31a0664"; }; buildInputs = [ alsaLib aubio boost cairomm curl fftw fftwSinglePrec diff --git a/pkgs/applications/audio/audacious/default.nix b/pkgs/applications/audio/audacious/default.nix index 25d651eabfd23..5124ff5d6dd9f 100644 --- a/pkgs/applications/audio/audacious/default.nix +++ b/pkgs/applications/audio/audacious/default.nix @@ -4,20 +4,20 @@ }: stdenv.mkDerivation rec { - name = "audacious-2.4.2"; + name = "audacious-3.0"; src = fetchurl { - url = "http://distfiles.atheme.org/${name}.tgz"; - sha256 = "03dd0fn17znjbmnc7hiafsg1axiwysk9q4r21s6giy2yfwhi8b30"; + url = "http://distfiles.atheme.org/${name}.tar.gz"; + sha256 = "0kj78hgf73fmbm6y3idir2kavbnnlv0jb9ka0pcsb12sxb994s68"; }; pluginsSrc = fetchurl { - url = "http://distfiles.atheme.org/audacious-plugins-2.4.2.tgz"; - sha256 = "1a2vbqyamlpvnhr3mm8b5i9304d16c796v2ycw3i396ppjvnhyxz"; + url = "http://distfiles.atheme.org/audacious-plugins-3.0.tar.gz"; + sha256 = "0hhxk1mxnnrb1shshpf1nf8mqpc9q1qpsljwn4jzylcnwy6pq4rw"; }; # `--enable-amidiplug' is to prevent configure from looking in /proc/asound. - configureFlags = "--enable-amidiplug"; + configureFlags = "--enable-amidiplug --disable-oss"; buildInputs = [ gettext pkgconfig glib gtk libmowgli libmcs libxml2 dbus_glib @@ -46,6 +46,8 @@ stdenv.mkDerivation rec { ) ''; + enableParallelBuilding = true; + meta = { description = "Audacious, a media player forked from the Beep Media Player, which was itself an XMMS fork"; homepage = http://audacious-media-player.org/; diff --git a/pkgs/applications/audio/cdparanoia/default.nix b/pkgs/applications/audio/cdparanoia/default.nix index 6fa69beee20ee..6bd9e0b376e9d 100644 --- a/pkgs/applications/audio/cdparanoia/default.nix +++ b/pkgs/applications/audio/cdparanoia/default.nix @@ -1,15 +1,15 @@ -{stdenv, fetchurl}: +{ stdenv, fetchurl }: -stdenv.mkDerivation { - name = "cdparanoia-III-alpha9.8"; +stdenv.mkDerivation rec { + name = "cdparanoia-III-10.2"; + src = fetchurl { - url = http://downloads.xiph.org/releases/cdparanoia/cdparanoia-III-alpha9.8.src.tgz; - md5 = "7218e778b5970a86c958e597f952f193"; + url = "http://downloads.xiph.org/releases/cdparanoia/${name}.src.tgz"; + sha256 = "1pv4zrajm46za0f6lv162iqffih57a8ly4pc69f7y0gfyigb8p80"; }; - patches = [./fix.patch]; - meta = { homepage = http://xiph.org/paranoia; + description = "A tool and library for reading digital audio from CDs"; }; } diff --git a/pkgs/applications/audio/cdparanoia/fix.patch b/pkgs/applications/audio/cdparanoia/fix.patch deleted file mode 100644 index 4a1c526c7d8c6..0000000000000 --- a/pkgs/applications/audio/cdparanoia/fix.patch +++ /dev/null @@ -1,46 +0,0 @@ -*** cdparanoia-III-alpha9.8/interface/utils.h Thu Apr 20 00:41:04 2000 ---- cdparanoia-III-alpha9.8-old/interface/utils.h Wed Jan 19 21:44:08 2005 -*************** -*** 110,117 **** - case CDDA_MESSAGE_LOGIT: - d->errorbuf=catstring(d->errorbuf,s); - break; -- case CDDA_MESSAGE_FORGETIT: -- default: - } - } - } ---- 110,115 ---- -*************** -*** 125,132 **** - case CDDA_MESSAGE_LOGIT: - d->messagebuf=catstring(d->messagebuf,s); - break; -- case CDDA_MESSAGE_FORGETIT: -- default: - } - } - } ---- 123,128 ---- -*************** -*** 167,174 **** - } - } - break; -- case CDDA_MESSAGE_FORGETIT: -- default: - } - } - if(malloced)free(buffer); ---- 163,168 ---- -*************** -*** 203,210 **** - if(!malloced)*messages=catstring(*messages,"\n"); - } - break; -- case CDDA_MESSAGE_FORGETIT: -- default: - } - } - if(malloced)free(buffer); ---- 197,202 ---- diff --git a/pkgs/applications/audio/qjackctl/default.nix b/pkgs/applications/audio/qjackctl/default.nix index 30527171e57cf..4cdea1a21ce3e 100644 --- a/pkgs/applications/audio/qjackctl/default.nix +++ b/pkgs/applications/audio/qjackctl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qt4, alsaLib, jackaudio }: +{ stdenv, fetchurl, qt4, alsaLib, jackaudio, dbus }: stdenv.mkDerivation rec { version = "0.3.7"; @@ -11,9 +11,9 @@ stdenv.mkDerivation rec { sha256 = "1gynym21d8d4d38qyl817qg0v8360brcpga4wcdapccbgpaz3c28"; }; - buildInputs = [ qt4 alsaLib jackaudio ]; + buildInputs = [ qt4 alsaLib jackaudio dbus ]; - meta = { + meta = { description = "qt jackd control gui tool"; homepage = http://qjackctl.sourceforge.net/; license = "GPL"; diff --git a/pkgs/applications/audio/qtractor/default.nix b/pkgs/applications/audio/qtractor/default.nix index 4a257b0de5c72..7634ecc01da24 100644 --- a/pkgs/applications/audio/qtractor/default.nix +++ b/pkgs/applications/audio/qtractor/default.nix @@ -1,22 +1,19 @@ -{ alsaLib, autoconf, automake, dssi, fetchsvn, gtk, jackaudio, -ladspaH, ladspaPlugins, liblo, libmad, libsndfile, libtool, libvorbis, -pkgconfig, qt4, rubberband, stdenv }: +{ alsaLib, autoconf, automake, dssi, fetchurl, gtk, jackaudio, +ladspaH, ladspaPlugins, liblo, libmad, libsamplerate, libsndfile, +libtool, libvorbis, pkgconfig, qt4, rubberband, stdenv }: stdenv.mkDerivation rec { - version = "svn-1992"; + version = "0.5.0"; name = "qtractor-${version}"; - src = fetchsvn { - url = "http://qtractor.svn.sourceforge.net/svnroot/qtractor/trunk"; - rev = "1992"; - sha256 = "10k0w5pzci21k1i32jzv5gdkbs34iv4hdn6dzp3n5048hvrp1hiy"; + src = fetchurl { + url = "mirror://sourceforge/qtractor/${name}.tar.gz"; + sha256 = "de5991d2d29b2713d73a90ab29efc24db0be68d8e9ca328062d53d229e902e89"; }; - preConfigure = "make -f Makefile.svn"; - buildInputs = [ alsaLib autoconf automake dssi gtk jackaudio ladspaH - ladspaPlugins liblo libmad libsndfile libtool libvorbis pkgconfig - qt4 rubberband ]; + ladspaPlugins liblo libmad libsamplerate libsndfile libtool + libvorbis pkgconfig qt4 rubberband ]; meta = with stdenv.lib; { description = "Audio/MIDI multi-track sequencer"; diff --git a/pkgs/applications/audio/sonic-visualiser/default.nix b/pkgs/applications/audio/sonic-visualiser/default.nix index e6566c81eb76b..d3ac4c4168c8f 100644 --- a/pkgs/applications/audio/sonic-visualiser/default.nix +++ b/pkgs/applications/audio/sonic-visualiser/default.nix @@ -2,7 +2,7 @@ { stdenv, fetchurl, alsaLib, bzip2, fftw, jackaudio, libX11, liblo, libmad, libogg, librdf, librdf_raptor, librdf_rasqal, libsamplerate, -libsndfile, makeWrapper, pulseaudio, qt, redland, rubberband, vampSDK +libsndfile, makeWrapper, pulseaudio, qt4, redland, rubberband, vampSDK }: stdenv.mkDerivation { @@ -14,7 +14,7 @@ stdenv.mkDerivation { }; buildInputs = - [ libsndfile qt fftw /* should be fftw3f ??*/ bzip2 librdf rubberband + [ libsndfile qt4 fftw /* should be fftw3f ??*/ bzip2 librdf rubberband libsamplerate vampSDK alsaLib librdf_raptor librdf_rasqal redland # optional jackaudio diff --git a/pkgs/applications/audio/sonic-visualizer/default.nix b/pkgs/applications/audio/sonic-visualizer/default.nix deleted file mode 100644 index 6e40baa1c3604..0000000000000 --- a/pkgs/applications/audio/sonic-visualizer/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -# TODO add plugins having various licenses, see http://www.vamp-plugins.org/download.html - -{ stdenv, fetchurl, libsndfile, qt, fftw, librdf, rubberband -, libsamplerate, vampSDK, alsaLib, librdf_raptor, librdf_rasqal -, redland, jackaudio, pulseaudio, libmad, libogg, liblo, bzip2 }: - -stdenv.mkDerivation { - name = "sonic-visualizer-1.6"; - - src = fetchurl { - url = http://downloads.sourceforge.net/sv1/sonic-visualiser-1.6.tar.bz2; - sha256 = "1dbqqa7anii2jnjpfwm4sr83nn4bwmz68xw4n6clycsz5iqk52f5"; - }; - - buildInputs = - [ libsndfile qt fftw /* should be fftw3f ??*/ bzip2 librdf rubberband - libsamplerate vampSDK alsaLib librdf_raptor librdf_rasqal redland - # optional - jackaudio - # portaudio - pulseaudio - libmad - libogg # ? - # fishsound - liblo - ]; - - buildPhase = '' - qmake -makefile PREFIX=$out && make - ''; - - installPhase = '' - ensureDir $out/{bin,share/sv} - cp sv/sonic-visualiser $out/bin - cp -r sv/samples $out/share/sv/samples - ''; - - meta = { - description = "View and analyse contents of music audio files"; - homepage = http://www.sonicvisualiser.org/; - license = "GPLv2"; - maintainers = [ stdenv.lib.maintainers.marcweber ]; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index 51c4b733d3076..eb783e60fc5fb 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -2,7 +2,7 @@ assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; -let version = "0.5.1.151"; in +let version = "0.5.2.84"; in stdenv.mkDerivation { name = "spotify-${version}"; @@ -10,13 +10,13 @@ stdenv.mkDerivation { src = if stdenv.system == "i686-linux" then fetchurl { - url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client-qt_${version}.g7c8c074-1_i386.deb"; - sha256 = "1zs52hlji3niaiw9lhwmq1393cydr3i494gpzk3fpwr9n8m1jbk0"; + url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client-qt_${version}.g6d797eb-1_i386.deb"; + sha256 = "0l1pvvkkssng0yc7zlgxr39jx3cs6i71sspmm4xb84y1bl045pas"; } else if stdenv.system == "x86_64-linux" then fetchurl { - url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client-qt_${version}.g7c8c074-1_amd64.deb"; - sha256 = "01yvrggcj1hvdrqmy35x3klv2v20d63knzfh0lrdfbhi99hr6nvx"; + url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client-qt_${version}.g6d797eb-1_amd64.deb"; + sha256 = "1wi1z3dyzjz13mkb0r2ilm914p8sg06923sv872nclrl102qbbni"; } else throw "Spotify not supported on this platform."; diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix index 92f8e14c1361d..bc53dfc70f329 100644 --- a/pkgs/applications/editors/eclipse/default.nix +++ b/pkgs/applications/editors/eclipse/default.nix @@ -126,5 +126,38 @@ in { }; }; + eclipse_sdk_37 = buildEclipse { + name = "eclipse-sdk-3.7"; + description = "Eclipse Classic"; + src = + if stdenv.system == "x86_64-linux" then + fetchurl { + url = http://eclipse.ialto.com/eclipse/downloads/drops/R-3.7-201106131736/eclipse-SDK-3.7-linux-gtk-x86_64.tar.gz; + sha256 = "00ig3ww98r8imf32sx5npm6csn5nx288gvdk6w653nijni0di16j"; + } + else + fetchurl { + url = http://eclipse.ialto.com/eclipse/downloads/drops/R-3.7-201106131736/eclipse-SDK-3.7-linux-gtk.tar.gz; + sha256 = "08rgw85cam51l98mzb39fdc3ykb369v8pap93qhknbs6a3f5dnff"; + }; + }; + + eclipse_cpp_37 = buildEclipse { + name = "eclipse-cpp-3.7"; + description = "Eclipse IDE for C/C++ Developers"; + src = + if stdenv.system == "x86_64-linux" then + fetchurl { + url = http://eclipse.ialto.com/technology/epp/downloads/release/indigo/R/eclipse-cpp-indigo-incubation-linux-gtk-x86_64.tar.gz; + sha256 = "14ppc9g9igzvj1pq7jl01vwhzb66nmzbl9wsdl1sf3xnwa9wnqk3"; + } + else + fetchurl { + url = http://eclipse.ialto.com/technology/epp/downloads/release/indigo/R/eclipse-cpp-indigo-incubation-linux-gtk.tar.gz; + sha256 = "1cvg1vgyazrkinwzlvlf0dpl197p4784752srqybqylyj5psdi3b"; + }; + }; + + } diff --git a/pkgs/applications/editors/kdevelop/default.nix b/pkgs/applications/editors/kdevelop/default.nix index 1b72f8f0b7fb8..e5b749c379470 100644 --- a/pkgs/applications/editors/kdevelop/default.nix +++ b/pkgs/applications/editors/kdevelop/default.nix @@ -1,18 +1,23 @@ { stdenv, fetchurl, kdevplatform, cmake, pkgconfig, automoc4, shared_mime_info, - kdebase_workspace, gettext, perl }: + kdebase_workspace, gettext, perl, kdeutils, kdesdk }: +let + okteta = if kdeutils ? okteta then kdeutils.okteta else kdesdk.okteta; +in stdenv.mkDerivation rec { name = "${pname}-${version}"; - version = "4.0.2"; + version = "4.2.3"; pname = "kdevelop"; src = fetchurl { url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.bz2"; - sha256 = "1y8ydx0fcmsab31qf5id5r5fcmp3j2l8mibvbbjfy66xgxarmnpc"; + sha256 = "0ay3d2s5442pvdsx9lyfzb986kh6848qhbls9ff982f0glzqdcya"; }; buildInputs = [ kdevplatform cmake pkgconfig automoc4 shared_mime_info - kdebase_workspace gettext stdenv.gcc.libc perl ]; + kdebase_workspace gettext stdenv.gcc.libc perl okteta ]; + + NIX_CFLAGS_COMPILE = "-I${okteta}/include/KDE"; meta = with stdenv.lib; { maintainers = [ maintainers.urkud ]; diff --git a/pkgs/applications/editors/leksah/default.nix b/pkgs/applications/editors/leksah/default.nix index dfed150961903..f8a5d6a712fea 100644 --- a/pkgs/applications/editors/leksah/default.nix +++ b/pkgs/applications/editors/leksah/default.nix @@ -1,27 +1,28 @@ -{cabal, gtk, glib, binary, binaryShared, deepseq, hslogger, ltk, network, parsec, - leksahServer, processLeksah, regexBase, regexTDFA, utf8String, gtksourceview2, - makeWrapper}: +{ cabal, binary, binaryShared, deepseq, glib, gtk, gtksourceview2 +, hslogger, leksahServer, ltk, mtl, network, parsec, processLeksah +, regexBase, regexTdfa, strict, time, utf8String +}: -cabal.mkDerivation (self : { +cabal.mkDerivation (self: { pname = "leksah"; - version = "0.8.0.8"; - sha256 = "1d6n5dlnqlqfckg9f611qf9lvi6b7ghrkk1l0myh6h667fxh8a1r"; - - propagatedBuildInputs = - [gtk glib binary binaryShared deepseq hslogger ltk network parsec - leksahServer processLeksah regexBase regexTDFA utf8String gtksourceview2]; - extraBuildInputs = [makeWrapper]; - - # postInstall = - # '' - # wrapProgram $out/bin/leksah --prefix XDG_DATA_DIRS : ${gtk2hs.gtksourceview}/share - # ''; - + version = "0.10.0.4"; + sha256 = "1g12w1kl63fxzz1c2x237yrqkaja9awiqyyipkdms5iql0ini7bw"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + binary binaryShared deepseq glib gtk gtksourceview2 hslogger + leksahServer ltk mtl network parsec processLeksah regexBase + regexTdfa strict time utf8String + ]; + noHaddock = true; meta = { - homepage = http://leksah.org/; - description = "An Integrated Development Environment for Haskell written in Haskell"; + homepage = "http://www.leksah.org"; + description = "Haskell IDE written in Haskell"; license = "GPL"; - maintainers = [self.stdenv.lib.maintainers.andres]; + platforms = self.stdenv.lib.platforms.linux; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; }; -}) - +}) diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix index 18f19f7347e0a..c0ebb95a67a23 100644 --- a/pkgs/applications/graphics/darktable/default.nix +++ b/pkgs/applications/graphics/darktable/default.nix @@ -1,27 +1,47 @@ { stdenv, fetchurl, - GConf, cairo, curl, dbus_glib, exiv2, gnome_keyring, gphoto2, gtk, - intltool, lcms, lensfun, libexif, libglade, libgphoto2, libjpeg, - libpng, libraw1394, librsvg, libtiff, openexr, pkgconfig, sqlite, }: + GConf, atk, cairo, cmake, curl, dbus_glib, exiv2, glib, + gnome_keyring, gphoto2, gtk, ilmbase, intltool, lcms, lcms2, + lensfun, libXau, libXdmcp, libexif, libglade, libgphoto2, libjpeg, + libpng, libpthreadstubs, libraw1394, librsvg, libtiff, libxcb, + openexr, pixman, pkgconfig, sqlite}: stdenv.mkDerivation rec { - version = "0.7.1"; + version = "0.9.1"; name = "darktable-${version}"; src = fetchurl { url = "mirror://sourceforge/darktable/darktable-${version}.tar.gz"; - sha256 = "080gvf5gp3rb0vlsvdgnzrzky9dfpqw5cwnj6z1k8lvryd9fzahm"; + sha256 = "b687a5f1b2a6c8aa230c1dc3ef83bf74a103e3ebe1c61cdea95a612a7375f21e"; }; - patches = [ ./exif.patch ]; + buildInputs = [ + GConf atk cairo cmake curl dbus_glib exiv2 glib gnome_keyring gtk + ilmbase intltool lcms lcms2 lensfun libXau libXdmcp libexif + libglade libgphoto2 libjpeg libpng libpthreadstubs libraw1394 + librsvg libtiff libxcb openexr pixman pkgconfig sqlite]; - buildInputs = [ GConf cairo curl dbus_glib exiv2 gnome_keyring gtk - intltool lcms lensfun libexif libglade - libgphoto2 libjpeg libpng libraw1394 librsvg - libtiff openexr pkgconfig sqlite ]; + preConfigure = '' + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gtk}/include/gtk-2.0" + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gtk}/lib/gtk-2.0/include" + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${cairo}/include/cairo" + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${atk}/include/atk-1.0" + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${ilmbase}/include/OpenEXR" + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${openexr}/include/OpenEXR" + ''; - meta = { - description = "a virtual lighttable and darkroom for photographers"; + cmakeFlags = [ + "-DPTHREAD_INCLUDE_DIR=${stdenv.glibc}/include" + "-DPTHREAD_LIBRARY=${stdenv.glibc}/lib/libpthread.so" + "-DCMAKE_BUILD_TYPE=Release" + "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib}/lib/glib-2.0/include" + "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk}/lib/gtk-2.0/include" + ]; + + meta = with stdenv.lib; { + description = "Virtual lighttable and darkroom for photographers"; homepage = http://darktable.sourceforge.net; - license = stdenv.lib.licenses.gpl3Plus; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = [ maintainers.goibhniu ]; }; } diff --git a/pkgs/applications/graphics/darktable/exif.patch b/pkgs/applications/graphics/darktable/exif.patch deleted file mode 100644 index f1f59d3ef4e47..0000000000000 --- a/pkgs/applications/graphics/darktable/exif.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- darktable-0.7.1/src/common/exif.cc 2011-01-01 12:08:36.000000000 +0100 -+++ darktable-0.7.1/src/common/exif.cc 2011-01-01 12:09:27.000000000 +0100 -@@ -33,7 +33,7 @@ - #include <exiv2/error.hpp> - #include <exiv2/image.hpp> - #include <exiv2/exif.hpp> --#include <exiv2/canonmn.hpp> -+#include <exiv2/exiv2.hpp> - #include <sqlite3.h> - #include <iostream> - #include <fstream> diff --git a/pkgs/applications/graphics/giv/default.nix b/pkgs/applications/graphics/giv/default.nix index a6cf6b205dc0b..d32ef5bbebc98 100644 --- a/pkgs/applications/graphics/giv/default.nix +++ b/pkgs/applications/graphics/giv/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sed -i s,/usr/local,$out, SConstruct ''; - patches = [ ./build.patch ]; + patches = [ ./build.patch ./union.patch ]; buildPhase = "scons"; diff --git a/pkgs/applications/graphics/giv/union.patch b/pkgs/applications/graphics/giv/union.patch new file mode 100644 index 0000000000000..f12fce0361358 --- /dev/null +++ b/pkgs/applications/graphics/giv/union.patch @@ -0,0 +1,38 @@ +Already reported uptream + +diff --git a/src/giv-data.h b/src/giv-data.h +index 64e7696..d34bfe4 100644 +--- a/src/giv-data.h ++++ b/src/giv-data.h +@@ -88,7 +88,7 @@ typedef struct + typedef struct + { + gint op; +- union ++ struct + { + struct + { +diff --git a/src/giv_types.h b/src/giv_types.h +index 02abebe..c3cfb78 100644 +--- a/src/giv_types.h ++++ b/src/giv_types.h +@@ -11,13 +11,11 @@ typedef struct { + + typedef struct { + gint op; +- union { +- struct { +- gdouble x,y; +- } point; +- double arc_dev; +- text_mark_t *text_object; +- } data; ++ struct { ++ gdouble x,y; ++ } point; ++ double arc_dev; ++ text_mark_t *text_object; + } point_t; + + typedef struct { diff --git a/pkgs/applications/graphics/jbrout/default.nix b/pkgs/applications/graphics/jbrout/default.nix new file mode 100644 index 0000000000000..7c3826369ee98 --- /dev/null +++ b/pkgs/applications/graphics/jbrout/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchsvn, buildPythonPackage, python, pyGtkGlade, makeWrapper, pyexiv2, lxml, pil, fbida, which }: + +buildPythonPackage { + name = "jbrout-338"; + version = "338"; + src = fetchsvn { + url = "http://jbrout.googlecode.com/svn/trunk"; + rev = "338"; + sha256 = "0257ni4vkxgd0qhs73fw5ppw1qpf11j8fgwsqc03b1k1yv3hk4hf"; + }; + + doCheck = false; +# XXX: preConfigure to avoid this +# File "/nix/store/vnyjxn6h3rbrn49m25yyw7i1chlxglhw-python-2.7.1/lib/python2.7/zipfile.py", line 348, in FileHeader +# len(filename), len(extra)) +#struct.error: ushort format requires 0 <= number <= USHRT_MAX + + preConfigure = '' + find | xargs touch + ''; + + postInstall = '' + ensureDir $out/bin + echo '#!/bin/sh' > $out/bin/jbrout + echo "python $out/lib/python2.7/site-packages/jbrout-src-py2.7.egg/jbrout/jbrout.py" >> $out/bin/jbrout + chmod +x $out/bin/jbrout + + wrapProgram $out/bin/jbrout \ + --set PYTHONPATH "$out/lib/python:$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pyexiv2}):$(toPythonPath ${lxml}):$(toPythonPath ${pil}):$PYTHONPATH" \ + --set PATH "${fbida}/bin:${which}/bin:$PATH" + ''; + + buildInputs = [ python pyGtkGlade makeWrapper pyexiv2 lxml pil fbida which ]; + meta = { + homepage = "http://code.google.com/p/jbrout"; + description = "jBrout is a photo manager"; + }; +} diff --git a/pkgs/applications/graphics/kipi-plugins/default.nix b/pkgs/applications/graphics/kipi-plugins/default.nix index c3fe93a77ea89..e551b15239044 100644 --- a/pkgs/applications/graphics/kipi-plugins/default.nix +++ b/pkgs/applications/graphics/kipi-plugins/default.nix @@ -1,20 +1,23 @@ -{ stdenv, fetchurl, cmake, qt4, kdelibs, automoc4, phonon, qimageblitz, qca2, -kdegraphics, kdepimlibs, libxml2, libxslt, gettext, opencv, libgpod, gtk }: +{ stdenv, fetchurl, kdelibs, qimageblitz, qca2, kdepimlibs, libxml2, libxslt +, gettext, opencv, libgpod, gdk_pixbuf , qjson, pkgconfig +, cmake, automoc4 +, kdegraphics, libkexiv2 ? kdegraphics, libkdcraw ? kdegraphics +, libkipi ? kdegraphics, libksane ? kdegraphics }: stdenv.mkDerivation rec { - name = "kipi-plugins-1.5.0"; + name = "kipi-plugins-1.9.0"; src = fetchurl { url = "mirror://sourceforge/kipi/${name}.tar.bz2"; - sha256 = "1wsqh0lbsqyzdfmb9f53bmmypw00n80p62ym4pnxb8w0zwlhbkbw"; + sha256 = "0k4k9v1rj7129n0s0i5pvv4rabx0prxqs6sca642fj95cxc6c96m"; }; - buildInputs = [ cmake qt4 kdelibs kdegraphics automoc4 phonon qimageblitz qca2 kdepimlibs - libxml2 libxslt gettext opencv libgpod gtk ]; + buildInputs = + [ kdelibs libkexiv2 libkdcraw libkipi qimageblitz qca2 kdepimlibs libxml2 + libksane libxslt gettext opencv libgpod gdk_pixbuf qjson + ]; - KDEDIRS = kdegraphics; - - patches = [ ./find-gdk.patch ]; + buildNativeInputs = [ pkgconfig cmake automoc4 ]; meta = { description = "Photo Management Program"; diff --git a/pkgs/applications/graphics/kipi-plugins/find-gdk.patch b/pkgs/applications/graphics/kipi-plugins/find-gdk.patch deleted file mode 100644 index 22dcf0323fcb0..0000000000000 --- a/pkgs/applications/graphics/kipi-plugins/find-gdk.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/cmake/modules/FindGdk.cmake b/cmake/modules/FindGdk.cmake -index 033959a..ff61961 100644 ---- a/cmake/modules/FindGdk.cmake -+++ b/cmake/modules/FindGdk.cmake -@@ -23,8 +23,9 @@ else (GDK_INCLUDE_DIR AND GDK_LIBRARIES) - set(GDK_DEFINITIONS ${_GDKCflags}) - endif(NOT WIN32) - -- FIND_PATH(GDK_INCLUDE_DIR gdk-pixbuf/gdk-pixbuf.h /usr/include/gtk-2.0 -- ${_GDKIncDir} -+ FIND_PATH(GDK_INCLUDE_DIR gdk-pixbuf/gdk-pixbuf.h -+ HINTS ${_GDKIncDir} -+ PATH_SUFFIXES gtk-2.0 - ) - - FIND_LIBRARY(GDK_LIBRARIES NAMES gdk_pixbuf-2.0 diff --git a/pkgs/applications/graphics/paraview/default.nix b/pkgs/applications/graphics/paraview/default.nix index 99bed17c966c9..88e3d32080c5e 100644 --- a/pkgs/applications/graphics/paraview/default.nix +++ b/pkgs/applications/graphics/paraview/default.nix @@ -1,20 +1,41 @@ -{ fetchurl, stdenv, cmake, qt4 }: +{ fetchurl, stdenv, cmake, qt4 +, hdf5 +, mpich2 +, python +, libxml2 +, mesa +}: stdenv.mkDerivation rec { - name = "paraview-3.8.1"; + name = "paraview-3.10.1"; src = fetchurl { - url = "http://www.paraview.org/files/v3.8/ParaView-3.8.1.tar.gz"; - sha256 = "0g169vc956gifkd90lcini63dkr5x3id3hkwcwxzriqamxr72r1p"; + url = "http://www.paraview.org/files/v3.10/ParaView-3.10.1.tar.gz"; + sha256 = "1z2wvywpd3rvz4jhfs3mi35hsx4yqkdim58d075jx9kg7gifwga5"; }; + # [ 5%] Generating vtkGLSLShaderLibrary.h + # ../../../bin/ProcessShader: error while loading shared libraries: libvtksys.so.pv3.10: cannot open shared object file: No such file or directory preConfigure = '' - export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/lib/paraview-3.8" + export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/lib/paraview-3.10 -rpath ../../../bin -rpath ../../bin" ''; + cmakeFlags = [ +# "-DPARAVIEW_USE_MPI:BOOL=ON" + "-DPARAVIEW_USE_SYSTEM_HDF5:BOOL=ON" + "-DVTK_USE_SYSTEM_LIBXML2:BOOL=ON" + "-DPARAVIEW_ENABLE_PYTHON:BOOL=ON" +# use -DPARAVIEW_INSTALL_THIRD_PARTY_LIBRARIES:BOOL=OFF \ to fix make install error: http://www.cmake.org/pipermail/paraview/2011-February/020268.html + "-DPARAVIEW_INSTALL_THIRD_PARTY_LIBRARIES:BOOL=OFF" + "-DCMAKE_SKIP_BUILD_RPATH=ON" + "-DVTK_USE_RPATH:BOOL=ON" + "-DPARAVIEW_INSTALL_DEVELOPMENT=ON" +# "-DPYTHON_INCLUDE_DIR=${python}/include" +# "-DPYTHON_LIBRARY=" + ]; # I don't enable it due to memory bounds enableParallelBuilding = false; - buildInputs = [ cmake qt4 ]; + buildInputs = [ cmake qt4 hdf5 mpich2 python libxml2 mesa ]; meta = { homepage = "http://www.paraview.org/"; diff --git a/pkgs/applications/graphics/xscreensaver/default.nix b/pkgs/applications/graphics/xscreensaver/default.nix index ec8a4eaae917e..7458626769a4b 100644 --- a/pkgs/applications/graphics/xscreensaver/default.nix +++ b/pkgs/applications/graphics/xscreensaver/default.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { - version = "5.12"; + version = "5.14"; name = "xscreensaver-${version}"; src = fetchurl { url = "http://www.jwz.org/xscreensaver/${name}.tar.gz"; - sha256="1knvxxr50iq3wrx1qsgg174gzv7xg8c74i1a66ff55f8flksa7di"; + sha256 = "08zhxccdny7198x4yi3hm7jrw98bi3mnc1c4fwhmf5rf8l7h9siy"; }; buildInputs = diff --git a/pkgs/applications/misc/bibletime/default.nix b/pkgs/applications/misc/bibletime/default.nix index e7ae8b4f1757d..53f3a8dee8d8c 100644 --- a/pkgs/applications/misc/bibletime/default.nix +++ b/pkgs/applications/misc/bibletime/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, cmake, sword, qt, boost, cluceneCore}: +{stdenv, fetchurl, cmake, sword, qt4, boost, cluceneCore}: stdenv.mkDerivation rec { @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { name = "bibletime-${version}"; src = fetchurl { - url = "mirror://sourceforge/project/bibletime/BibleTime%202/BibleTime%202%20source%20code/${name}.tar.bz2"; + url = "mirror://sourceforge/bibletime/${name}.tar.bz2"; sha256 = "0171hlwg4rjv93b3gwcyv3nsj2kzwf4n8f6jw6ld18x7xmk9rkdg"; }; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { export SWORD_HOME=${sword}; ''; - buildInputs = [ cmake sword qt boost cluceneCore ]; + buildInputs = [ cmake sword qt4 boost cluceneCore ]; cmakeFlags = "-DUSE_QT_WEBKIT=ON -DCMAKE_BUILD_TYPE=Debug"; diff --git a/pkgs/applications/misc/djvulibre/default.nix b/pkgs/applications/misc/djvulibre/default.nix index 0826f7241c4c3..b1001976ea042 100644 --- a/pkgs/applications/misc/djvulibre/default.nix +++ b/pkgs/applications/misc/djvulibre/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, lib, useQt3 ? false, libjpeg, libtiff, libpng, ghostscript , libungif, zlib, x11, libX11, mesa, qt3 }: -stdenv.mkDerivation { - name = "djvulibre-3.5.22"; +stdenv.mkDerivation rec { + name = "djvulibre-3.5.24"; src = fetchurl { - url = mirror://sourceforge/djvu/djvulibre-3.5.22.tar.gz; - sha256 = "1gphi67qiq1ky7k8vymkwcgla80cwy8smk1rla6grxdqipwl54ix"; + url = "mirror://sourceforge/djvu/${name}.tar.gz"; + sha256 = "0d1592cmc7scg2jzah47mnvbqldhxb1x9vxm7y64a3iasa0lqwy0"; }; buildInputs = [ libjpeg libtiff libpng ghostscript zlib libungif ] ++ diff --git a/pkgs/applications/misc/dmenu/default.nix b/pkgs/applications/misc/dmenu/default.nix index a9ea63368c5d1..2a55512ff26e3 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.1.1"; + name = "dmenu-4.4"; src = fetchurl { url = "http://dl.suckless.org/tools/${name}.tar.gz"; - sha256 = "02p687yi3fmnpkbvnskpryz54dc4i8pzf1spxc554s91wrd7fpwy"; + sha256 = "016hfnmk4kb2n3slxrg4z27p2l8x1awqsig961syssw4p1zybpav"; }; buildInputs = [ libX11 libXinerama ]; diff --git a/pkgs/applications/misc/evince/default.nix b/pkgs/applications/misc/evince/default.nix index 9868254261357..ac81a09c96d85 100644 --- a/pkgs/applications/misc/evince/default.nix +++ b/pkgs/applications/misc/evince/default.nix @@ -3,16 +3,16 @@ , libgnome, libgnomeui, scrollkeeper, libxslt , libglade, gnome_keyring, dbus, dbus_glib , poppler, libspectre, djvulibre, shared_mime_info -, makeWrapper, which +, makeWrapper, which, ghostscript , recentListSize ? null # 5 is not enough, allow passing a different number }: stdenv.mkDerivation rec { - name = "evince-2.26.0"; + name = "evince-2.32.0"; src = fetchurl { - url = "http://ftp.gnome.org/pub/GNOME/sources/evince/2.26/${name}.tar.bz2"; - sha256 = "1wsl5vdrj0829wq223dryq5p7izgzsz6mfl4igix7b5wga42zff1"; + url = "http://ftp.gnome.org/pub/GNOME/sources/evince/2.32/${name}.tar.bz2"; + sha256 = "2a4c91ae38f8b5028cebb91b9da9ddc50ea8ae3f3d429df89ba351da2d787ff7"; }; buildInputs = [ @@ -21,10 +21,13 @@ stdenv.mkDerivation rec { scrollkeeper gnome_keyring libxslt # for `xsltproc' dbus dbus_glib poppler libspectre djvulibre makeWrapper which + ghostscript ]; configureFlags = "--with-libgnome --enable-dbus --enable-pixbuf " + # Do not use nautilus + + " --disable-nautilus " # Do not update Scrollkeeper's database (GNOME's help system). + "--disable-scrollkeeper"; @@ -37,7 +40,7 @@ stdenv.mkDerivation rec { # Tell Glib/GIO about the MIME info directory, which is used # by `g_file_info_get_content_type ()'. wrapProgram "$out/bin/evince" \ - --set XDG_DATA_DIRS "${shared_mime_info}/share" + --prefix XDG_DATA_DIRS : "${shared_mime_info}/share:$out/share" ''; meta = { @@ -53,4 +56,4 @@ stdenv.mkDerivation rec { license = "GPLv2+"; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/misc/get_iplayer/default.nix b/pkgs/applications/misc/get_iplayer/default.nix new file mode 100644 index 0000000000000..1a0453797ccd5 --- /dev/null +++ b/pkgs/applications/misc/get_iplayer/default.nix @@ -0,0 +1,19 @@ +{stdenv, fetchurl, flvstreamer, ffmpeg, makeWrapper, perl}: + +stdenv.mkDerivation { + name = "get_iplayer-2.80"; + + buildInputs = [makeWrapper perl]; + + installPhase = '' + ensureDir $out/bin + cp get_iplayer $out/bin + wrapProgram $out/bin/get_iplayer --suffix PATH ${ffmpeg}/bin:${flvstreamer}/bin + ''; + + src = fetchurl { + url = ftp://ftp.infradead.org/pub/get_iplayer/get_iplayer-2.80.tar.gz; + sha256 = "1hnadryyzca3bv1hfk2q3np9ihwvyxa3prwcrply6ywy4vnayjf8"; + }; + +} diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix index c76efc9d1c53d..7fde09c2175b4 100644 --- a/pkgs/applications/misc/ikiwiki/default.nix +++ b/pkgs/applications/misc/ikiwiki/default.nix @@ -13,14 +13,14 @@ assert monotoneSupport -> (monotone != null); let name = "ikiwiki"; - version = "3.20110707"; + version = "3.20110715"; in stdenv.mkDerivation { name = "${name}-${version}"; src = fetchurl { url = "http://ftp.de.debian.org/debian/pool/main/i/ikiwiki/${name}_${version}.tar.gz"; - sha256 = "b51fa7452a900212ab1c8c879227b83a688c10f770552aee61944695f8c6f1bf"; + sha256 = "ef9cbe5ddf484e6b75de05cc6a5b51dfdff1f5920b1c4c66309b1409266df9c7"; }; buildInputs = [ perl TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate @@ -29,7 +29,6 @@ stdenv.mkDerivation { ++ stdenv.lib.optionals gitSupport [git] ++ stdenv.lib.optionals monotoneSupport [monotone]; - patchPhase = '' sed -i s@/usr/bin/perl@${perl}/bin/perl@ pm_filter mdwn2man sed -i s@/etc/ikiwiki@$out/etc@ Makefile.PL diff --git a/pkgs/applications/misc/jbidwatcher/default.nix b/pkgs/applications/misc/jbidwatcher/default.nix new file mode 100644 index 0000000000000..56c547ce43570 --- /dev/null +++ b/pkgs/applications/misc/jbidwatcher/default.nix @@ -0,0 +1,50 @@ +{ stdenv, fetchurl, java }: + +stdenv.mkDerivation rec { + pname = "jbidwatcher"; + version = "2.1.5"; + + name = "${pname}-${version}"; + + src = fetchurl { + url = "http://www.jbidwatcher.com/download/JBidwatcher-${version}.jar"; + sha256 = "0nrs9ly56cqn33dm1sjm53pzj1cf7jncwn4c8v0xyva4jqyz2y5p"; + }; + + buildInputs = [ java ]; + + jarfile = "$out/share/java/${pname}/JBidwatcher.jar"; + + unpackPhase = "true"; + + buildPhase = "true"; + + installPhase = '' + ensureDir "$out/bin" + echo > "$out/bin/${pname}" "#!/bin/sh" + echo >>"$out/bin/${pname}" "${java}/bin/java -Xmx512m -jar ${jarfile}" + chmod +x "$out/bin/${pname}" + install -D -m644 ${src} ${jarfile} + ''; + + meta = { + homepage = "http://www.jbidwatcher.com/"; + description = "monitor and snipe Ebay auctions"; + license = "LGPL"; + + longDescription = '' + A Java-based application allowing you to monitor auctions you're + not part of, submit bids, snipe (bid at the last moment), and + otherwise track your auction-site experience. It includes + adult-auction management, MANY currencies (pound, dollar (US, + Canada, Australian, and New Taiwanese) and euro, presently), + drag-and-drop of auction URLs, an original, unique and powerful + 'multisniping' feature, a relatively nice UI, and is known to work + cleanly under Linux, Windows, Solaris, and MacOSX from the same + binary. + ''; + + platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + maintainers = [ stdenv.lib.maintainers.simons ]; + }; +} diff --git a/pkgs/applications/misc/krename/default.nix b/pkgs/applications/misc/krename/default.nix index af0ad61e6699d..e5af706d41c91 100644 --- a/pkgs/applications/misc/krename/default.nix +++ b/pkgs/applications/misc/krename/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, automoc4, kdelibs, taglib, exiv2, podofo, gettext}: +{ stdenv, fetchurl, cmake, automoc4, kdelibs, taglib, exiv2, podofo, gettext, qt4, phonon }: stdenv.mkDerivation rec { name = "krename-4.0.4"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "12qhclw1vbg5bv6619qd4408y8d1w26499gcr8gwhgfzk0v83hic"; }; - buildInputs = [ cmake automoc4 kdelibs taglib exiv2 podofo gettext ]; + buildInputs = [ cmake automoc4 kdelibs taglib exiv2 podofo gettext qt4 phonon ]; meta = { homepage = http://www.krename.net; diff --git a/pkgs/applications/misc/krusader/default.nix b/pkgs/applications/misc/krusader/default.nix index 3286c8addb3b4..f395e64ddb540 100644 --- a/pkgs/applications/misc/krusader/default.nix +++ b/pkgs/applications/misc/krusader/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, cmake, qt4, perl, gettext, kdelibs, kdebase, automoc4, phonon}: +{stdenv, fetchurl, cmake, qt4, perl, gettext, kdelibs, kde_baseapps, automoc4, phonon}: stdenv.mkDerivation rec { name = "krusader-2.2.0-beta1"; @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { url = "mirror://sourceforge/krusader/${name}.tar.bz2"; sha256 = "0rbk0hw8p1bb03w74gspljbzhvpbs3dcr6ckp38gh5r80mcmqfbs"; }; - buildInputs = [ cmake qt4 perl gettext kdelibs automoc4 phonon kdebase ]; + buildInputs = [ cmake qt4 perl gettext kdelibs automoc4 phonon kde_baseapps ]; meta = { description = "Norton/Total Commander clone for KDE"; license = "GPL"; diff --git a/pkgs/applications/misc/qgis/default.nix b/pkgs/applications/misc/qgis/default.nix index b49275a656198..7e27736ee7e44 100644 --- a/pkgs/applications/misc/qgis/default.nix +++ b/pkgs/applications/misc/qgis/default.nix @@ -1,24 +1,19 @@ -args: with args; -let inherit (builtins) getAttr; - edf = composableDerivation.edf; - optionIncLib = name : attr : " -D${name}_INCLUDE_DIR=${getAttr attr args}/incclude" - + " -D${name}_LIBRARY=${getAttr attr args}/lib "; # lib 64? -in -composableDerivation.composableDerivation {} { +{ stdenv, fetchurl, gdal, cmake, qt4, flex, bison, proj, geos, x11, sqlite, gsl, + pyqt4, qwt, fcgi, python }: - buildInputs = [ gdal cmake qt flex bison proj geos x11 sqlite gsl pyqt4]; - cfgOption = [ - # without this option it can't find sqlite libs yet (missing symbols..) (TODO) - "-DWITH_INTERNAL_SQLITE3=TRUE" - ]; +stdenv.mkDerivation rec { + name = "qgis-1.6.0"; - name = "qgis-1.4.0"; + buildInputs = [ gdal qt4 flex bison proj geos x11 sqlite gsl pyqt4 qwt + fcgi ]; + + buildNativeInputs = [ cmake python]; + + patches = [ ./r14988.diff ]; - # src = args.fetchsvn { url=https://svn.qgis.org/repos/qgis/trunk/qgis; - # md5="ac0560e0a2d4e6258c8639f1e9b56df3"; rev="7704"; }; src = fetchurl { - url = http://download.osgeo.org/qgis/src/qgis_1.4.0.tar.gz; - sha256 = "1nn71j9pnkqcprwvzqnybh6ybl0zp50jj04lm769bnjbxknpxq5v"; + url = "http://qgis.org/downloads/${name}.tar.bz2"; + sha256 = "0vlz1z3scj3k6nxf3hzfiq7k2773i6xvk6dvj4axs2f4njpnx7pr"; }; meta = { @@ -27,18 +22,4 @@ composableDerivation.composableDerivation {} { # you can choose one of the following licenses: license = [ "GPL" ]; }; - - phases = "unpackPhase buildPhase installPhase"; - buildPhase = ''pwd; mkdir build; cd build; VERBOSE=1 cmake -DCMAKE_INSTALL_PREFIX=$out ''${cfgOption} ..''; - - postUnpack = '' - export CMAKE_SYSTEM_LIBRARY_PATH= - for i in $buildInputs $propagatedBuildInputs; do - CMAKE_SYSTEM_LIBRARY_PATH=$i/lib:$CMAKE_SYSTEM_LIBRARY_PATH - done - ''; - - #configurePhase="./autogen.sh --prefix=\$out --with-gdal=\$gdal/bin/gdal-config --with-qtdir=\$qt"; - # buildPhases="unpackPhase buildPhase"; - } diff --git a/pkgs/applications/misc/qgis/r14988.diff b/pkgs/applications/misc/qgis/r14988.diff new file mode 100644 index 0000000000000..95d55047e1da5 --- /dev/null +++ b/pkgs/applications/misc/qgis/r14988.diff @@ -0,0 +1,38 @@ +Index: qgis/python/core/conversions.sip +=================================================================== +--- qgis/python/core/conversions.sip (revision 14323) ++++ qgis/python/core/conversions.sip (revision 14988) +@@ -16,4 +16,5 @@ + + %Feature QSETINT_CONVERSION ++%Feature QSETTYPE_CONVERSION + + %ModuleHeaderCode +@@ -321,5 +322,5 @@ + %End + +- ++%If (QSETTYPE_CONVERSION) + template <TYPE> + %MappedType QSet<TYPE> +@@ -395,6 +396,5 @@ + + }; +- +- ++%End + + template<TYPE> +Index: qgis/python/CMakeLists.txt +=================================================================== +--- qgis/python/CMakeLists.txt (revision 14330) ++++ qgis/python/CMakeLists.txt (revision 14988) +@@ -44,4 +44,8 @@ + ENDIF(NOT PYQT4_VERSION_NUM LESS 263941) + ++IF(NOT PYQT4_VERSION_NUM LESS 264194) # 0x040802 ++ SET(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} QSETTYPE_CONVERSION) ++ENDIF(NOT PYQT4_VERSION_NUM LESS 264194) ++ + # core module + FILE(GLOB sip_files_core core/*.sip) diff --git a/pkgs/applications/misc/qgis/trunk.nix b/pkgs/applications/misc/qgis/trunk.nix deleted file mode 100644 index e7e79b47a7647..0000000000000 --- a/pkgs/applications/misc/qgis/trunk.nix +++ /dev/null @@ -1,23 +0,0 @@ -{qgis, fetchurl, sourceFromHead, python, sip}: -qgis.merge { - - name = "qgis-trunk"; - - buildInputs = [ sip python ]; - - preConfigure = '' - export PYTHONPATH=$(toPythonPath ${sip}) - ''; - - cfgOption = [ - # without this option it can't find sqlite libs yet (missing symbols..) (TODO) - "-DWITH_INTERNAL_SQLITE3=TRUE" - "-DPYTHON_EXECUTABLE=${python}/bin/python" - ]; - - # REGION AUTO UPDATE: { name="qgis"; type="svn"; url="https://svn.osgeo.org/qgis/trunk/qgis"; } - src = sourceFromHead "qgis-13572.tar.gz" - (fetchurl { url = "http://mawercer.de/~nix/repos/qgis-13572.tar.gz"; sha256 = "fd4c0e19919901cbee7ead7522acdbecbf17c5b9050e34ef91f8ea6e2736bec8"; }); - # END - -} diff --git a/pkgs/applications/misc/semnotes/default.nix b/pkgs/applications/misc/semnotes/default.nix index e994b567cea09..fbc4df3a0b77d 100644 --- a/pkgs/applications/misc/semnotes/default.nix +++ b/pkgs/applications/misc/semnotes/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, qt4, kdelibs, soprano, automoc4, phonon }: +{ stdenv, fetchurl, cmake, qt4, kdelibs, soprano, automoc4, phonon, shared_desktop_ontologies }: stdenv.mkDerivation { name = "semnotes-0.4.0-1"; @@ -7,7 +7,7 @@ stdenv.mkDerivation { sha256 = "1zh5jfh7pyhyz5fbzcgzyckdg0ny7sf8s16yy6rjw9n021zz5i7m"; }; - buildInputs = [ cmake qt4 kdelibs automoc4 phonon soprano ]; + buildInputs = [ cmake qt4 kdelibs automoc4 phonon soprano shared_desktop_ontologies ]; meta = with stdenv.lib; { description = "Semantic note-taking tool for KDE based on Nepomuk-KDE"; diff --git a/pkgs/applications/misc/surf/default.nix b/pkgs/applications/misc/surf/default.nix new file mode 100644 index 0000000000000..3164f0c1a94a7 --- /dev/null +++ b/pkgs/applications/misc/surf/default.nix @@ -0,0 +1,29 @@ +{stdenv, fetchurl, gtk, webkit, pkgconfig, glib, libsoup, patches ? null}: + +stdenv.mkDerivation rec { + name = "surf-${version}"; + version="0.4.1"; + + src = fetchurl { + url = "http://dl.suckless.org/surf/surf-${version}.tar.gz"; + sha256 = "0im5psjw0r8av3zjyy2wqcl6y5ylwnrab5kfcwc23bsbx2irnw4k"; + }; + + buildInputs = [ gtk webkit pkgconfig glib libsoup ]; + + # Allow users set their own list of patches + inherit patches; + + buildPhase = " make "; + +# `-lX11' to make sure libX11's store path is in the RPATH + NIX_LDFLAGS = "-lX11"; + preConfigure = [ ''sed -i "s@PREFIX = /usr/local@PREFIX = $out@g" config.mk'' ]; + + meta = { + description = "surf is a simple web browser based on WebKit/GTK+. It is able to display websites and follow links. It supports the XEmbed protocol which makes it possible to embed it in another application. Furthermore, one can point surf to another URI by setting its XProperties."; + homepage = http://surf.suckless.org; + license = "MIT"; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/misc/vifm/default.nix b/pkgs/applications/misc/vifm/default.nix new file mode 100644 index 0000000000000..6f270f5c7cf26 --- /dev/null +++ b/pkgs/applications/misc/vifm/default.nix @@ -0,0 +1,48 @@ +x@{builderDefsPackage + , ncurses + , ...}: +builderDefsPackage +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ + []; + + buildInputs = map (n: builtins.getAttr n x) + (builtins.attrNames (builtins.removeAttrs x helperArgNames)); + sourceInfo = rec { + baseName="vifm"; + version="0.6.3"; + name="${baseName}-${version}"; + url="mirror://sourceforge/project/${baseName}/${baseName}/${name}.tar.bz2"; + hash="1v5kiifjk7iyqrzjd94wn6a5dz4j3krl06pbp1ps9g3zdq2w2skv"; + }; +in +rec { + src = a.fetchurl { + url = sourceInfo.url; + sha256 = sourceInfo.hash; + }; + + inherit (sourceInfo) name version; + inherit buildInputs; + + /* doConfigure should be removed if not needed */ + phaseNames = ["doConfigure" "doMakeInstall"]; + + meta = { + description = "A vi-like file manager"; + maintainers = with a.lib.maintainers; + [ + raskin + ]; + platforms = with a.lib.platforms; + linux; + license = a.lib.licenses.gpl2; + }; + passthru = { + updateInfo = { + downloadPage = "http://vifm.sf.net"; + }; + }; +}) x + diff --git a/pkgs/applications/misc/xmobar/default.nix b/pkgs/applications/misc/xmobar/default.nix index 34bcc85f776bb..8271049861ebe 100644 --- a/pkgs/applications/misc/xmobar/default.nix +++ b/pkgs/applications/misc/xmobar/default.nix @@ -1,13 +1,20 @@ -{cabal, X11, mtl, parsec, stm, utf8String, X11Xft}: +{ cabal, mtl, parsec, stm, time, utf8String, X11 }: -cabal.mkDerivation (self : { +cabal.mkDerivation (self: { pname = "xmobar"; - name = "${self.fname}"; - version = "0.12"; - sha256 = "633b7985dbaebd58864f591ea7ff8b44f5a69b4e3d0a592df01daf8fe11a5d31"; - extraBuildInputs = [X11 mtl parsec stm utf8String X11Xft]; - configureFlags = "--flags=with_xft"; + version = "0.13"; + sha256 = "0ijava0vn2dmc6v57i6x663rvxz3ryb2gqks18qk1qli4k0m3hf7"; + isLibrary = false; + isExecutable = true; + buildDepends = [ mtl parsec stm time utf8String X11 ]; meta = { - description = "xmobar is a minimalistic text based status bar"; + homepage = "http://projects.haskell.org/xmobar/"; + description = "A Minimalistic Text Based Status Bar"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; }; }) diff --git a/pkgs/applications/misc/zathura/default.nix b/pkgs/applications/misc/zathura/default.nix index 6c6b469f18d40..2e58a028a30fb 100644 --- a/pkgs/applications/misc/zathura/default.nix +++ b/pkgs/applications/misc/zathura/default.nix @@ -1,27 +1,27 @@ { stdenv, fetchurl, pkgconfig, gtk, poppler }: + stdenv.mkDerivation rec { - name = "zathura-0.0.5"; + name = "zathura-0.0.8.4"; + src = fetchurl { - #url = "https://pwmt.org/zathura/download/{name}.tar.gz" - # Site's SSL cert is invalid, and I dunno how to pass --insecure to curl. - # Thanks Mark Weber for mirroring this tarball. - url = "http://mawercer.de/~nix/${name}.tar.gz"; - sha256 = "e4dfbcceafc7bcb5c4e1ff349822c610db6378906ab65aabba8be246d7ee9b52"; + url = "http://pwmt.org/download/${name}.tar.gz"; + sha256 = "03iq6n7bpgrkq3l8b2ab3flcfxrqpxc1f3ycn31xr2b6bjwi72qn"; }; + buildInputs = [ pkgconfig gtk poppler ]; - patchPhase = '' - substituteInPlace config.mk --replace 'PREFIX = /usr' "PREFIX = $out" - ''; + + makeFlags = "PREFIX=$(out)"; + meta = { homepage = https://pwmt.org/zathura/; description = "A highly customizable and functional PDF viewer"; longDescription = '' - zathura is a highly customizable and functional PDF viewer based on the + Zathura is a highly customizable and functional PDF viewer based on the poppler rendering library and the gtk+ toolkit. The idea behind zathura is an application that provides a minimalistic and space saving interface as well as an easy usage that mainly focuses on keyboard interaction. ''; license = "free"; - platforms = with stdenv.lib.platforms; linux; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 862ec616b9f80..74f80ccdab956 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { phases = "unpackPhase installPhase"; - buildInputs = [makeWrapper unzip]; + buildInputs = [ makeWrapper unzip ]; libPath = stdenv.lib.makeLibraryPath @@ -38,20 +38,17 @@ stdenv.mkDerivation rec { installPhase = '' ensureDir $out/bin - ensureDir $out/chrome - ensureDir $out/lib - - cp -R * $out/chrome - ln -s $out/chrome/chrome $out/bin/chrome - ${patchelf}/bin/patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" --set-rpath ${libPath}:$out/lib:${stdenv.gcc.gcc}/lib64:${stdenv.gcc.gcc}/lib $out/chrome/chrome - - ln -s ${nss}/lib/libsmime3.so $out/lib/libsmime3.so.1d - ln -s ${nss}/lib/libnssutil3.so $out/lib/libnssutil3.so.1d - ln -s ${nss}/lib/libssl3.so $out/lib/libssl3.so.1d - ln -s ${nss}/lib/libnss3.so $out/lib/libnss3.so.1d - ln -s ${nspr}/lib/libnspr4.so $out/lib/libnspr4.so.0d - ln -s ${nspr}/lib/libplds4.so $out/lib/libplds4.so.0d - ln -s ${nspr}/lib/libplc4.so $out/lib/libplc4.so.0d + ensureDir $out/libexec/chrome + + cp -R * $out/libexec/chrome + + ${patchelf}/bin/patchelf \ + --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ + --set-rpath ${libPath}:$out/lib:${stdenv.gcc.gcc}/lib64:${stdenv.gcc.gcc}/lib \ + $out/libexec/chrome/chrome + + makeWrapper $out/libexec/chrome/chrome $out/bin/chrome \ + --prefix LD_LIBRARY_PATH : "${nss}/lib" ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/browsers/firefox/3.6.nix b/pkgs/applications/networking/browsers/firefox/3.6.nix index 2d472ce8cc0a0..47754d67f3c86 100644 --- a/pkgs/applications/networking/browsers/firefox/3.6.nix +++ b/pkgs/applications/networking/browsers/firefox/3.6.nix @@ -12,14 +12,14 @@ rec { - firefoxVersion = "3.6.16"; + firefoxVersion = "3.6.21"; - xulVersion = "1.9.2.16"; # this attribute is used by other packages + xulVersion = "1.9.2.21"; # this attribute is used by other packages src = fetchurl { url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2"; - sha1 = "38124597440b7d60aa568adeef23659575841e92"; + sha1 = "3c1f001ad22d93b48e191999f548b4382db3d36c"; }; @@ -101,7 +101,7 @@ rec { meta = { description = "Mozilla Firefox XUL runner"; - homepage = http://www.mozilla.com/en-US/firefox/; + homepage = http://www.mozilla.org/firefox/; }; passthru = { inherit gtk; version = xulVersion; }; @@ -141,7 +141,7 @@ rec { meta = { description = "Mozilla Firefox - the browser, reloaded"; - homepage = http://www.mozilla.com/en-US/firefox/; + homepage = http://www.mozilla.org/firefox/; }; passthru = { diff --git a/pkgs/applications/networking/browsers/firefox/5.0.nix b/pkgs/applications/networking/browsers/firefox/5.0.nix index 8e3d600feb22f..f59d50fb6de6a 100644 --- a/pkgs/applications/networking/browsers/firefox/5.0.nix +++ b/pkgs/applications/networking/browsers/firefox/5.0.nix @@ -108,7 +108,7 @@ rec { meta = { description = "Mozilla Firefox XUL runner"; - homepage = http://www.mozilla.com/en-US/firefox/; + homepage = http://www.mozilla.org/firefox/; }; passthru = { inherit gtk; version = xulVersion; }; @@ -154,7 +154,7 @@ rec { meta = { description = "Mozilla Firefox - the browser, reloaded"; - homepage = http://www.mozilla.com/en-US/firefox/; + homepage = http://www.mozilla.org/firefox/; }; passthru = { diff --git a/pkgs/applications/networking/browsers/firefox/6.0-install-sdk-bin.patch b/pkgs/applications/networking/browsers/firefox/6.0-install-sdk-bin.patch new file mode 100644 index 0000000000000..30fe15c6e483f --- /dev/null +++ b/pkgs/applications/networking/browsers/firefox/6.0-install-sdk-bin.patch @@ -0,0 +1,35 @@ + +# HG changeset patch +# User Chris Coulson <chrisccoulson@ubuntu.com> +# Date 1306390403 -7200 +# Node ID 99672871e93003520189cfe3a684ebbea151cb4b +# Parent 831f8e040f381ed58441d8bf413f9845f26ce08e +Bug 639554 - Install sdk/bin with make install. r=bsmedberg + +diff --git a/toolkit/mozapps/installer/packager.mk b/toolkit/mozapps/installer/packager.mk +--- a/toolkit/mozapps/installer/packager.mk ++++ b/toolkit/mozapps/installer/packager.mk +@@ -704,20 +704,22 @@ ifdef INSTALL_SDK # Here comes the hard + $(NSINSTALL) -D $(DESTDIR)$(includedir) + (cd $(DIST)/include && tar $(TAR_CREATE_FLAGS) - .) | \ + (cd $(DESTDIR)$(includedir) && tar -xf -) + $(NSINSTALL) -D $(DESTDIR)$(idldir) + (cd $(DIST)/idl && tar $(TAR_CREATE_FLAGS) - .) | \ + (cd $(DESTDIR)$(idldir) && tar -xf -) + # SDK directory is the libs + a bunch of symlinks + $(NSINSTALL) -D $(DESTDIR)$(sdkdir)/sdk/lib ++ $(NSINSTALL) -D $(DESTDIR)$(sdkdir)/sdk/bin + if test -f $(DIST)/include/xpcom-config.h; then \ + $(SYSINSTALL) $(IFLAGS1) $(DIST)/include/xpcom-config.h $(DESTDIR)$(sdkdir); \ + fi + (cd $(DIST)/sdk/lib && tar $(TAR_CREATE_FLAGS) - .) | (cd $(DESTDIR)$(sdkdir)/sdk/lib && tar -xf -) ++ (cd $(DIST)/sdk/bin && tar $(TAR_CREATE_FLAGS) - .) | (cd $(DESTDIR)$(sdkdir)/sdk/bin && tar -xf -) + $(RM) -f $(DESTDIR)$(sdkdir)/lib $(DESTDIR)$(sdkdir)/bin $(DESTDIR)$(sdkdir)/include $(DESTDIR)$(sdkdir)/include $(DESTDIR)$(sdkdir)/sdk/idl $(DESTDIR)$(sdkdir)/idl + ln -s $(sdkdir)/sdk/lib $(DESTDIR)$(sdkdir)/lib + ln -s $(installdir) $(DESTDIR)$(sdkdir)/bin + ln -s $(includedir) $(DESTDIR)$(sdkdir)/include + ln -s $(idldir) $(DESTDIR)$(sdkdir)/idl + endif # INSTALL_SDK + + make-sdk: + diff --git a/pkgs/applications/networking/browsers/firefox/4.0.nix b/pkgs/applications/networking/browsers/firefox/6.0.nix index 6d988fb89fd9b..85a467a641edb 100644 --- a/pkgs/applications/networking/browsers/firefox/4.0.nix +++ b/pkgs/applications/networking/browsers/firefox/6.0.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL , libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs , freetype, fontconfig, file, alsaLib, nspr, nss, libnotify -, yasm, mesa +, yasm, mesa, sqlite , # If you want the resulting program to call itself "Firefox" instead # of "Shiretoko" or whatever, enable this option. However, those @@ -15,14 +15,14 @@ assert stdenv.gcc ? libc && stdenv.gcc.libc != null; rec { - firefoxVersion = "4.0.1"; + firefoxVersion = "6.0.1"; - xulVersion = "2.0.1"; # this attribute is used by other packages + xulVersion = "6.0.1"; # this attribute is used by other packages src = fetchurl { url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2"; - sha1 = "c89bc5106266aa0097a7be15be84555bd2649f03"; + sha256 = "08pklavbb6miaav07a8liw17k8nnh3i97plz8l9pdclan4aczb3i"; }; @@ -36,11 +36,8 @@ rec { "--with-system-nspr" # "--with-system-nss" # "--with-system-png" # <-- "--with-system-png won't work because the system's libpng doesn't have APNG support" - # Disabled system Cairo for now because it causes gradients in tabs etc. to be missing. - # "--enable-system-cairo" - # Compiling with the Nixpkgs SQLite gives: - # "configure: error: System SQLite library is not compiled with SQLITE_SECURE_DELETE." - # "--enable-system-sqlite" + "--enable-system-cairo" + "--enable-system-sqlite" "--disable-crashreporter" "--disable-tests" "--disable-necko-wifi" # maybe we want to enable this at some point @@ -54,13 +51,15 @@ rec { inherit src; + patches = [ ./6.0-install-sdk-bin.patch ]; + buildInputs = [ pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2 python dbus dbus_glib pango freetype fontconfig xlibs.libXi xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file alsaLib nspr /* nss */ libnotify xlibs.pixman yasm mesa xlibs.libXScrnSaver xlibs.scrnsaverproto - xlibs.libXext xlibs.xextproto + xlibs.libXext xlibs.xextproto sqlite ]; configureFlags = @@ -111,7 +110,7 @@ rec { meta = { description = "Mozilla Firefox XUL runner"; - homepage = http://www.mozilla.com/en-US/firefox/; + homepage = http://www.mozilla.org/firefox/; }; passthru = { inherit gtk; version = xulVersion; }; @@ -128,7 +127,7 @@ rec { buildInputs = [ pkgconfig gtk perl zip libIDL libjpeg zlib cairo bzip2 python dbus dbus_glib pango freetype fontconfig alsaLib nspr libnotify - xlibs.pixman yasm mesa + xlibs.pixman yasm mesa sqlite ]; propagatedBuildInputs = [xulrunner]; @@ -157,7 +156,7 @@ rec { meta = { description = "Mozilla Firefox - the browser, reloaded"; - homepage = http://www.mozilla.com/en-US/firefox/; + homepage = http://www.mozilla.org/firefox/; }; passthru = { diff --git a/pkgs/applications/networking/browsers/firefox/7.0.nix b/pkgs/applications/networking/browsers/firefox/7.0.nix new file mode 100644 index 0000000000000..d9e94ead33a4a --- /dev/null +++ b/pkgs/applications/networking/browsers/firefox/7.0.nix @@ -0,0 +1,184 @@ +{ stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL +, libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs +, freetype, fontconfig, file, alsaLib, nspr, nss, libnotify +, yasm, mesa, sqlite + +, # If you want the resulting program to call itself "Firefox" instead + # of "Shiretoko" or whatever, enable this option. However, those + # binaries may not be distributed without permission from the + # Mozilla Foundation, see + # http://www.mozilla.org/foundation/trademarks/. + enableOfficialBranding ? false +}: + +assert stdenv.gcc ? libc && stdenv.gcc.libc != null; + +rec { + + firefoxVersion = "7.0b1"; + + xulVersion = "7.0"; # this attribute is used by other packages + + + src = fetchurl { + url = "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/${firefoxVersion}-candidates/build1/source/firefox-${firefoxVersion}.source.tar.bz2"; + sha256 = "0s8lv07nggdf8ad2yx7sgq1mfy1dvzir0f6x4km911yc9qyhwmwk"; + }; + + commonConfigureFlags = + [ "--enable-optimize" + "--disable-debug" + "--enable-strip" + "--with-system-jpeg" + "--with-system-zlib" + "--with-system-bz2" + "--with-system-nspr" + # "--with-system-nss" + # "--with-system-png" # <-- "--with-system-png won't work because the system's libpng doesn't have APNG support" + "--enable-system-cairo" + "--enable-system-sqlite" + "--disable-crashreporter" + "--disable-tests" + "--disable-necko-wifi" # maybe we want to enable this at some point + "--disable-installer" + "--disable-updater" + ]; + + + xulrunner = stdenv.mkDerivation rec { + name = "xulrunner-${xulVersion}"; + + inherit src; + + buildInputs = + [ pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2 + python dbus dbus_glib pango freetype fontconfig xlibs.libXi + xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file + alsaLib nspr /* nss */ libnotify xlibs.pixman yasm mesa + xlibs.libXScrnSaver xlibs.scrnsaverproto + xlibs.libXext xlibs.xextproto sqlite + ]; + + configureFlags = + [ "--enable-application=xulrunner" + "--disable-javaxpcom" + ] ++ commonConfigureFlags; + + enableParallelBuilding = true; + + # Hack to work around make's idea of -lbz2 dependency + preConfigure = + '' + find . -name Makefile.in -execdir sed -i '{}' -e '1ivpath %.so ${ + stdenv.lib.concatStringsSep ":" + (map (s : s + "/lib") (buildInputs ++ [stdenv.gcc.libc])) + }' ';' + cp -i security/coreconf/Linux{2.6,3.0}.mk + cp -i security/coreconf/Linux{2.6,3.1}.mk + cp -i security/coreconf/Linux{2.6,3.2}.mk + cp -i security/coreconf/Linux{2.6,3.3}.mk + + export NIX_LDFLAGS="$NIX_LDFLAGS -L$out/lib/xulrunner-${xulVersion}" + ''; + + # !!! Temporary hack. + preBuild = + '' + export NIX_ENFORCE_PURITY= + ''; + + installFlags = "SKIP_GRE_REGISTRATION=1"; + + postInstall = '' + # Fix some references to /bin paths in the Xulrunner shell script. + substituteInPlace $out/bin/xulrunner \ + --replace /bin/pwd "$(type -tP pwd)" \ + --replace /bin/ls "$(type -tP ls)" + + # Fix run-mozilla.sh search + libDir=$(cd $out/lib && ls -d xulrunner-[0-9]*) + echo libDir: $libDir + test -n "$libDir" + cd $out/bin + mv xulrunner ../lib/$libDir/ + + for i in $out/lib/$libDir/*; do + file $i; + if file $i | grep executable &>/dev/null; then + echo -e '#! /bin/sh\n"'"$i"'" "$@"' > "$out/bin/$(basename "$i")"; + chmod a+x "$out/bin/$(basename "$i")"; + fi; + done; + for i in $out/lib/$libDir/{xpcshell,plugin-container,*.so}; do + patchelf --set-rpath "$(patchelf --print-rpath "$i"):$out/lib/$libDir" $i || true + done; + rm -f $out/bin/run-mozilla.sh + ''; # */ + + meta = { + description = "Mozilla Firefox XUL runner"; + homepage = http://www.mozilla.com/en-US/firefox/; + }; + + passthru = { inherit gtk; version = xulVersion; }; + }; + + + firefox = stdenv.mkDerivation rec { + name = "firefox-${firefoxVersion}"; + + inherit src; + + enableParallelBuilding = true; + + buildInputs = + [ pkgconfig gtk perl zip libIDL libjpeg zlib cairo bzip2 python + dbus dbus_glib pango freetype fontconfig alsaLib nspr libnotify + xlibs.pixman yasm mesa sqlite file + ]; + + propagatedBuildInputs = [xulrunner]; + + configureFlags = + [ "--enable-application=browser" + "--with-libxul-sdk=${xulrunner}/lib/xulrunner-devel-${xulrunner.version}" + "--enable-chrome-format=jar" + "--disable-elf-hack" + ] + ++ commonConfigureFlags + ++ stdenv.lib.optional enableOfficialBranding "--enable-official-branding"; + + # Hack to work around make's idea of -lbz2 dependency + preConfigure = + '' + find . -name Makefile.in -execdir sed -i '{}' -e '1ivpath %.so ${ + stdenv.lib.concatStringsSep ":" + (map (s : s + "/lib") (buildInputs ++ [stdenv.gcc.libc])) + }' ';' + ''; + + postInstall = + '' + ln -s ${xulrunner}/lib/xulrunner-${xulrunner.version} $(echo $out/lib/firefox-*)/xulrunner + for j in $out/bin/*; do + i="$(readlink "$j")"; + file $i; + if file $i | grep executable &>/dev/null; then + rm "$out/bin/$(basename "$i")" + echo -e '#! /bin/sh\n"'"$i"'" "$@"' > "$out/bin/$(basename "$i")" + chmod a+x "$out/bin/$(basename "$i")" + fi; + done; + ''; # */ + + meta = { + description = "Mozilla Firefox - the browser, reloaded"; + homepage = http://www.mozilla.com/en-US/firefox/; + }; + + passthru = { + inherit gtk xulrunner nspr; + isFirefox3Like = true; + }; + }; +} diff --git a/pkgs/applications/networking/browsers/konq-plugins/default.nix b/pkgs/applications/networking/browsers/konq-plugins/default.nix index 815e1a16964cc..656e24be07181 100644 --- a/pkgs/applications/networking/browsers/konq-plugins/default.nix +++ b/pkgs/applications/networking/browsers/konq-plugins/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, kdelibs, cmake, qt4, automoc4, phonon, kdebase, gettext }: +{ stdenv, fetchurl, kdelibs, cmake, qt4, automoc4, phonon, kde_baseapps, gettext }: stdenv.mkDerivation rec { name = "konq-plugins-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1hn722rcdcwmhfnn89rnvp2b4d8gds4nm483ps3jkk83d7f2xmbi"; }; - buildInputs = [ cmake kdelibs qt4 automoc4 phonon kdebase gettext ]; + buildInputs = [ cmake kdelibs qt4 automoc4 phonon kde_baseapps gettext ]; patches = [ ./qt47.patch ]; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/default.nix index 1a013d78d574c..462099ea8f2a6 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/default.nix @@ -53,11 +53,11 @@ let url = http://download.macromedia.com/pub/labs/flashplayer10/flashplayer_square_p2_32bit_debug_linux_092710.tar.gz; sha256 = "11w3mxa39l4mnlsqzlwbdh1sald549afyqbx2kbid7in5qzamlcc"; } else { - version = "10.3.181.34"; + version = "10.3.183.5"; url = http://fpdownload.macromedia.com/get/flashplayer/current/install_flash_player_10_linux.tar.gz; - sha256 = "1k7gq0rynrv4vwr06dhjmhb633vm5a961bsqi6s8aqk61bdzhsia"; + sha256 = "1kv7szpadgv0wwmi46vc05723qzsgclz68rij6x49l61sngzmw0x"; } - else throw "flashplayer is not supported on this platform"; + else throw "Flash Player is not supported on this platform"; in diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/gecko-mediaplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/gecko-mediaplayer/default.nix index a652ffb2b65bd..ddb70e6d633e1 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/gecko-mediaplayer/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/gecko-mediaplayer/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "gecko-mediaplayer-1.0.3beta"; + name = "gecko-mediaplayer-1.0.4"; src = fetchurl { url = "http://gecko-mediaplayer.googlecode.com/files/${name}.tar.gz"; - sha256 = "5d639d9e11b24e71a50643d461ba2826978fecb4a7cec8049656d46a084c1a37"; + sha256 = "18asxxsqng303cxcww75k4r6syqjs7lylibv997kq0869kz4spsp"; }; buildInputs = [pkgconfig glib dbus dbus_glib browser x11 GConf browser.xulrunner]; 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 3ae24bdddf985..1ea41d6446563 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation { if stdenv.system == "x86_64-linux" then fetchurl { url = "http://dl.google.com/linux/direct/google-talkplugin_current_x86_64.rpm"; - sha256 = "01c8w221azvmqvxf5lgb8l151086d72ll5wnjndwn50dvi6rphvx"; + sha256 = "14cf9bef6f70ff850b773dbb92833bbe45645db2636b7e17720fdc6b60e76d63"; } else throw "Google Talk does not support your platform."; @@ -89,4 +89,4 @@ stdenv.mkDerivation { homepage = http://www.google.com/chat/video/; license = "unfree"; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/networking/browsers/rekonq/default.nix b/pkgs/applications/networking/browsers/rekonq/default.nix index f9b8061d5ebd6..ee37c2450a64e 100644 --- a/pkgs/applications/networking/browsers/rekonq/default.nix +++ b/pkgs/applications/networking/browsers/rekonq/default.nix @@ -2,12 +2,12 @@ , gettext}: stdenv.mkDerivation rec { - name = "rekonq-0.6.1"; + name = "rekonq-0.7.0"; passthru = { inherit stdenv; }; src = fetchurl { url = "mirror://sf/rekonq/${name}.tar.bz2"; - sha256 = "1hgy8ph4k4ngdy1kr4w3qwkfdylapsj7rjpk8wxn97yc4qnk57by"; + sha256 = "14gi8ic53jkam2v52zp4p965dw6pqhjm3xhqssm5vimx7hp0kc1w"; }; buildInputs = [ cmake qt4 kdelibs automoc4 phonon perl gettext ]; diff --git a/pkgs/applications/networking/browsers/rekonq/source.nix b/pkgs/applications/networking/browsers/rekonq/source.nix deleted file mode 100644 index 5faeddaaf2a58..0000000000000 --- a/pkgs/applications/networking/browsers/rekonq/source.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ fetchurl, fetchgit }: - -builtins.listToAttrs -[ - { - name = "0.4.90"; - value = rec { - name = "rekonq-0.4.90"; - src = fetchurl { - url = "http://kde-apps.org/CONTENT/content-files/94258-${name}.tar.bz2"; - name = "${name}.tar.bz2"; - sha256 = "1dmdx54asv0b4xzc8p5nadn92l8pks9cl1y9j8a46lsslwsjw3ws"; - }; - }; - } - - { - name = "scm"; - value = { - name = "rekonq-0.4.0-20100514"; - src = fetchgit { - url = git://gitorious.org/rekonq/mainline.git; - rev = "6b4f4d69a3c599bc958ccddc5f7ac1c8648a7042"; - sha256 = "1qcwf7rsrnsbnq62cl44r48bmavc2nysi2wqhy1jxmj2ndwvsxy1"; - }; - }; - } -] diff --git a/pkgs/applications/networking/esniper/default.nix b/pkgs/applications/networking/esniper/default.nix index 96b66794c2c6d..5aaf419d3897e 100644 --- a/pkgs/applications/networking/esniper/default.nix +++ b/pkgs/applications/networking/esniper/default.nix @@ -1,14 +1,11 @@ { stdenv, fetchurl, openssl, curl }: -let - name = "esniper"; -in stdenv.mkDerivation { - name = "${name}-2.25.0"; + name = "esniper-2.26.0"; src = fetchurl { - url = "mirror://sourceforge/${name}/${name}-2-25-0.tgz"; - sha256 = "64658eaca2fa27eaec0436a016648b12f6c49d7486cc3a6827f307aa93871def"; + url = "mirror://sourceforge/esniper/esniper-2-26-0.tgz"; + sha256 = "5fd9a0f4b27b98deca303cd3d16c1ed060e05a165a40b2f4a9f8546db5e3877d"; }; buildInputs = [openssl curl]; diff --git a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix index 74b6b0b21eaf0..1d49e0d1ff783 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, gnutls, glib, pkgconfig, check, libotr }: stdenv.mkDerivation rec { - name = "bitlbee-3.0.1"; + name = "bitlbee-3.0.3"; src = fetchurl { url = "mirror://bitlbee/src/${name}.tar.gz"; - sha256 = "027n5f0phjr5fcrphbcflqv8hlkv5qnrpc1xgr09qjyv6mxp72j0"; + sha256 = "09dgwfqznd2cnqraksivmh132nnl99gwgplynjmfsyyf6y4pbjl2"; }; buildInputs = [ gnutls glib pkgconfig libotr ] diff --git a/pkgs/applications/networking/instant-messengers/kadu/config.patch b/pkgs/applications/networking/instant-messengers/kadu/config.patch new file mode 100644 index 0000000000000..263898ba0db10 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/kadu/config.patch @@ -0,0 +1,15 @@ +diff --git a/.config b/.config +index e0068bf..808ebf4 100644 +--- a/.config ++++ b/.config +@@ -187,8 +187,8 @@ module_history_migration=m + # PL: Obsługa szyfrowania wiadomości przy pomocy OpenSSLa + # Platform: Linux, Mac OS X, Windows + # Needs: libcrypto, libssl +-module_encryption_ng=m +-module_encryption_ng_simlite=m ++module_encryption_ng=n ++module_encryption_ng_simlite=n + + # Description: Auto away module + # PL: Obsługa automatycznej zmiany statusu po określonym czasie bezczynności diff --git a/pkgs/applications/networking/instant-messengers/kadu/default.nix b/pkgs/applications/networking/instant-messengers/kadu/default.nix index 598bc1c0b2fa7..70c7d7234e0ca 100644 --- a/pkgs/applications/networking/instant-messengers/kadu/default.nix +++ b/pkgs/applications/networking/instant-messengers/kadu/default.nix @@ -1,33 +1,33 @@ -{ stdenv, fetchurl, cmake, qt4, libgadu, libXScrnSaver, libsndfile, qca2 -, libX11, alsaLib }: +{ stdenv, fetchurl, cmake, qt4, libgadu, libXScrnSaver, libsndfile, libX11, + alsaLib, aspell, libidn, qca2, phonon }: stdenv.mkDerivation { - name = "kadu-0.6.5.4"; + name = "kadu-0.9.2"; src = fetchurl { - url = http://www.kadu.net/download/stable/kadu-0.6.5.4.tar.bz2; - sha256 = "09bdcyx75lca1pl6x3vfpawmdjn5pfxvwivb9xdhk4bdvswxgv4x"; + url = http://www.kadu.net/download/stable/kadu-0.9.2.tar.bz2; + sha256 = "05lpx7m2adx8vv4h62rsiwlgay24m6cxdbibg7vzl4xkq9ybv30b"; }; - + buildInputs = [ - cmake qt4 libgadu libXScrnSaver libsndfile qca2 libX11 alsaLib + cmake qt4 libgadu libXScrnSaver libsndfile libX11 alsaLib aspell libidn qca2 phonon ]; - cmakeFlags = "-DENABLE_AUTODOWNLOAD=OFF"; + configureFlags = "CPPFLAGS=-DQT_NO_DEBUG"; + + cmakeFlags = "-DENABLE_AUTODOWNLOAD=OFF -DBUILD_DESCRIPTION='NixOS' -DCMAKE_BUILD_TYPE=Release"; prePatch = '' patchShebangs . ''; - - patches = [ - ./includes.patch - ]; + + patches = [ ./config.patch ]; NIX_LDFLAGS="-lX11"; - meta = { - description = "An instance messanger client for the gadu-gadu network (most popular polish IM network)"; + meta = { + description = "An instant-messenger client for the gadu-gadu network (most popular polish IM network)"; homepage = http://www.kadu.net/w/English:Main_Page; license = "GPLv2"; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/networking/instant-messengers/kadu/includes.patch b/pkgs/applications/networking/instant-messengers/kadu/includes.patch deleted file mode 100644 index 6960a24b17638..0000000000000 --- a/pkgs/applications/networking/instant-messengers/kadu/includes.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- kadu/kadu-core/main.cpp 2011-01-27 22:58:22.000000000 +0100 -+++ kadu/kadu-core/main.cpp 2011-01-27 22:58:28.000000000 +0100 -@@ -20,10 +20,8 @@ - #include <winsock2.h> - #include <windows.h> - #endif --#ifdef Q_OS_BSD4 - #include <sys/types.h> - #include <sys/stat.h> --#endif - - #include "config_file.h" - #include "debug.h" diff --git a/pkgs/applications/networking/instant-messengers/kadu/more-icons.patch b/pkgs/applications/networking/instant-messengers/kadu/more-icons.patch deleted file mode 100644 index 60234d361f7ce..0000000000000 --- a/pkgs/applications/networking/instant-messengers/kadu/more-icons.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- kadu/.config 2010-01-18 17:13:31.000000000 +0100 -+++ kadu/.config 2010-09-28 21:21:48.000000000 +0200 -@@ -559,10 +559,10 @@ icons_glass16=y - icons_glass22=y - - # Desctiption: Tango 16x16 icons made by BlotoPosniegowe --icons_tango16=n -+icons_tango16=y - - # Description: Oxygen 16x16 icons maintained by Piotr Pelzowski --icons_oxygen16=n -+icons_oxygen16=y diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix index ad4a0473c5eb0..89c3a10a45e8f 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix @@ -18,14 +18,13 @@ , openssl ? null , gnutls ? null , libgcrypt ? null - , voice ? null } : stdenv.mkDerivation { - name = "pidgin-2.7.9"; + name = "pidgin-2.9.0"; src = fetchurl { - url = mirror://sourceforge/pidgin/pidgin-2.7.9.tar.bz2; - sha256 = "17p1lcdxh241nsaz8xxbr8l5r7a0v5qg500cj0llww56k7qxf8lp"; + url = mirror://sourceforge/pidgin/pidgin-2.9.0.tar.bz2; + sha256 = "1mygaap7cbak9n9zm4wshxnvb27a68w633d712vy2knr8z78xvi8"; }; inherit nss ncurses; @@ -47,7 +46,7 @@ stdenv.mkDerivation { pkgconfig gtk perl perlXMLParser gettext ]; - patches = [./pidgin-makefile.patch]; + patches = [./pidgin-makefile.patch ]; configureFlags="--with-nspr-includes=${nspr}/include/nspr --with-nspr-libs=${nspr}/lib --with-nss-includes=${nss}/include/nss --with-nss-libs=${nss}/lib --with-ncurses-headers=${ncurses}/include --disable-meanwhile --disable-nm --disable-tcl" + (lib.optionalString (gnutls != null) " --enable-gnutls=yes --enable-nss=no") diff --git a/pkgs/applications/networking/linphone/default.nix b/pkgs/applications/networking/linphone/default.nix index 7ed64de9ee6e7..07ca19b63cc50 100644 --- a/pkgs/applications/networking/linphone/default.nix +++ b/pkgs/applications/networking/linphone/default.nix @@ -1,16 +1,16 @@ { stdenv, fetchurl, intltool, pkgconfig, gtk, libglade, libosip, libexosip, speex, - readline, ffmpeg, alsaLib, SDL, libv4l, libtheora }: + readline, ffmpeg, alsaLib, SDL, libv4l, libtheora, libXv }: -stdenv.mkDerivation { - name = "linphone-3.3.2"; +stdenv.mkDerivation rec { + name = "linphone-3.4.3"; src = fetchurl { - url = http://download.savannah.gnu.org/releases/linphone/3.3.x/sources/linphone-3.3.2.tar.gz; - sha256 = "0plxqs6v2jz6s7ig8wfzg2ivjvdjja5xhqvrcsv644zl3b4igax7"; + url = "mirror://savannah/linphone/3.4.x/sources/${name}.tar.gz"; + sha256 = "14k655z0kfmnm42nxhsl25rjim9swrr4kpnplkx3pd9b3yha1rwj"; }; buildInputs = [ intltool pkgconfig gtk libglade libosip libexosip speex readline - ffmpeg alsaLib SDL libv4l libtheora ]; + ffmpeg alsaLib SDL libv4l libtheora libXv ]; meta = { homepage = http://www.linphone.org/; diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix index ffe4ca3271265..02870c70f6465 100644 --- a/pkgs/applications/networking/mailreaders/mutt/default.nix +++ b/pkgs/applications/networking/mailreaders/mutt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, which, perl +{ stdenv, fetchurl, ncurses, which, perl, gpgme , sslSupport ? true , imapSupport ? true , headerCache ? true @@ -12,18 +12,16 @@ assert headerCache -> gdbm != null; assert sslSupport -> openssl != null; assert saslSupport -> cyrus_sasl != null; -stdenv.mkDerivation { - name = "mutt-1.5.20"; +stdenv.mkDerivation rec { + name = "mutt-1.5.21"; src = fetchurl { - url = ftp://ftp.mutt.org/mutt/devel/mutt-1.5.20.tar.gz; - sha256 = "15m7m419r82awx4mr4nam25m0kpg0bs9vw1z4a4mrzvlkl3zqycm"; + url = "ftp://ftp.mutt.org/mutt/devel/${name}.tar.gz"; + sha256 = "1864cwz240gh0zy56fb47qqzwyf6ghg01037rb4p2kqgimpg6h91"; }; - patches = [ ./openssl.patch ]; - buildInputs = [ - ncurses which perl + ncurses which perl gpgme (if headerCache then gdbm else null) (if sslSupport then openssl else null) (if saslSupport then cyrus_sasl else null) @@ -33,7 +31,7 @@ stdenv.mkDerivation { "--with-mailpath=" "--enable-smtp" # This allows calls with "-d N", that output debug info into ~/.muttdebug* - "--enable-debug" + "--enable-debug" "--enable-pop" "--enable-imap" "--enable-gpgme" # The next allows building mutt without having anything setgid # set by the installer, and removing the need for the group 'mail' diff --git a/pkgs/applications/networking/mailreaders/mutt/openssl.patch b/pkgs/applications/networking/mailreaders/mutt/openssl.patch deleted file mode 100644 index 6476075d67dee..0000000000000 --- a/pkgs/applications/networking/mailreaders/mutt/openssl.patch +++ /dev/null @@ -1,15 +0,0 @@ -Fixes a compilation problem with OpenSSL 1.0.0. -From http://www.freebsd.org/cgi/query-pr.cgi?pr=146261 - -diff -ru -x '*~' mutt-1.5.20-orig/mutt_ssl.c mutt-1.5.20/mutt_ssl.c ---- mutt-1.5.20-orig/mutt_ssl.c 2009-06-10 07:08:29.000000000 +0200 -+++ mutt-1.5.20/mutt_ssl.c 2010-07-24 10:46:08.000000000 +0200 -@@ -652,7 +652,7 @@ - char *buf = NULL; - int bufsize; - /* needed to get the DNS subjectAltNames: */ -- STACK *subj_alt_names; -+ STACK_OF(GENERAL_NAME) *subj_alt_names; - int subj_alt_names_count; - GENERAL_NAME *subj_alt_name; - /* did we find a name matching hostname? */ diff --git a/pkgs/applications/networking/mailreaders/thunderbird/3.x.nix b/pkgs/applications/networking/mailreaders/thunderbird/3.x.nix index adfc1be0c5bd2..cc21a5b040061 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/3.x.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/3.x.nix @@ -66,6 +66,6 @@ stdenv.mkDerivation { meta = { description = "Mozilla Thunderbird, a full-featured email client"; - homepage = http://www.mozilla.com/en-US/thunderbird/; + homepage = http://www.mozilla.org/thunderbird/; }; } diff --git a/pkgs/applications/networking/mailreaders/thunderbird/5.x.nix b/pkgs/applications/networking/mailreaders/thunderbird/5.x.nix new file mode 100644 index 0000000000000..a8ee384d81dba --- /dev/null +++ b/pkgs/applications/networking/mailreaders/thunderbird/5.x.nix @@ -0,0 +1,83 @@ +{ stdenv, fetchurl, pkgconfig, gtk, perl, python, zip, libIDL +, dbus_glib, bzip2, alsaLib, nspr, yasm, mesa, nss +, libnotify, cairo, pixman, fontconfig + +, # If you want the resulting program to call itself "Thunderbird" + # instead of "Shredder", enable this option. However, those + # binaries may not be distributed without permission from the + # Mozilla Foundation, see + # http://www.mozilla.org/foundation/trademarks/. + enableOfficialBranding ? false + +}: + +let version = "5.0"; in + +# from wikipedia: This Release no longer supports versions of Mac OS X +# before Mac OS X 10.5 Leopard or Mac computers with PowerPC processors. +stdenv.mkDerivation { + name = "thunderbird-${version}"; + + src = fetchurl { + url = "http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.bz2"; + sha1 = "392c3e0ef70b62c29a543f88b2b8d5a51bfe69a7"; + }; + + buildInputs = + [ pkgconfig perl python zip bzip2 gtk dbus_glib alsaLib libIDL nspr libnotify + libnotify cairo pixman fontconfig yasm mesa nss + ]; + + patches = [ + # Fix weird dependencies such as a so file which depends on "-lpthread". + ./thunderbird-build-deps.patch + ]; + + NIX_LDFLAGS = "-lpixman-1"; + + configureFlags = + [ "--enable-application=mail" + "--enable-optimize" + "--disable-debug" + "--enable-strip" + "--with-system-jpeg" + "--with-system-zlib" + # "--with-system-bz2" + "--with-system-nspr" + "--enable-system-cairo" + "--disable-crashreporter" + "--disable-necko-wifi" + "--disable-tests" + "--enable-calendar" + ] + ++ stdenv.lib.optional enableOfficialBranding "--enable-official-branding"; + + # The Thunderbird Makefiles refer to the variables LIBXUL_DIST, + # prefix, and PREFIX in some places where they are not set. In + # particular, there are some linker flags like + # `-rpath-link=$(LIBXUL_DIST)/bin'. Since this expands to + # `-rpath-link=/bin', the build fails due to the purity checks in + # the ld wrapper. So disable the purity check for now. + preBuild = "NIX_ENFORCE_PURITY=0"; + + # This doesn't work: + #makeFlags = "LIBXUL_DIST=$(out) prefix=$(out) PREFIX=$(out)"; + + postInstall = + '' + # Fix some references to /bin paths in the Xulrunner shell script. + substituteInPlace $out/lib/thunderbird-*/thunderbird \ + --replace /bin/pwd "$(type -tP pwd)" \ + --replace /bin/ls "$(type -tP ls)" + ''; + + meta = with stdenv.lib; { + description = "Mozilla Thunderbird, a full-featured email client"; + homepage = http://www.mozilla.org/thunderbird/; + license = + # Official branding implies thunderbird name and logo cannot be reuse, + # see http://www.mozilla.org/foundation/licensing.html + if enableOfficialBranding then licenses.proprietary else licenses.mpl11; + maintainers = with maintainers; [ pierron ]; + }; +} diff --git a/pkgs/applications/networking/mailreaders/thunderbird/thunderbird-build-deps.patch b/pkgs/applications/networking/mailreaders/thunderbird/thunderbird-build-deps.patch new file mode 100644 index 0000000000000..ac074e8c88129 --- /dev/null +++ b/pkgs/applications/networking/mailreaders/thunderbird/thunderbird-build-deps.patch @@ -0,0 +1,21 @@ +diff -x _inst -x _build -x .svn -ur comm-miramar/config/rules.mk comm-miramar.after/config/rules.mk +--- comm-miramar/config/rules.mk 2011-06-24 22:13:31.000000000 +0200 ++++ comm-miramar/config/rules.mk 2011-08-15 12:27:07.305556040 +0200 +@@ -851,9 +851,13 @@ + + ifndef _LIBNAME_RELATIVE_PATHS + +-LIBS_DEPS += $(filter -l%, $(LIBS)) +-HOST_LIBS_DEPS += $(filter -l%, $(HOST_LIBS)) +-DSO_LDOPTS_DEPS += $(filter -l%, $(EXTRA_DSO_LDOPTS)) ++LIBS_DEPS += $(patsubst -l%,$(LIB_PREFIX)%$(DLL_SUFFIX),$(filter-out -lpthread -ldl -lrt -ljemalloc -lmozmalloc,$(filter -l%, $(LIBS)))) ++HOST_LIBS_DEPS += $(patsubst -l%,$(LIB_PREFIX)%$(DLL_SUFFIX),$(filter-out -lpthread -ldl -lrt -ljemalloc -lmozmalloc,$(filter -l%, $(HOST_LIBS)))) ++DSO_LDOPTS_DEPS += $(patsubst -l%,$(LIB_PREFIX)%$(DLL_SUFFIX),$(filter-out -lpthread -ldl -lrt -ljemalloc -lmozmalloc,$(filter -l%, $(EXTRA_DSO_LDOPTS)))) ++ ++LIBS_DEPS += $(patsubst -l%,$(LIB_PREFIX)%.$(LIB_SUFFIX),$(filter -ljemalloc -lmozmalloc, $(LIBS))) ++HOST_LIBS_DEPS += $(patsubst -l%,$(LIB_PREFIX)%.$(LIB_SUFFIX),$(filter -ljemalloc -lmozmalloc, $(HOST_LIBS))) ++DSO_LDOPTS_DEPS += $(patsubst -l%,$(LIB_PREFIX)%.$(LIB_SUFFIX),$(filter -ljemalloc -lmozmalloc, $(EXTRA_DSO_LDOPTS))) + + _LIBDIRS = $(patsubst -L%,%,$(filter -L%, $(LIBS) $(HOST_LIBS) $(EXTRA_DSO_LDOPTS))) + ifneq (,$(_LIBDIRS)) +Seulement dans comm-miramar.after/config: rules.mk~ diff --git a/pkgs/applications/networking/p2p/ktorrent/default.nix b/pkgs/applications/networking/p2p/ktorrent/default.nix index 9e1e7067603fa..e4cb4e9089ab8 100644 --- a/pkgs/applications/networking/p2p/ktorrent/default.nix +++ b/pkgs/applications/networking/p2p/ktorrent/default.nix @@ -1,27 +1,32 @@ -{ stdenv, fetchurl, cmake, automoc4, libktorrent, taglib, kdepimlibs, boost, - gettext, kdebase_workspace }: +{ stdenv, fetchurl, cmake, automoc4, libktorrent, taglib, kdepimlibs, boost +, gettext, kdebase_workspace, qt4, kdelibs, phonon }: stdenv.mkDerivation rec { name = pname + "-" + version; pname = "ktorrent"; - version = "4.0.5"; + version = "4.1.1"; src = fetchurl { url = "${meta.homepage}/downloads/${version}/${name}.tar.bz2"; - sha256 = "1kgy0r9c51w38vj5kjla16vh7nigs89qvvjybjjkv4r41nz9kcfn"; + sha256 = "1h0fqh344sfwfbvnwhn00k8czb14568flapjf4754zss6bxpw4g4"; }; patches = [ ./find-workspace.diff ]; KDEDIRS = libktorrent; - buildInputs = [ automoc4 cmake libktorrent taglib kdepimlibs boost gettext - kdebase_workspace ]; + buildInputs = + [ cmake qt4 kdelibs automoc4 phonon libktorrent boost taglib kdepimlibs + gettext kdebase_workspace + ]; + + enableParallelBuilding = true; meta = { description = "KDE integrated BtTorrent client"; homepage = http://ktorrent.org; maintainers = with stdenv.lib.maintainers; [ sander urkud ]; + inherit (libktorrent.meta) platforms; }; } diff --git a/pkgs/applications/networking/p2p/mldonkey/default.nix b/pkgs/applications/networking/p2p/mldonkey/default.nix index ecc2e5f77941f..244858757d10f 100644 --- a/pkgs/applications/networking/p2p/mldonkey/default.nix +++ b/pkgs/applications/networking/p2p/mldonkey/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, ocaml, zlib, bzip2, ncurses, file, gd, libpng }: stdenv.mkDerivation (rec { - name = "mldonkey-3.0.4"; + name = "mldonkey-3.0.7"; src = fetchurl { url = "mirror://sourceforge/mldonkey/${name}.tar.bz2"; - sha256 = "0wnyi2m7126dq6r5zbqplgknnypzcx0p3q2mxcdfhp94ln7vn3f6"; + sha256 = "1m5cfx79jiym93bx789lqc1bmwrkz1b1jilhga7d994jsjcw6c2n"; }; meta = { @@ -13,8 +13,6 @@ stdenv.mkDerivation (rec { homepage = http://mldonkey.sourceforge.net/; }; - patches = [ ./gcc44mips64.patch ]; - buildInputs = [ ocaml zlib ncurses bzip2 file gd libpng ]; configureFlags = [ "--disable-gui" ]; } // (if (stdenv.system != "i686-linux" && stdenv.system != "x86_64-linux") then diff --git a/pkgs/applications/networking/p2p/mldonkey/gcc44mips64.patch b/pkgs/applications/networking/p2p/mldonkey/gcc44mips64.patch deleted file mode 100644 index 41449dcdd05c4..0000000000000 --- a/pkgs/applications/networking/p2p/mldonkey/gcc44mips64.patch +++ /dev/null @@ -1,103 +0,0 @@ -Patch fixing CryptoPP so: -- it builds properly in mips64 with gcc 4.4 (gcc 4.4 does not have the 'h' asm constraint) -- it runs properly in mips64 (where lack of templated *Precision functions gave wrong numbers). - An assertion check failed without this. - -diff --git a/src/utils/lib/CryptoPP.cc b/src/utils/lib/CryptoPP.cc -index 9208e1c..6b12b0a 100644 ---- a/src/utils/lib/CryptoPP.cc -+++ b/src/utils/lib/CryptoPP.cc -@@ -890,35 +890,6 @@ unsigned int Parity(unsigned long value) - return (unsigned int)value&1; - } - --unsigned int BytePrecision(unsigned long value) --{ -- unsigned int i; -- for (i=sizeof(value); i; --i) -- if (value >> (i-1)*8) -- break; -- -- return i; --} -- --unsigned int BitPrecision(unsigned long value) --{ -- if (!value) -- return 0; -- -- unsigned int l=0, h=8*sizeof(value); -- -- while (h-l > 1) -- { -- unsigned int t = (l+h)/2; -- if (value >> t) -- l = t; -- else -- h = t; -- } -- -- return h; --} -- - unsigned long Crop(unsigned long value, unsigned int size) - { - if (size < 8*sizeof(value)) -@@ -1880,7 +1851,10 @@ public: - #elif defined(__x86_64__) - __asm__("mulq %3" : "=d" (r.m_halfs.high), "=a" (r.m_halfs.low) : "a" (a), "rm" (b) : "cc"); - #elif defined(__mips64) -- __asm__("dmultu %2,%3" : "=h" (r.m_halfs.high), "=l" (r.m_halfs.low) : "r" (a), "r" (b)); -+ //typedef unsigned int uint128_t __attribute__((mode(TI))); -+ __uint128_t tmp = (__uint128_t) a * b; -+ r.m_halfs.high = tmp >> 64; -+ r.m_halfs.low = tmp; - #elif defined(_M_IX86) - // for testing - word64 t = (word64)a * b; -diff --git a/src/utils/lib/CryptoPP.h b/src/utils/lib/CryptoPP.h -index d2ec1b2..775a898 100644 ---- a/src/utils/lib/CryptoPP.h -+++ b/src/utils/lib/CryptoPP.h -@@ -1869,10 +1869,39 @@ template <class T> inline const T& STDMAX(const T& a, const T& b) - // #define GETBYTE(x, y) (((byte *)&(x))[y]) - - CRYPTOPP_DLL unsigned int Parity(unsigned long); --CRYPTOPP_DLL unsigned int BytePrecision(unsigned long); --CRYPTOPP_DLL unsigned int BitPrecision(unsigned long); - CRYPTOPP_DLL unsigned long Crop(unsigned long, unsigned int size); - -+template <typename T> -+unsigned int BitPrecision(const T &value) -+{ -+ if (!value) -+ return 0; -+ -+ unsigned int l=0, h=8*sizeof(value); -+ -+ while (h-l > 1) -+ { -+ unsigned int t = (l+h)/2; -+ if (value >> t) -+ l = t; -+ else -+ h = t; -+ } -+ -+ return h; -+} -+ -+template <typename T> -+unsigned int BytePrecision(const T &value) -+{ -+ unsigned int i; -+ for (i=sizeof(value); i; --i) -+ if (value >> (i-1)*8) -+ break; -+ -+ return i; -+} -+ - inline unsigned int BitsToBytes(unsigned int bitCount) - { - return ((bitCount+7)/(8)); diff --git a/pkgs/applications/networking/remote/rdesktop/default.nix b/pkgs/applications/networking/remote/rdesktop/default.nix index 24e18a75cc973..cceb70b74fbf0 100644 --- a/pkgs/applications/networking/remote/rdesktop/default.nix +++ b/pkgs/applications/networking/remote/rdesktop/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation (rec { pname = "rdesktop"; - version = "1.6.0"; + version = "1.7.0"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://sourceforge/${pname}/${name}.tar.gz"; - sha256 = "0y890s5rv47ipcijcrmcy9988br22ipr4c1ppb88pjhlism6w0im"; + sha256 = "0x2hnzvm0smnanin28n4mvzx9chpj2qnjfrxy307x21mgw6l5q1v"; }; buildInputs = [openssl libX11]; diff --git a/pkgs/applications/networking/skype/default.nix b/pkgs/applications/networking/skype/default.nix index 7e066b5e380ca..98cbfdb7c57d9 100644 --- a/pkgs/applications/networking/skype/default.nix +++ b/pkgs/applications/networking/skype/default.nix @@ -1,18 +1,20 @@ -{stdenv, fetchurl, alsaLib, libXv, libXi, libXrender, libXrandr, zlib, glib -, libXext, libX11, libXScrnSaver, libSM, qt4, libICE, freetype, fontconfig}: +{ stdenv, fetchurl, alsaLib, libXv, libXi, libXrender, libXrandr, zlib, glib +, libXext, libX11, libXScrnSaver, libSM, qt4, libICE, freetype, fontconfig +, pulseaudio }: assert stdenv.system == "i686-linux"; stdenv.mkDerivation rec { - name = "skype-2.1.0.81"; + name = "skype-2.2.0.35"; src = fetchurl { url = "http://download.skype.com/linux/${name}.tar.bz2"; - sha256 = "1x18m4900c0ssaq95wv8mhhgwvw9fh66dszx7zq24zgvb2v1h4jz"; + sha256 = "157ba3ci12bq0nv2m8wlsab45ib5sccqagyna8nixnhqw9q72sxm"; }; buildInputs = [ - alsaLib + alsaLib + pulseaudio stdenv.glibc stdenv.gcc.gcc libXv diff --git a/pkgs/applications/networking/sync/unison/default.nix b/pkgs/applications/networking/sync/unison/default.nix index aa694a3908d22..06bab807ebdd4 100644 --- a/pkgs/applications/networking/sync/unison/default.nix +++ b/pkgs/applications/networking/sync/unison/default.nix @@ -6,10 +6,10 @@ let in stdenv.mkDerivation (rec { - name = "unison-2.32.52"; + name = "unison-2.40.63"; src = fetchurl { url = "http://www.seas.upenn.edu/~bcpierce/unison/download/releases/${name}/${name}.tar.gz"; - sha256 = "11844yh1gpjjapn8pvc14hla7g70spwqy6h61qk2is83mpafahhm"; + sha256 = "17fd2bg5jxwbib87j6j2bjpwdm66whqm1fq46v70hfby79j00vkf"; }; buildInputs = [ ocaml makeWrapper ncurses ]; diff --git a/pkgs/applications/office/abiword/default.nix b/pkgs/applications/office/abiword/default.nix index 6e3d57b78a8b4..fdfd60e98370f 100644 --- a/pkgs/applications/office/abiword/default.nix +++ b/pkgs/applications/office/abiword/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, gtk, libglade, libgnomecanvas, fribidi -, libpng, popt, libgsf, enchant, wv, librsvg, bzip2 +, libpng, popt, libgsf, enchant, wv, librsvg, bzip2, libjpeg }: stdenv.mkDerivation { @@ -12,6 +12,6 @@ stdenv.mkDerivation { buildInputs = [ pkgconfig gtk libglade librsvg bzip2 libgnomecanvas fribidi libpng popt - libgsf enchant wv + libgsf enchant wv libjpeg ]; } diff --git a/pkgs/applications/office/antiword/default.nix b/pkgs/applications/office/antiword/default.nix new file mode 100644 index 0000000000000..c4da2b609ce76 --- /dev/null +++ b/pkgs/applications/office/antiword/default.nix @@ -0,0 +1,28 @@ +{ fetchurl, stdenv }: + +let + name = "antiword-0.37"; +in +stdenv.mkDerivation { + inherit name; + + src = fetchurl { + url = "http://www.winfield.demon.nl/linux/${name}.tar.gz"; + sha256 = "1b7mi1l20jhj09kyh0bq14qzz8vdhhyf35gzwsq43mn6rc7h0b4f"; + }; + + patchPhase = '' + sed -i -e "s|/usr/local/bin|$out/bin|g" -e "s|/usr/share|$out/share|g" Makefile antiword.h + ''; + + installTargets = "global_install"; + + meta = { + homepage = "http://www.winfield.demon.nl/"; + description = "convert MS Word documents to plain text or PostScript"; + license = stdenv.lib.licenses.gpl2; + + maintainers = [ stdenv.lib.maintainers.simons ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/office/hledger-interest/default.nix b/pkgs/applications/office/hledger-interest/default.nix new file mode 100644 index 0000000000000..aea3a1f6aa1e9 --- /dev/null +++ b/pkgs/applications/office/hledger-interest/default.nix @@ -0,0 +1,20 @@ +{ cabal, hledgerLib, mtl, time }: + +cabal.mkDerivation (self: { + pname = "hledger-interest"; + version = "1.2"; + sha256 = "1r5x6z0k33fpvqba6zlkhpm7b0rwwnli4q100psms89x0rrj7y2d"; + isLibrary = false; + isExecutable = true; + buildDepends = [ hledgerLib mtl time ]; + meta = { + homepage = "http://github.com/peti/hledger-interest"; + description = "computes interest for a given account"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/applications/office/kmymoney/default.nix b/pkgs/applications/office/kmymoney/default.nix new file mode 100644 index 0000000000000..8665b8731500c --- /dev/null +++ b/pkgs/applications/office/kmymoney/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, cmake, kdelibs, automoc4, kdepimlibs, gettext, + shared_mime_info, perl, boost, gpgme }: + +stdenv.mkDerivation rec { + name = "kmymoney-4.5.3"; + + src = fetchurl { + url = "mirror://sourceforge/kmymoney2/${name}.tar.bz2"; + sha256 = "1yvgyzybfm1ajswwq3w3kdij4y2cyhfkk52xhv7dbp1wrxsp5cx9"; + }; + + buildInputs = [ kdelibs kdepimlibs perl boost gpgme ]; + buildNativeInputs = [ cmake automoc4 gettext shared_mime_info ]; + + patches = [ ./qgpgme.patch ]; + + meta = { + homepage = http://kmymoney2.sourceforge.net/; + description = "KDE personal money manager"; + inherit (kdelibs.meta) platforms maintainers; + }; +} diff --git a/pkgs/applications/office/kmymoney/qgpgme.patch b/pkgs/applications/office/kmymoney/qgpgme.patch new file mode 100644 index 0000000000000..59ed37edaf8e8 --- /dev/null +++ b/pkgs/applications/office/kmymoney/qgpgme.patch @@ -0,0 +1,17 @@ +KMymoney tries to find qgpgme before kdepimlibs. This is wrong because +FindQGpgme is installed by kdepimlibs, thus can be invisible until kdepimlibs +found. +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f6d7305..88bac67 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -59,8 +59,8 @@ else (WIN32) + find_package(Boost "1.33.1" COMPONENTS graph) + endif (WIN32) + # needed by libkgpgfile +-find_package(QGpgme REQUIRED) + find_package(KdepimLibs REQUIRED) ++find_package(QGpgme REQUIRED) + find_package(SharedMimeInfo REQUIRED) + + add_definitions( ${QT_DEFINITIONS} ${KDE4_DEFINITIONS} ${KDEPIM_DEFINITIONS}) diff --git a/pkgs/applications/office/ledger/3.0.nix b/pkgs/applications/office/ledger/3.0.nix new file mode 100644 index 0000000000000..6c3a469439535 --- /dev/null +++ b/pkgs/applications/office/ledger/3.0.nix @@ -0,0 +1,45 @@ +{ stdenv, fetchgit, python, autoconf, automake, libtool, gettext, emacs, gmp +, pcre, expat, boost, mpfr, git, texinfo }: + +let + rev = "cf35984971341b8a8688"; +in +stdenv.mkDerivation { + name = "ledger3-${rev}"; + + src = fetchgit { + url = "git://github.com/jwiegley/ledger.git"; + inherit rev; + sha256 = "4078983db9fc8d232fa71a31b47e505c531971b4515d6ef723e7d333a2352d2a"; + }; + + buildInputs = [ + python autoconf automake libtool gettext emacs gmp pcre expat boost mpfr + git texinfo + ]; + + buildPhase = '' + sed -i acprep \ + -e 's|search_prefixes = .*|search_prefixes = ["${boost}"]|' + export MAKEFLAGS="-j$NIX_BUILD_CORES -l$NIX_BUILD_CORES" + python acprep update --no-pch --prefix=$out + ''; + + doCheck = true; + + meta = { + homepage = "http://ledger-cli.org/"; + description = "A double-entry accounting system with a command-line reporting interface"; + license = "BSD"; + + longDescription = '' + Ledger is a powerful, double-entry accounting system that is accessed + from the UNIX command-line. This may put off some users, as there is + no flashy UI, but for those who want unparalleled reporting access to + their data, there really is no alternative. + ''; + + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.simons ]; + }; +} diff --git a/pkgs/applications/office/ledger/default.nix b/pkgs/applications/office/ledger/default.nix index c1cd4b42a02aa..1bc8e586e33f7 100644 --- a/pkgs/applications/office/ledger/default.nix +++ b/pkgs/applications/office/ledger/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation { their data, there really is no alternative. ''; - platforms = stdenv.lib.platforms.all; + platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.simons ]; }; } diff --git a/pkgs/applications/science/chemistry/avogadro/default.nix b/pkgs/applications/science/chemistry/avogadro/default.nix new file mode 100644 index 0000000000000..702f4c28912fa --- /dev/null +++ b/pkgs/applications/science/chemistry/avogadro/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, cmake, qt4, zlib, eigen, openbabel }: + +stdenv.mkDerivation rec { + name = "avogadro-1.0.3"; + + src = fetchurl { + url = "mirror://sourceforge/avogadro/${name}.tar.bz2"; + sha256 = "0s44r78vm7hf4cs13d2qki3gf178gjj1ihph6rs04g6s4figvdpg"; + }; + + buildInputs = [ qt4 eigen zlib openbabel ]; + + buildNativeInputs = [ cmake ]; + + meta = { + maintainers = [ stdenv.lib.maintainers.urkud ]; + inherit (qt4.meta) platforms; + }; +} diff --git a/pkgs/applications/science/logic/hol_light/default.nix b/pkgs/applications/science/logic/hol_light/default.nix index b15b62bfa66ee..d835e351cac69 100644 --- a/pkgs/applications/science/logic/hol_light/default.nix +++ b/pkgs/applications/science/logic/hol_light/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchsvn, writeScript, ocaml, findlib, camlp5}: stdenv.mkDerivation rec { - name = "hol_light-20110611"; + name = "hol_light-20110813"; src = fetchsvn { url = http://hol-light.googlecode.com/svn/trunk; - rev = "92"; - sha256 = "773fd353c06ebcbba28d2ba8cc495bd3ab0bb6f3f722f566fb3261a27a873ca0"; + rev = "102"; + sha256 = "5b972672db6aa1838dc5d130accd9ab6a62030c6b0c1dc4b69e42088b1ae86c9"; }; buildInputs = [ ocaml findlib camlp5 ]; diff --git a/pkgs/applications/science/logic/leo2/default.nix b/pkgs/applications/science/logic/leo2/default.nix index eb3a135934801..04ab9a5b5ab3a 100644 --- a/pkgs/applications/science/logic/leo2/default.nix +++ b/pkgs/applications/science/logic/leo2/default.nix @@ -11,10 +11,10 @@ let (builtins.attrNames (builtins.removeAttrs x helperArgNames)); sourceInfo = rec { baseName="leo2"; - version="1.2.6"; + version="1.2.8"; name="${baseName}_v${version}"; url="http://www.ags.uni-sb.de/~leo/${name}.tgz"; - hash="0gjgcm6nb9kzdl0y72sgvf2w2q92s1ix70lh6wjz9lj2qdf7gi1z"; + hash="d46a94f5991623386eb9061cfb0d748e258359a8c690fded173d45303e0e9e3a"; }; in rec { diff --git a/pkgs/applications/science/math/maxima/default.nix b/pkgs/applications/science/math/maxima/default.nix index 0b71b72f13c72..f8f21d8909b49 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.24.0"; + version = "5.25.0"; searchPath = stdenv.lib.makeSearchPath "bin" @@ -13,7 +13,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://sourceforge/${name}/${name}-${version}.tar.gz"; - sha256 = "137crv2f6hxwqrv75m8679vrlbnqgg5ww755cs4kihs1cy03bssq"; + sha256 = "49c90fb809f5027787600050503476193db3620fd9517f620b82ad492ba30c0a"; }; buildInputs = [sbcl texinfo perl makeWrapper]; diff --git a/pkgs/applications/science/math/pari/default.nix b/pkgs/applications/science/math/pari/default.nix index 62763ac2198a2..43291d792b720 100644 --- a/pkgs/applications/science/math/pari/default.nix +++ b/pkgs/applications/science/math/pari/default.nix @@ -11,10 +11,10 @@ let (builtins.attrNames (builtins.removeAttrs x helperArgNames)); sourceInfo = rec { baseName="pari"; - version="2.3.5"; + version="2.5.0"; name="${baseName}-${version}"; url="http://pari.math.u-bordeaux.fr/pub/pari/unix/${name}.tar.gz"; - hash="124xr2jdz2c15v45i1zvgylng44lhf23729a1mk7ci1vywdaxpa7"; + hash="18ipxj4hzj7s3fqz878fiypkzrkbjj8wvbygz9j8c3ya06q27jax"; }; in rec { diff --git a/pkgs/applications/version-management/darcs/darcs-2.nix b/pkgs/applications/version-management/darcs/darcs-2.nix deleted file mode 100644 index f89b29d95f112..0000000000000 --- a/pkgs/applications/version-management/darcs/darcs-2.nix +++ /dev/null @@ -1,20 +0,0 @@ -{cabal, curl, html, mtl, parsec, regexCompat, haskeline, hashedStorage, zlib, tar, text} : - -cabal.mkDerivation (self : { - pname = "darcs"; - name = self.fname; - version = "2.5.1"; - sha256 = "0h7i2nw1fkmdrvwgzccqvbbfx8bdhn0h9d5rd98ayjs207dnvrj8"; - - propagatedBuildInputs = [ - curl html parsec regexCompat haskeline hashedStorage zlib tar text - ]; - - meta = { - homepage = http://darcs.net/; - description = "Patch-based version management system"; - license = "GPL"; - maintainers = [self.stdenv.lib.maintainers.andres]; - }; - -}) diff --git a/pkgs/applications/version-management/darcs/default.nix b/pkgs/applications/version-management/darcs/default.nix new file mode 100644 index 0000000000000..e3f1742ee594b --- /dev/null +++ b/pkgs/applications/version-management/darcs/default.nix @@ -0,0 +1,27 @@ +{ cabal, curl, extensibleExceptions, hashedStorage, haskeline, html +, HTTP, mmap, mtl, network, parsec, random, regexCompat, tar +, terminfo, text, zlib +}: + +cabal.mkDerivation (self: { + pname = "darcs"; + version = "2.5.2"; + sha256 = "11mk1xcrxk2x5c0s96s19wb4xvhjl9s59bdqcrj8f4w09zbgjlw9"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + extensibleExceptions hashedStorage haskeline html HTTP mmap mtl + network parsec random regexCompat tar terminfo text zlib + ]; + extraLibraries = [ curl ]; + meta = { + homepage = "http://darcs.net/"; + description = "a distributed, interactive, smart revision control system"; + license = "GPL"; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix index 5002565b3eac2..002226292b023 100644 --- a/pkgs/applications/version-management/fossil/default.nix +++ b/pkgs/applications/version-management/fossil/default.nix @@ -1,15 +1,16 @@ {stdenv, fetchurl, zlib, openssl, tcl}: let - version = "20110512145652"; + version = "1.18"; + filedate = "20110713230341"; in stdenv.mkDerivation { name = "fossil-${version}"; src = fetchurl { - url = "http://www.fossil-scm.org/download/fossil-src-${version}.tar.gz"; - sha256 = "1x51bmmzmabq8dkpm4sxkqbpmp6nxk9dix7pqa2calmjn3rmzc8k"; + url = "http://www.fossil-scm.org/download/fossil-src-${filedate}.tar.gz"; + sha256 = "065hp5hppzjzvvk9g8zaqbfms011rkiimydnfsgkp4s8jlc2h6dc"; }; buildInputs = [ zlib openssl ]; @@ -17,6 +18,8 @@ stdenv.mkDerivation { doCheck = true; + configurePhase = ":"; + checkTarget = "test"; installPhase = '' diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index cc58a6ff6c6c2..2fb2ad431ce86 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -47,8 +47,9 @@ rec { gitAnnex = lib.makeOverridable (import ./git-annex) { inherit stdenv fetchurl libuuid rsync findutils curl perl git ikiwiki which; - inherit (haskellPackages) ghc MissingH utf8String QuickCheck2 pcreLight SHA dataenc - HTTP testpack; + inherit (haskellPackages) ghc MissingH utf8String pcreLight SHA dataenc + HTTP testpack monadControl; + QuickCheck2 = haskellPackages.QuickCheck_2_4_0_1; }; qgit = import ./qgit { @@ -104,11 +105,11 @@ rec { }; gitSubtree = stdenv.mkDerivation { - name = "git-subtree-0.3"; + name = "git-subtree-0.4"; src = fetchurl { - url = "http://github.com/apenwarr/git-subtree/tarball/v0.3"; + url = "http://github.com/apenwarr/git-subtree/tarball/v0.4"; # sha256 = "0y57lpbcc2142jgrr4lflyb9xgzs9x33r7g4b919ncn3alb95vdr"; - sha256 = "f2ccac1e9cff4c35d989dc2a5581133c96b72d96c6a5ed89e51b6446dadac03f"; + sha256 = "19s8352igwh7x1nqgdfs7rgxahw9cnfv7zmpzpd63m1r3l2945d4"; }; unpackCmd = "gzip -d < $curSrc | tar xvf -"; buildInputs = [ git asciidoc xmlto docbook_xsl docbook_xml_dtd_45 libxslt ]; diff --git a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix index 4407514b70edf..d72b1868b039d 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix @@ -1,19 +1,20 @@ { stdenv, fetchurl, ghc, libuuid, rsync, findutils, curl, perl, MissingH, utf8String -, QuickCheck2, pcreLight, SHA, dataenc, HTTP, testpack, git, ikiwiki, which }: +, QuickCheck2, pcreLight, SHA, dataenc, HTTP, testpack, git, ikiwiki, which +, monadControl }: let - version = "3.20110707"; + version = "3.20110819"; in stdenv.mkDerivation { name = "git-annex-${version}"; src = fetchurl { url = "http://ftp.de.debian.org/debian/pool/main/g/git-annex/git-annex_${version}.tar.gz"; - sha256 = "0yyrp94przjmdljd97q5p0yll9aa1jdajrvlhl4m1yq0ngx6x4rr"; + sha256 = "1442ba4ff35ec8f92f336a5f1055d7ad8306348871a9697262f4f2af3b3c0943"; }; buildInputs = [ghc libuuid rsync findutils curl perl MissingH utf8String QuickCheck2 pcreLight - SHA dataenc HTTP testpack git ikiwiki which]; + SHA dataenc HTTP testpack git ikiwiki which monadControl]; checkTarget = "test"; doCheck = true; @@ -45,7 +46,7 @@ stdenv.mkDerivation { control. ''; - platforms = stdenv.lib.platforms.haskellPlatforms; + platforms = ghc.meta.platforms; maintainers = [ stdenv.lib.maintainers.simons ]; }; } 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 7d51573bad209..ee207788875b8 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -53,6 +53,12 @@ stdenv.mkDerivation rec { substituteInPlace $out/libexec/git-core/git-sh-setup \ --replace ' grep' ' ${gnugrep}/bin/grep' \ --replace ' egrep' ' ${gnugrep}/bin/egrep' + + # Fix references to the perl binary. Note that the tab character + # in the patterns is important. + sed -i -e 's| perl -ne| ${perl}/bin/perl -ne|g' \ + -e 's| perl -e| ${perl}/bin/perl -e|g' \ + $out/libexec/git-core/{git-am,git-submodule} '' + (if svnSupport then diff --git a/pkgs/applications/version-management/git-and-tools/git2cl/default.nix b/pkgs/applications/version-management/git-and-tools/git2cl/default.nix index 026fc18c80183..f3fc8c9b6e984 100644 --- a/pkgs/applications/version-management/git-and-tools/git2cl/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git2cl/default.nix @@ -1,19 +1,22 @@ -{ fetchgit -, stdenv -, perl -}: -stdenv.mkDerivation rec { +{ fetchgit, stdenv, perl }: + +stdenv.mkDerivation { name = "git2cl"; src = fetchgit { - url = git://git.sv.gnu.org/git2cl.git; + url = "git://repo.or.cz/git2cl.git"; rev = "8373c9f74993e218a08819cbcdbab3f3564bbeba"; sha256 = "b0d39379640c8a12821442431e2121f7908ce1cc88ec8ec6bede218ea8c21f2f"; }; - buildCommand = '' - ensureDir $out/bin - cp ${src}/git2cl $out/bin - sed -i 's|/usr/bin/perl|${perl}/bin/perl|' $out/bin/git2cl + buildInputs = [ perl ]; + installPhase = '' + install -D -m755 git2cl $out/bin/git2cl + install -D -m644 README $out/share/doc/git2cl/README ''; + + meta = { + homepage = "http://josefsson.org/git2cl/"; + description = "convert git logs to GNU style ChangeLog files"; + }; } diff --git a/pkgs/applications/version-management/kdesvn/default.nix b/pkgs/applications/version-management/kdesvn/default.nix index b6893ba17e14c..10a590e941b48 100644 --- a/pkgs/applications/version-management/kdesvn/default.nix +++ b/pkgs/applications/version-management/kdesvn/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, lib, cmake, qt4, perl, gettext, apr, aprutil, subversion, db4 -, kdelibs, automoc4, phonon, kdebase}: +, kdelibs, automoc4, phonon, kde_baseapps }: stdenv.mkDerivation { name = "kdesvn-1.5.5"; diff --git a/pkgs/applications/version-management/veracity/default.nix b/pkgs/applications/version-management/veracity/default.nix index a39c2a2d1ed02..82a588f6a1ede 100644 --- a/pkgs/applications/version-management/veracity/default.nix +++ b/pkgs/applications/version-management/veracity/default.nix @@ -65,6 +65,7 @@ rec { prepareMakefiles = a.fullDepEntry '' sed -e 's@ /bin/uname @ uname @g' -i CMakeLists.txt + sed -e 's@ /bin/uname @ uname @g' -i common-CMakeLists.txt cd .. mkdir build cd build diff --git a/pkgs/applications/version-management/veracity/src-for-default.nix b/pkgs/applications/version-management/veracity/src-for-default.nix index dce73da0bf5f4..504d260204cd7 100644 --- a/pkgs/applications/version-management/veracity/src-for-default.nix +++ b/pkgs/applications/version-management/veracity/src-for-default.nix @@ -1,9 +1,9 @@ rec { - version="0.9.0.10466"; - name="veracity-0.9.0.10466"; - hash="19mi6pw4cy4f0w7v7myx0i1ajy40i9pgkmgr9rvfilcyi9rlvj6q"; - url="http://download-us.sourcegear.com/Veracity/nightly/veracity-source-${version}.tar.gz"; - advertisedUrl="http://download-us.sourcegear.com/Veracity/nightly/veracity-source-0.9.0.10466.tar.gz"; + version="1.0.0.10517"; + name="veracity-1.0.0.10517"; + hash="08bka5zzn7i7c3dm3xp57n3szvm9msmi7mq1zynqb6i210qix79g"; + url="http://download.sourcegear.com/Veracity/release/1.0.0.10517/veracity-source-${version}.tar.gz"; + advertisedUrl="http://download.sourcegear.com/Veracity/release/1.0.0.10517/veracity-source-1.0.0.10517.tar.gz"; } diff --git a/pkgs/applications/version-management/veracity/src-info-for-default.nix b/pkgs/applications/version-management/veracity/src-info-for-default.nix index dac6c65e85c65..cf4936ffc554b 100644 --- a/pkgs/applications/version-management/veracity/src-info-for-default.nix +++ b/pkgs/applications/version-management/veracity/src-info-for-default.nix @@ -1,5 +1,5 @@ { - #downloadPage = "http://sourcegear.com/veracity/downloads.html"; - downloadPage = "http://download-us.sourcegear.com/Veracity/nightly/index.html"; + downloadPage = "http://veracity-scm.org/downloads.html"; + #downloadPage = "http://download-us.sourcegear.com/Veracity/nightly/index.html"; baseName = "veracity"; } diff --git a/pkgs/applications/video/MPlayer/default.nix b/pkgs/applications/video/MPlayer/default.nix index e51e91478b764..348a5e7e32371 100644 --- a/pkgs/applications/video/MPlayer/default.nix +++ b/pkgs/applications/video/MPlayer/default.nix @@ -61,11 +61,13 @@ let license = "unfree"; }; } else null; + ffmpegGit = fetchgit { url = "git://git.videolan.org/ffmpeg.git"; rev = "80d156d"; sha256 = "6d0124621491b8adc5f1bfb426ab137efc72dab99a89835aa3c30b970cb14004"; }; + mplayerRev = "33472"; in @@ -134,6 +136,7 @@ stdenv.mkDerivation rec { --disable-ivtv --enable-vidix --enable-fbdev + --disable-ossaudio ''; NIX_LDFLAGS = if x11Support then "-lX11 -lXext" else ""; diff --git a/pkgs/applications/video/gnome-mplayer/default.nix b/pkgs/applications/video/gnome-mplayer/default.nix index 0d86e902efdb0..7c1d13fd79d95 100644 --- a/pkgs/applications/video/gnome-mplayer/default.nix +++ b/pkgs/applications/video/gnome-mplayer/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, pkgconfig, glib, gtk, dbus, dbus_glib, GConf}: stdenv.mkDerivation rec { - name = "gnome-mplayer-0.9.99.rc1"; + name = "gnome-mplayer-1.0.4"; src = fetchurl { url = "http://gnome-mplayer.googlecode.com/files/${name}.tar.gz"; - sha256 = "00fbcjpashrld8bpvm63q9ms17kjnj3rrn1ghsfyqi2swpwzk2k1"; + sha256 = "1k5yplsvddcm7xza5h4nfb6vibzjcqsk8gzis890alizk07f5xp2"; }; buildInputs = [pkgconfig glib gtk dbus dbus_glib GConf]; diff --git a/pkgs/applications/video/kdenlive/default.nix b/pkgs/applications/video/kdenlive/default.nix index 5edae1b3e7201..6db6e630d325f 100644 --- a/pkgs/applications/video/kdenlive/default.nix +++ b/pkgs/applications/video/kdenlive/default.nix @@ -1,20 +1,19 @@ -{stdenv, fetchurl, lib, cmake, qt4, perl, kdelibs, automoc4, phonon, mlt, gettext, -shared_mime_info, soprano}: +{ stdenv, fetchurl, lib, cmake, qt4, perl, kdelibs, automoc4, phonon, mlt, gettext +, qimageblitz, qjson, shared_mime_info, soprano }: + +stdenv.mkDerivation rec { + name = "kdenlive-${version}"; + version = "0.8"; -stdenv.mkDerivation { - name = "kdenlive-0.7.8"; src = fetchurl { - url = mirror://sourceforge/kdenlive/kdenlive-0.7.8.tar.gz; - sha256 = "10bwmhh3kzdbq1nzq8s5ln7ydrzg41d1rihj5kdmf5hb91az8mvx"; + url = "mirror://sourceforge/kdenlive/${name}.tar.gz"; + sha256 = "18e3390c9eb7124af5cd43819c679374aec46dcaf1fc5cdb43918db470c1076f"; }; - prePatch = '' - # For Qt47 compatibility. - sed -i 's@class QImage@#include <QImage>@' src/colorcorrection/vectorscopegenerator.h - ''; + patches = [ ./kdenlive-newmlt.patch ]; buildInputs = [ cmake qt4 perl kdelibs automoc4 phonon mlt gettext - shared_mime_info soprano ]; + qimageblitz qjson shared_mime_info soprano ]; meta = { description = "Free and open source video editor"; diff --git a/pkgs/applications/video/kdenlive/kdenlive-newmlt.patch b/pkgs/applications/video/kdenlive/kdenlive-newmlt.patch new file mode 100644 index 0000000000000..b3a772a7ac6e1 --- /dev/null +++ b/pkgs/applications/video/kdenlive/kdenlive-newmlt.patch @@ -0,0 +1,70 @@ +From http://kdenlive.org/forum/cant-start-kdnlive-sdl-module-missing-mlt + +Kdenlive 0.8 tries to detect mlt by reading from stderr, but between +mlt 0.7.2 and 0.7.4 mlt this has changed from stderr to stdout. +=================================================================== +--- kdenlive-0.8/src.orig/wizard.cpp 2011-04-26 21:44:22.000000000 +0200 ++++ kdenlive-0.8/src/wizard.cpp 2011-07-21 18:22:18.470831892 +0200 +@@ -214,7 +214,7 @@ + button(QWizard::NextButton)->setEnabled(false); + } else { + checkProcess.waitForFinished(); +- QByteArray result = checkProcess.readAllStandardError(); ++ QByteArray result = checkProcess.readAllStandardOutput(); + + // Check MLT avformat module + QTreeWidgetItem *avformatItem = new QTreeWidgetItem(m_mltCheck.programList, QStringList() << QString() << i18n("Avformat module (FFmpeg)")); +@@ -246,7 +246,7 @@ + kDebug() << "// Error querying MLT's version"; + } else { + checkProcess.waitForFinished(); +- mltVersion = checkProcess.readAllStandardError(); ++ mltVersion = checkProcess.readAllStandardOutput(); + mltVersion = mltVersion.section('\n', 0, 0).simplified(); + mltVersion = mltVersion.section(' ', -1).simplified(); + version = 1000 * mltVersion.section('.', 0, 0).toInt() + 100 * mltVersion.section('.', 1, 1).toInt() + mltVersion.section('.', 2, 2).toInt(); +@@ -275,7 +275,7 @@ + kDebug() << "// Error parsing MLT's avformat codecs"; + } else { + checkProcess2.waitForFinished(); +- QByteArray codecList = checkProcess2.readAllStandardError(); ++ QByteArray codecList = checkProcess2.readAllStandardOutput(); + QString acodecList(codecList); + QStringList result; + QStringList alist = acodecList.split('\n', QString::SkipEmptyParts); +@@ -292,7 +292,7 @@ + kDebug() << "// Error parsing MLT's avformat codecs"; + } else { + checkProcess2.waitForFinished(); +- QByteArray codecList = checkProcess2.readAllStandardError(); ++ QByteArray codecList = checkProcess2.readAllStandardOutput(); + QString vcodecList(codecList); + QStringList result; + QStringList vlist = vcodecList.split('\n', QString::SkipEmptyParts); +@@ -309,7 +309,7 @@ + kDebug() << "// Error parsing MLT's avformat codecs"; + } else { + checkProcess2.waitForFinished(); +- QByteArray codecList = checkProcess2.readAllStandardError(); ++ QByteArray codecList = checkProcess2.readAllStandardOutput(); + QString vcodecList(codecList); + QStringList result; + QStringList vlist = vcodecList.split('\n', QString::SkipEmptyParts); +@@ -606,7 +606,7 @@ + + checkProcess.waitForFinished(); + +- QByteArray result = checkProcess.readAllStandardError(); ++ QByteArray result = checkProcess.readAllStandardOutput(); + if (!result.contains("- avformat")) errorMessage.append(i18n("MLT's avformat (FFMPEG) module not found. Please check your FFMPEG and MLT install. Kdenlive will not work until this issue is fixed.") + "\n");*/ + + QProcess checkProcess2; +@@ -616,7 +616,7 @@ + + checkProcess2.waitForFinished(); + +- QByteArray result = checkProcess2.readAllStandardError(); ++ QByteArray result = checkProcess2.readAllStandardOutput(); + if (!result.contains("sdl") || !result.contains("sdl_preview")) errorMessage.append(i18n("MLT's SDL module not found. Please check your MLT install. Kdenlive will not work until this issue is fixed.") + '\n'); + + if (!errorMessage.isEmpty()) { diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index c96dfeb013f36..ce7b233fdd208 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, perl, xlibs, libdvdnav -, zlib, a52dec, libmad, faad2, ffmpeg, alsa +, zlib, a52dec, libmad, faad2, ffmpeg, alsaLib , pkgconfig, dbus, hal, fribidi, qt4, freefont_ttf , libvorbis, libtheora, speex, lua, libgcrypt, libupnp , libcaca, pulseaudio, flac, schroedinger, libxml2, librsvg @@ -10,17 +10,17 @@ stdenv.mkDerivation rec { name = "vlc-${version}"; - version = "1.1.9"; + version = "1.1.11"; patchPhase = ''sed -e "s@/bin/echo@echo@g" -i configure''; src = fetchurl { url = "mirror://sourceforge/vlc/${name}.tar.bz2"; - sha256 = "02rdrfxh7d70yxz0qinmkw2jad2hxzfrw0r1hiyyxandrgg73ggh"; + sha256 = "1jz1yklvh5apy2ygqwnyq61mhg09h0fn32hdygxfsaxq12z609b8"; }; buildInputs = [ - perl zlib a52dec libmad faad2 ffmpeg alsa libdvdnav libdvdnav.libdvdread + perl zlib a52dec libmad faad2 ffmpeg alsaLib libdvdnav libdvdnav.libdvdread pkgconfig dbus hal fribidi qt4 libvorbis libtheora speex lua libgcrypt libupnp libcaca pulseaudio flac schroedinger libxml2 librsvg mpeg2dec udev gnutls avahi libcddb jackaudio SDL SDL_image libmtp unzip taglib diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 727cea4d6786a..0cb4999bce64f 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -4,14 +4,14 @@ , xorriso, makeself, perl, jdk }: -let version = "4.0.4"; in +let version = "4.1.0"; in stdenv.mkDerivation { name = "virtualbox-${version}-${kernel.version}"; src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2"; - sha256 = "1iqagfkpjczdf4xqdwjk49cbsl80d12av0rjb6jccm1gir1gwjgh"; + sha256 = "1pi066xnjgr3fl42i1vc1pbwic9l4m1k6mzs4ip41fz99w59xfzp"; }; buildInputs = [iasl dev86 libxslt libxml2 xproto libX11 libXext libXcursor qt4 libIDL SDL hal libcap glib kernel python alsaLib curl pam xorriso makeself perl jdk ]; @@ -24,6 +24,7 @@ stdenv.mkDerivation { -i configure ls kBuild/bin/linux.x86/k* tools/linux.x86/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux.so.2 ls kBuild/bin/linux.amd64/k* tools/linux.amd64/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 + find . -type f | xargs sed 's/depmod -a/true/' -i export USER=nix set +x "; diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index a89efd4140353..9dfe9c26c0de7 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, lib, patchelf, cdrkit, kernel, which, makeWrapper , libX11, libXt, libXext, libXmu, libXcomposite, libXfixes, libXrandr, libXcursor}: -let version = "4.0.4"; in +let version = "4.1.0"; in stdenv.mkDerivation { name = "VirtualBox-GuestAdditions-${version}"; src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso"; - sha256 = "0f3phmy75cfyhvfsyljs85rgra13kiy2zans6bhc7sqji30kkk48"; + sha256 = "0azj08l0457cjl5v2ddgb5kz8gblsi7cgjgdmyiszvlqpyfbh98w"; }; KERN_DIR = "${kernel}/lib/modules/*/build"; buildInputs = [ patchelf cdrkit makeWrapper ]; @@ -45,8 +45,7 @@ stdenv.mkDerivation { for i in * do cd $i - sed -i -e "s/depmod/echo/g" Makefile - sed -i -e "s/depmod/echo/g" */Makefile + find . -type f | xargs sed 's/depmod -a/true/' -i make cd .. done @@ -106,8 +105,8 @@ stdenv.mkDerivation { # Install Xorg drivers ensureDir $out/lib/xorg/modules/{drivers,input} - install -m 644 lib/VBoxGuestAdditions/vboxvideo_drv_18.so $out/lib/xorg/modules/drivers/vboxvideo_drv.so - install -m 644 lib/VBoxGuestAdditions/vboxmouse_drv_18.so $out/lib/xorg/modules/input/vboxmouse_drv.so + install -m 644 lib/VBoxGuestAdditions/vboxvideo_drv_19.so $out/lib/xorg/modules/drivers/vboxvideo_drv.so + install -m 644 lib/VBoxGuestAdditions/vboxmouse_drv_19.so $out/lib/xorg/modules/input/vboxmouse_drv.so # Install kernel modules cd src @@ -117,8 +116,8 @@ stdenv.mkDerivation { cd $i kernelVersion=$(cd ${kernel}/lib/modules; ls) export MODULE_DIR=$out/lib/modules/$kernelVersion/misc - sed -i -e "s|-o root||g" \ - -e "s|-g root||g" Makefile + find . -type f | xargs sed -i -e "s|-o root||g" \ + -e "s|-g root||g" make install cd .. done diff --git a/pkgs/applications/window-managers/dwm/default.nix b/pkgs/applications/window-managers/dwm/default.nix index cca60332d06cc..1427eec54f6cd 100644 --- a/pkgs/applications/window-managers/dwm/default.nix +++ b/pkgs/applications/window-managers/dwm/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, libX11, libXinerama, patches ? []}: stdenv.mkDerivation rec { - name = "dwm-5.8.2"; + name = "dwm-5.9"; src = fetchurl { url = "http://dl.suckless.org/dwm/${name}.tar.gz"; - sha256 = "0rlv72fls2k4s48a0mw7mxa05d4qdxgs8pqbkyqkpzz3jb3kn965"; + sha256 = "0cp25zqgaqj5k1mlvgxnc5jqi252chqjc5v0fzpqbhrklaidbk9d"; }; buildInputs = [ libX11 libXinerama ]; diff --git a/pkgs/applications/window-managers/trayer/default.nix b/pkgs/applications/window-managers/trayer/default.nix new file mode 100644 index 0000000000000..ce66f7d9bcc03 --- /dev/null +++ b/pkgs/applications/window-managers/trayer/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, pkgconfig, gdk_pixbuf, gtk, libXmu }: + +stdenv.mkDerivation rec { + name = "trayer-1.1.3"; + + buildInputs = [ pkgconfig gdk_pixbuf gtk libXmu ]; + + src = fetchurl { + url = "https://github.com/sargon/trayer-srg/tarball/${name}"; + name = "${name}.tar.gz"; + sha256 = "03be5ea47278ecdb6ffb1d3b5115a855a6eccd6aa6702b84e89ee047ddd76558"; + }; + + makeFlags = [ "PREFIX=$(out)" ]; + + meta = { + homepage = http://github.com/sargon/trayer-srg; + + license = "bsd"; + + description = "A lightweight GTK2-based systray for UNIX desktop"; + + maintainers = [ stdenv.lib.maintainers.shlevy ]; + + platforms = stdenv.lib.platforms.linux; + }; +} + diff --git a/pkgs/applications/window-managers/xmonad/default.nix b/pkgs/applications/window-managers/xmonad/default.nix index 5380db40c0226..76b9b37456e2b 100644 --- a/pkgs/applications/window-managers/xmonad/default.nix +++ b/pkgs/applications/window-managers/xmonad/default.nix @@ -1,6 +1,6 @@ {cabal, X11, mtl, xmessage, syb}: -cabal.mkDerivation (self : { +cabal.mkDerivation (self: { pname = "xmonad"; name = "${self.fname}"; version = "0.9.2"; @@ -8,8 +8,14 @@ cabal.mkDerivation (self : { noHaddock = true; propagatedBuildInputs = [X11 mtl syb]; meta = { - description = "xmonad is a tiling window manager for X"; - homepage = http://xmonad.org/; + homepage = "http://xmonad.org"; + description = "A tiling window manager"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; }; preConfigure = '' diff --git a/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix b/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix index a8b39e6e5b0df..7ca5e2b17fd10 100644 --- a/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix +++ b/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix @@ -1,11 +1,22 @@ -{cabal, xmonad, X11, utf8String, X11Xft}: +{ cabal, extensibleExceptions, mtl, random, utf8String, X11, X11Xft +, xmonad +}: -cabal.mkDerivation (self : { +cabal.mkDerivation (self: { pname = "xmonad-contrib"; version = "0.9.2"; sha256 = "06hg5j4w8iz62wmyygq4c7xcbi9dxlhhh3dbic438cjk7c0w1h5p"; - propagatedBuildInputs = [X11 xmonad utf8String X11Xft]; + buildDepends = [ + extensibleExceptions mtl random utf8String X11 X11Xft xmonad + ]; meta = { - description = "a huge extension library for xmonad"; + homepage = "http://xmonad.org/"; + description = "Third party extensions for xmonad"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; }; }) diff --git a/pkgs/applications/window-managers/xmonad/xmonad-extras.nix b/pkgs/applications/window-managers/xmonad/xmonad-extras.nix index 4c554bef0e440..6d9b2a420fbec 100644 --- a/pkgs/applications/window-managers/xmonad/xmonad-extras.nix +++ b/pkgs/applications/window-managers/xmonad/xmonad-extras.nix @@ -1,7 +1,7 @@ {cabal, xmonad, xmonadContrib, X11, utf8String, X11Xft, parsec, split}: -cabal.mkDerivation (self : { +cabal.mkDerivation (self: { pname = "xmonad-extras"; version = "0.9.2"; sha256 = "54b41a4c59ff3d68b3a214d727fb5675fa7c1b90090d99e58ecae62b3dfdd701"; @@ -9,6 +9,13 @@ cabal.mkDerivation (self : { [X11 xmonad xmonadContrib utf8String X11Xft parsec split]; noHaddock = true; meta = { - description = "Various modules for xmonad that cannot be added to xmonad-contrib because of additional dependencies"; + homepage = "http://projects.haskell.org/xmonad-extras"; + description = "Third party extensions for xmonad with wacky dependencies"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; }; }) |