diff options
Diffstat (limited to 'pkgs/applications')
49 files changed, 1014 insertions, 218 deletions
diff --git a/pkgs/applications/audio/distrho/default.nix b/pkgs/applications/audio/distrho/default.nix index 7a1d24844b6a..a409ba1f28b9 100644 --- a/pkgs/applications/audio/distrho/default.nix +++ b/pkgs/applications/audio/distrho/default.nix @@ -2,23 +2,19 @@ , libxslt, lv2, pkgconfig, premake, xlibs }: let - rev = "7815b3545978e"; + rev = "99efbf0b"; in stdenv.mkDerivation rec { name = "distrho-${rev}"; src = fetchgit { - url = "git://distrho.git.sf.net/gitroot/distrho/distrho"; + url = "https://github.com/falkTX/DISTRHO.git"; inherit rev; - sha256 = "2e260f16ee67b1166c39e2d55c8dd5593902c8b3d8d86485545ef83139e1e844"; + sha256 = "ed26a6edca19ebb8260b3dc042f69c32162e1d91179fb9d22da42ec7131936f9"; }; patchPhase = '' - sed -e "s#xsltproc#${libxslt}/bin/xsltproc#" -i Makefile - sed -e "s#PREFIX = /usr/local#PREFIX = $out#" -i Makefile - sed -e "s#/etc/HybridReverb2#$out/etc/Hybridreverb2#" \ - -i ports/hybridreverb2/source/SystemConfig.cpp - sed -e "s#/usr#$out#" -i ports/hybridreverb2/data/HybridReverb2.conf + sed -e "s#@./scripts#sh scripts#" -i Makefile ''; buildInputs = [ @@ -31,9 +27,6 @@ stdenv.mkDerivation rec { sh ./scripts/premake-update.sh linux make standalone make lv2 - - # generate lv2 ttl - sh scripts/generate-ttl.sh ''; installPhase = '' @@ -41,12 +34,6 @@ stdenv.mkDerivation rec { cp bin/standalone/* $out/bin/ mkdir -p $out/lib/lv2 cp -a bin/lv2/* $out/lib/lv2/ - - # HybridReverb2 data - mkdir -p $out/etc/HybridReverb2 - cp ports/hybridreverb2/data/HybridReverb2.conf $out/etc/HybridReverb2/ - mkdir -p $out/share - cp -a ports/hybridreverb2/data/HybridReverb2 $out/share/ ''; meta = with stdenv.lib; { @@ -55,8 +42,8 @@ stdenv.mkDerivation rec { longDescription = '' Includes: 3BandEQ bitmangler drowaudio-distortion drowaudio-flanger - drowaudio-tremolo eqinox HybridReverb2 juce_pitcher sDelay - TAL-Filter TAL-NoiseMaker TAL-Reverb-2 TAL-Vocoder-2 ThePilgrim + drowaudio-tremolo eqinox juce_pitcher sDelay TAL-Filter + TAL-NoiseMaker TAL-Reverb-2 TAL-Vocoder-2 ThePilgrim Wolpertinger argotlunar capsaicin drowaudio-distortionshaper drowaudio-reverb drumsynth highlife JuceDemoPlugin PingPongPan TAL-Dub-3 TAL-Filter-2 TAL-Reverb TAL-Reverb-3 TheFunction vex diff --git a/pkgs/applications/audio/flac/default.nix b/pkgs/applications/audio/flac/default.nix index fa201d20c3fb..5dd993b0ef8c 100644 --- a/pkgs/applications/audio/flac/default.nix +++ b/pkgs/applications/audio/flac/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { patches = [ # Fix for building on GCC 4.3. (fetchurl { - url = "http://sources.gentoo.org/viewcvs.py/*checkout*/gentoo-x86/media-libs/flac/files/flac-1.2.1-gcc-4.3-includes.patch?rev=1.1"; + url = "http://sourceforge.net/p/flac/patches/_discuss/thread/9d4c7504/d8ea/attachment/flac-1.2.1-gcc-4.3-includes.patch"; sha256 = "1m6ql5vyjb2jlp5qiqp6w0drq1m6x6y3i1dnl5ywywl3zd36k0mr"; }) ]; diff --git a/pkgs/applications/audio/gmpc/default.nix b/pkgs/applications/audio/gmpc/default.nix new file mode 100644 index 000000000000..10a2f0dcee94 --- /dev/null +++ b/pkgs/applications/audio/gmpc/default.nix @@ -0,0 +1,51 @@ +{ stdenv, fetchurl, libtool, intltool, pkgconfig, glib +, gtk, curl, mpd_clientlib, libsoup, gob2, vala +}: + +stdenv.mkDerivation rec { + name = "gmpc-${version}"; + version = "11.8.16"; + + libmpd = stdenv.mkDerivation { + name = "libmpd-11.8.17"; + src = fetchurl { + url = http://download.sarine.nl/Programs/gmpc/11.8/libmpd-11.8.17.tar.gz; + sha256 = "10vspwsgr8pwf3qp2bviw6b2l8prgdiswgv7qiqiyr0h1mmk487y"; + }; + buildInputs = [ pkgconfig glib ]; + }; + + libunique = stdenv.mkDerivation { + name = "libunique-1.1.6"; + src = fetchurl { + url = http://ftp.gnome.org/pub/GNOME/sources/libunique/1.1/libunique-1.1.6.tar.gz; + sha256 = "2cb918dde3554228a211925ba6165a661fd782394bd74dfe15e3853dc9c573ea"; + }; + buildInputs = [ pkgconfig glib gtk ]; + + patches = [ + (fetchurl { + url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/remove_G_CONST_RETURN.patch?h=packages/libunique"; + sha256 = "0da2qi7cyyax4rr1p25drlhk360h8d3lapgypi5w95wj9k6bykhr"; + }) + ]; + }; + + src = fetchurl { + url = "http://download.sarine.nl/Programs/gmpc/11.8/gmpc-11.8.16.tar.gz"; + sha256 = "0b3bnxf98i5lhjyljvgxgx9xmb6p46cn3a9cccrng14nagri9556"; + }; + + buildInputs = [ + libtool intltool pkgconfig glib gtk curl mpd_clientlib libsoup + libunique libmpd gob2 vala + ]; + + meta = with stdenv.lib; { + homepage = http://gmpclient.org; + description = "A GTK2 frontend for Music Player Daemon"; + license = licenses.gpl2; + maintainers = [ maintainers.rickynils ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/audio/linuxsampler/default.nix b/pkgs/applications/audio/linuxsampler/default.nix index d9413c031546..1408a1775ee5 100644 --- a/pkgs/applications/audio/linuxsampler/default.nix +++ b/pkgs/applications/audio/linuxsampler/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { have questions on the subject, that are not yet covered by the FAQ, please contact us. ''; - license = licenses.proprietary; + license = licenses.unfree; maintainers = [ maintainers.goibhniu ]; platforms = platforms.linux; }; diff --git a/pkgs/applications/audio/mid2key/default.nix b/pkgs/applications/audio/mid2key/default.nix new file mode 100644 index 000000000000..1e163391a397 --- /dev/null +++ b/pkgs/applications/audio/mid2key/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, alsaLib, libX11, libXi, libXtst, xextproto }: + +stdenv.mkDerivation rec { + name = "mid2key-r1"; + + src = fetchurl { + url = "http://mid2key.googlecode.com/files/${name}.tar.gz"; + sha256 = "0j2vsjvdgx51nd1qmaa18mcy0yw9pwrhbv2mdwnf913bwsk4y904"; + }; + + unpackPhase = "tar xvzf $src"; + + buildInputs = [ alsaLib libX11 libXi libXtst xextproto ]; + + buildPhase = "make"; + + installPhase = "mkdir -p $out/bin && mv mid2key $out/bin"; + + meta = with stdenv.lib; { + homepage = http://code.google.com/p/mid2key/; + description = "A simple tool which maps midi notes to simulated keystrokes"; + license = licenses.gpl3; + maintainers = [ maintainers.goibhniu ]; + }; +} diff --git a/pkgs/applications/audio/mopidy/default.nix b/pkgs/applications/audio/mopidy/default.nix index d285c4b0e237..d4777dcc53a8 100644 --- a/pkgs/applications/audio/mopidy/default.nix +++ b/pkgs/applications/audio/mopidy/default.nix @@ -5,12 +5,12 @@ pythonPackages.buildPythonPackage rec { name = "mopidy-${version}"; - version = "0.11.1"; + version = "0.12.0"; src = fetchgit { url = "https://github.com/mopidy/mopidy.git"; rev = "refs/tags/v${version}"; - sha256 = "123p9hsnlgwvrw4vzlxjf5f43rqzqa3ynbqha8pyi6r0q3ln7qjn"; + sha256 = "18b1gsyq1ph1a8gl6m4jmhkvq1gyyhbkbb6rrr3qr4rb5prl1fyi"; }; propagatedBuildInputs = with pythonPackages; [ diff --git a/pkgs/applications/audio/normalize/default.nix b/pkgs/applications/audio/normalize/default.nix new file mode 100644 index 000000000000..e422eee363c4 --- /dev/null +++ b/pkgs/applications/audio/normalize/default.nix @@ -0,0 +1,17 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "normalize-${version}"; + version = "0.7.7"; + + src = fetchurl { + url = "http://savannah.nongnu.org/download/normalize/normalize-0.7.7.tar.gz"; + sha256 = "1n5khss10vjjp6w69q9qcl4kqfkd0pr555lgqghrchn6rjms4mb0"; + }; + + meta = with stdenv.lib; { + homepage = http://normalize.nongnu.org/; + description = "Audio file normalizer"; + license = licenses.gpl2; + }; +} diff --git a/pkgs/applications/audio/puredata/default.nix b/pkgs/applications/audio/puredata/default.nix index e2563b8fe06f..b1df008398db 100644 --- a/pkgs/applications/audio/puredata/default.nix +++ b/pkgs/applications/audio/puredata/default.nix @@ -1,24 +1,31 @@ -{ stdenv, fetchurl, alsaLib, autoconf, automake, fftw, gettext, glib, -libX11, libtool, tcl, tk }: +{ stdenv, fetchurl, alsaLib, autoconf, automake, fftw, gettext, glib +, jackaudio, libX11, libtool, makeWrapper, pkgconfig, tcl, tk +}: stdenv.mkDerivation rec { name = "puredata-${version}"; - version = "0.43-0"; + version = "0.44-0"; src = fetchurl { url = "mirror://sourceforge/pure-data/pd-${version}.src.tar.gz"; - sha256 = "1qfq7x8vj12kr0cdrnbvmxfhc03flicc6vcc8bz6hwrrakwciyz2"; + sha256 = "031bvqfnlpfx0y5n0l5rmslziqc6jgmk99x1prgh1rmhjhjdnijw"; }; - buildInputs = [ alsaLib autoconf automake fftw gettext glib libX11 - libtool tcl tk ]; + buildInputs = [ + alsaLib autoconf automake fftw gettext glib jackaudio libX11 + libtool makeWrapper pkgconfig tcl tk + ]; preConfigure = '' ./autogen.sh ''; + postInstall = '' + wrapProgram $out/bin/pd --prefix PATH : ${tk}/bin + ''; + meta = with stdenv.lib; { - description = ''Real-time graphical programming environment for + description = ''A real-time graphical programming environment for audio, video, and graphical processing''; homepage = http://puredata.info; license = licenses.bsd3; diff --git a/pkgs/applications/editors/emacs-modes/cedet/default.nix b/pkgs/applications/editors/emacs-modes/cedet/default.nix index 46381dfc648d..779fc8a146e1 100644 --- a/pkgs/applications/editors/emacs-modes/cedet/default.nix +++ b/pkgs/applications/editors/emacs-modes/cedet/default.nix @@ -1,14 +1,14 @@ -{ fetchurl, stdenv, emacs }: +{ fetchurl, stdenv, emacs, python }: stdenv.mkDerivation rec { - name = "cedet-1.0pre6"; + name = "cedet-1.1"; src = fetchurl { url = "mirror://sourceforge/cedet/${name}.tar.gz"; - sha256 = "0pvd54rjlba12cxgqibm8v4i8x43r5c239z891lgcbafjvkzpdxb"; + sha256 = "0p2bwlpwwa019axvgj09xkxbr53j0pq23d46s4la9jfhl47nbh22"; }; - buildInputs = [ emacs ]; + buildInputs = [ emacs python ]; doCheck = true; checkPhase = "make utest"; diff --git a/pkgs/applications/editors/emacs-modes/prolog/default.nix b/pkgs/applications/editors/emacs-modes/prolog/default.nix index b89951e65355..237b1ac14834 100644 --- a/pkgs/applications/editors/emacs-modes/prolog/default.nix +++ b/pkgs/applications/editors/emacs-modes/prolog/default.nix @@ -1,19 +1,21 @@ -{stdenv, fetchurl}: +{ stdenv, fetchurl }: -stdenv.mkDerivation -{ - name = "prolog-mode-1.22"; - src = fetchurl - { - url = "http://bruda.ca/emacs-prolog/prolog.el"; - sha256 = "f46915b2436642bb3302cb38cc457d3c121d0c3e95aecdf128fedc2ae5ea0c87"; +stdenv.mkDerivation { + name = "prolog-mode-1.25"; + + src = fetchurl { + url = "http://bruda.ca/_media/emacs/prolog.el"; + sha256 = "0hfd2dr3xc5qxgvc08nkb2l5a05hfldahdc6ymi9vd8798cc46yh"; }; - buildCommand = "install -v -D -m644 $src $out/share/emacs/site-lisp/prolog.el"; + buildCommand = '' + mkdir -p $out/share/emacs/site-lisp/ + cp $src $out/share/emacs/site-lisp/prolog.el + ''; meta = { - homepage = "http://turing.ubishops.ca/home/bruda/emacs-prolog/"; + homepage = "http://bruda.ca/emacs/prolog_mode_for_emacs/"; description = "Prolog mode for Emacs"; - license = "GPL"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/applications/graphics/cinepaint/default.nix b/pkgs/applications/graphics/cinepaint/default.nix index 7b1a7f26239f..8d88e570f272 100644 --- a/pkgs/applications/graphics/cinepaint/default.nix +++ b/pkgs/applications/graphics/cinepaint/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig ]; - NIX_LDFLAGS = "-llcms -ljpeg"; + NIX_LDFLAGS = "-llcms -ljpeg -lX11"; # NIX_CFLAGS_COMPILE = "-I."; diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix index aa67406d0e79..91c91dc39250 100644 --- a/pkgs/applications/graphics/darktable/default.nix +++ b/pkgs/applications/graphics/darktable/default.nix @@ -8,12 +8,12 @@ assert stdenv ? glibc; stdenv.mkDerivation rec { - version = "1.1.4"; + version = "1.2"; name = "darktable-${version}"; src = fetchurl { - url = "mirror://sourceforge/darktable/darktable/1.1/darktable-${version}.tar.xz"; - sha256 = "1bzcxh8zm0xxrpifkkksv9k4xagjrzlam00yja9v9cbjlvawfszv"; + url = "mirror://sourceforge/darktable/darktable/1.2/darktable-${version}.tar.xz"; + sha256 = "0l2lrly46nda7b2y4gskqqxaajia34g487bgjcpd5ysxbhmmhlnw"; }; buildInputs = diff --git a/pkgs/applications/graphics/pinta/default.nix b/pkgs/applications/graphics/pinta/default.nix index 349982bc24cb..b845abacf7ec 100644 --- a/pkgs/applications/graphics/pinta/default.nix +++ b/pkgs/applications/graphics/pinta/default.nix @@ -1,11 +1,12 @@ {stdenv, fetchurl, mono, gtksharp, pkgconfig}: stdenv.mkDerivation { - name = "pinta-0.5"; + name = "pinta-1.4"; src = fetchurl { - url = http://github.com/downloads/jpobst/Pinta/pinta-0.5.tar.gz; - sha256 = "0qv95zswi488bkbck9b9yhmczj1sgqc96nzn4f5rwfqz516kilrl"; + url = "https://github.com/PintaProject/pinta/tarball/3f7ccfa93d"; + name = "pinta-1.4.tar.gz"; + sha256 = "1kgb4gy5l6bd0akniwhiqqkvqayr5jgdsvn2pgg1038q9raafnpn"; }; buildInputs = [mono gtksharp pkgconfig]; diff --git a/pkgs/applications/misc/taskwarrior/default.nix b/pkgs/applications/misc/taskwarrior/default.nix index dae574804b4d..dc1fce1d64ca 100644 --- a/pkgs/applications/misc/taskwarrior/default.nix +++ b/pkgs/applications/misc/taskwarrior/default.nix @@ -1,13 +1,14 @@ {stdenv, fetchurl, cmake}: -stdenv.mkDerivation { - name = "taskwarrior-2.1.2"; +stdenv.mkDerivation rec { + name = "taskwarrior-${version}"; + version = "2.2.0"; enableParallelBuilding = true; src = fetchurl { - url = http://www.taskwarrior.org/download/task-2.1.2.tar.gz; - sha256 = "0diy72sgiyvfl6bdy7k3qwv3ijx2z1y477smkk6jsbbd9fsp2lfg"; + url = "http://www.taskwarrior.org/download/task-${version}.tar.gz"; + sha256 = "057fh50qp9bd5s08rw51iybpamn55v5nhn3s6ds89g76hp95vqir"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/networking/browsers/chromium/sources.nix b/pkgs/applications/networking/browsers/chromium/sources.nix index 9e4c0cff5634..b1f145bbbe8e 100644 --- a/pkgs/applications/networking/browsers/chromium/sources.nix +++ b/pkgs/applications/networking/browsers/chromium/sources.nix @@ -1,18 +1,18 @@ # This file is autogenerated from update.sh in the same directory. { dev = { - version = "27.0.1448.0"; - url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-27.0.1448.0.tar.xz"; - sha256 = "03sarp8drf9a6likk4m73lgk2i4nhqqri8ja9h8qiglqc4sf2hn0"; + version = "27.0.1453.47"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-27.0.1453.47.tar.xz"; + sha256 = "0dyyxdn75a6b35a7wv9xqzcnskbcxj19bmfd7cq9ya5jdhcvy9j9"; }; beta = { - version = "26.0.1410.43"; - url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-26.0.1410.43.tar.xz"; - sha256 = "110x9cs88gqvqya71bqspx2s7ph6ca0als7sp5fbf911cj0iy0ii"; + version = "27.0.1453.47"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-27.0.1453.47.tar.xz"; + sha256 = "0dyyxdn75a6b35a7wv9xqzcnskbcxj19bmfd7cq9ya5jdhcvy9j9"; }; stable = { - version = "26.0.1410.43"; - url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-26.0.1410.43.tar.xz"; - sha256 = "110x9cs88gqvqya71bqspx2s7ph6ca0als7sp5fbf911cj0iy0ii"; + version = "26.0.1410.63"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-26.0.1410.63.tar.xz"; + sha256 = "0gsb0dgk7p04997wlw7swxnnpf5ix9drn0wn07pgsalr8l3zgy3s"; }; } diff --git a/pkgs/applications/networking/browsers/conkeror/default.nix b/pkgs/applications/networking/browsers/conkeror/default.nix index 0a370701109c..b50266e27619 100644 --- a/pkgs/applications/networking/browsers/conkeror/default.nix +++ b/pkgs/applications/networking/browsers/conkeror/default.nix @@ -1,18 +1,18 @@ { stdenv, fetchurl, unzip, xulrunner, makeWrapper }: stdenv.mkDerivation { - name = "conkeror-1.0pre-20120316"; + name = "conkeror-1.0pre-20130401"; src = fetchurl { - url = http://repo.or.cz/w/conkeror.git/snapshot/1264c0dbbefb6d671504a072d4ddb48d62ccead2.zip; - sha256 = "1vdxnhqjjvg9cry70byv6d3wib2p4rxhkmv7hs10pq39km1kpj7f"; + url = http://repo.or.cz/w/conkeror.git/snapshot/0341e791c78653a2f5bbbff9a1dac04bf898dd65.zip; + sha256 = "11v7p40lcz6r5z0w54f8pk6hyn9mqjcw44fqszjyz25rkhx951ry"; }; buildInputs = [ unzip makeWrapper ]; - buildCommand = '' + installPhase = '' mkdir -p $out/libexec/conkeror - unzip $src -d $out/libexec + cp -r * $out/libexec/conkeror makeWrapper ${xulrunner}/bin/xulrunner $out/bin/conkeror \ --add-flags $out/libexec/conkeror/application.ini diff --git a/pkgs/applications/networking/browsers/firefox/20.0.nix b/pkgs/applications/networking/browsers/firefox/20.0.nix new file mode 100644 index 000000000000..1480a300820c --- /dev/null +++ b/pkgs/applications/networking/browsers/firefox/20.0.nix @@ -0,0 +1,176 @@ +{ stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL +, libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs +, freetype, fontconfig, file, alsaLib, nspr, nss, libnotify +, yasm, mesa, sqlite, unzip, makeWrapper, pysqlite + +, # If you want the resulting program to call itself "Firefox" instead + # of "Shiretoko" or whatever, enable this option. However, those + # binaries may not be distributed without permission from the + # Mozilla Foundation, see + # http://www.mozilla.org/foundation/trademarks/. + enableOfficialBranding ? false +}: + +assert stdenv.gcc ? libc && stdenv.gcc.libc != null; + +rec { + + firefoxVersion = "20.0"; + + xulVersion = "20.0"; # this attribute is used by other packages + + + src = fetchurl { + urls = [ + # It is better to use this url for official releases, to take load off Mozilla's ftp server. + "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2" + # Fall back to this url for versions not available at releases.mozilla.org. + "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2" + ]; + sha1 = "6d776c29da0be0d2a50abeb504d63b06b7861218"; + }; + + commonConfigureFlags = + [ "--enable-optimize" + #"--enable-profiling" + "--disable-debug" + "--enable-strip" + # "--with-system-jpeg" # Too old in nixpkgs + "--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" # <-- doesn't build + "--enable-system-sqlite" + "--disable-crashreporter" + "--disable-tests" + "--disable-necko-wifi" # maybe we want to enable this at some point + "--disable-installer" + "--disable-updater" + ]; + + + xulrunner = stdenv.mkDerivation rec { + name = "xulrunner-${xulVersion}"; + + inherit src; + + buildInputs = + [ pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2 + python dbus dbus_glib pango freetype fontconfig xlibs.libXi + xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file + alsaLib nspr nss libnotify xlibs.pixman yasm mesa + xlibs.libXScrnSaver xlibs.scrnsaverproto pysqlite + xlibs.libXext xlibs.xextproto sqlite unzip makeWrapper + ]; + + configureFlags = + [ "--enable-application=xulrunner" + "--disable-javaxpcom" + ] ++ commonConfigureFlags; + + enableParallelBuilding = true; + + preConfigure = + '' + export NIX_LDFLAGS="$NIX_LDFLAGS -L$out/lib/xulrunner-${xulVersion}" + + mkdir ../objdir + cd ../objdir + configureScript=../mozilla-release/configure + ''; # */ + + #installFlags = "SKIP_GRE_REGISTRATION=1"; + + postInstall = '' + # Fix run-mozilla.sh search + libDir=$(cd $out/lib && ls -d xulrunner-[0-9]*) + echo libDir: $libDir + test -n "$libDir" + cd $out/bin + rm xulrunner + + for i in $out/lib/$libDir/*; do + file $i; + if file $i | grep executable &>/dev/null; then + echo -e '#! /bin/sh\nexec "'"$i"'" "$@"' > "$out/bin/$(basename "$i")"; + chmod a+x "$out/bin/$(basename "$i")"; + fi; + done + for i in $out/lib/$libDir/*.so; do + patchelf --set-rpath "$(patchelf --print-rpath "$i"):$out/lib/$libDir" $i || true + done + for i in $out/lib/$libDir/{plugin-container,xulrunner,xulrunner-stub}; do + wrapProgram $i --prefix LD_LIBRARY_PATH ':' "$out/lib/$libDir" + done + rm -f $out/bin/run-mozilla.sh + ''; # */ + + meta = { + description = "Mozilla Firefox XUL runner"; + homepage = http://www.mozilla.com/en-US/firefox/; + }; + + passthru = { inherit gtk; version = xulVersion; }; + }; + + + firefox = stdenv.mkDerivation rec { + name = "firefox-${firefoxVersion}"; + + inherit src; + + enableParallelBuilding = true; + + buildInputs = + [ pkgconfig gtk perl zip libIDL libjpeg zlib cairo bzip2 python + dbus dbus_glib pango freetype fontconfig alsaLib nspr nss libnotify + xlibs.pixman yasm mesa sqlite file unzip pysqlite + ]; + + propagatedBuildInputs = [xulrunner]; + + configureFlags = + [ "--enable-application=browser" + "--with-libxul-sdk=${xulrunner}/lib/xulrunner-devel-${xulrunner.version}" + "--enable-chrome-format=jar" + "--disable-elf-hack" + ] + ++ commonConfigureFlags + ++ stdenv.lib.optional enableOfficialBranding "--enable-official-branding"; + + makeFlags = [ + "SYSTEM_LIBXUL=1" + ]; + + # Hack to work around make's idea of -lbz2 dependency + preConfigure = + '' + find . -name Makefile.in -execdir sed -i '{}' -e '1ivpath %.so ${ + stdenv.lib.concatStringsSep ":" + (map (s : s + "/lib") (buildInputs ++ [stdenv.gcc.libc])) + }' ';' + ''; + + postInstall = + '' + ln -s ${xulrunner}/lib/xulrunner-${xulrunner.version} $(echo $out/lib/firefox-*)/xulrunner + cd "$out/lib/"firefox-* + rm firefox + echo -e '#!${stdenv.shell}\nexec ${xulrunner}/bin/xulrunner "'"$PWD"'/application.ini" "$@"' > firefox + chmod a+x firefox + ''; # */ + + meta = { + description = "Mozilla Firefox - the browser, reloaded"; + homepage = http://www.mozilla.com/en-US/firefox/; + maintainers = [ stdenv.lib.maintainers.eelco ]; + }; + + passthru = { + inherit gtk xulrunner nspr; + isFirefox3Like = true; + }; + }; +} diff --git a/pkgs/applications/networking/dropbox-cli/default.nix b/pkgs/applications/networking/dropbox-cli/default.nix new file mode 100644 index 000000000000..b298b3c9df99 --- /dev/null +++ b/pkgs/applications/networking/dropbox-cli/default.nix @@ -0,0 +1,36 @@ +{ stdenv, coreutils, fetchurl, python }: + +stdenv.mkDerivation { + name = "dropbox-cli"; + + src = fetchurl { + url = "https://linux.dropbox.com/packages/dropbox.py"; + sha256 = "1x46i0aplah4a2nqglb8byl3c60w7h1cjja62myxj2dpxyv7fydy"; + }; + + buildInputs = [ coreutils python ]; + + phases = "installPhase fixupPhase"; + + installPhase = '' + mkdir -pv $out/bin/ + cp $src $out/bin/dropbox-cli + ''; + + fixupPhase = '' + substituteInPlace $out/bin/dropbox-cli \ + --replace "/usr/bin/python" ${python}/bin/python \ + --replace "use dropbox help" "use dropbox-cli help" + + chmod +x $out/bin/dropbox-cli + ''; + + meta = { + homepage = http://dropbox.com; + description = "Command line client for the dropbox daemon."; + license = stdenv.lib.licenses.gpl3; + # NOTE: Dropbox itself only works on linux, so this is ok. + platforms = stdenv.lib.platforms.linux; + }; +} + diff --git a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix index 1d49e0d1ff78..457d3441b3ab 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.3"; + name = "bitlbee-3.2"; src = fetchurl { url = "mirror://bitlbee/src/${name}.tar.gz"; - sha256 = "09dgwfqznd2cnqraksivmh132nnl99gwgplynjmfsyyf6y4pbjl2"; + sha256 = "1b43828e906f5450993353f2ebecc6c038f0261c4dc3f1722ebafa6ea3e62030"; }; buildInputs = [ gnutls glib pkgconfig libotr ] diff --git a/pkgs/applications/networking/instant-messengers/hipchat/default.nix b/pkgs/applications/networking/instant-messengers/hipchat/default.nix new file mode 100644 index 000000000000..e51798502371 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/hipchat/default.nix @@ -0,0 +1,63 @@ +{ stdenv +, fetchurl +, libtool +, libXext +, libSM +, libICE +, libX11 +, libXft +, libXau +, libXdmcp +, libXrender +, freetype +, fontconfig +, openssl +}: + +let + version = "1.94.407"; + + rpath = stdenv.lib.makeSearchPath "lib" [ + stdenv.glibc + stdenv.gcc.gcc + libtool + libXext + libSM + libICE + libX11 + libXft + libXau + libXdmcp + libXrender + freetype + fontconfig + openssl + ]; + + src = fetchurl { + url = "http://downloads.hipchat.com/linux/arch/hipchat-${version}-i686.pkg.tar.xz"; + sha256 = "0kyjpa2ir066zqkvs1zmnx6kvl8v4jfl8h7bw110cgigwmiplk7k"; + }; +in stdenv.mkDerivation { + name = "hipchat-${version}"; + + buildCommand = '' + tar xf ${src} + mkdir -p $out + mv opt/HipChat/lib $out + mv opt/HipChat/bin $out + mv usr/share $out + patchShebangs $out/bin + for file in $(find $out/lib -type f); do + patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux.so.2 $file || true + patchelf --set-rpath ${rpath}:$out/lib $file || true + done + ''; + + meta = { + description = "HipChat Desktop Client"; + homepage = http://www.hipchat.com; + license = stdenv.lib.licenses.unfree; + platforms = [ "i686-linux" "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix index e60d37ed4a26..cf42dd5700ba 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix @@ -1,18 +1,19 @@ -{ stdenv, fetchurl, libotr, pidgin} : +{ stdenv, fetchurl, libotr, pidgin, intltool } : -stdenv.mkDerivation { - name = "pidgin-otr-3.2.0"; +stdenv.mkDerivation rec { + name = "pidgin-otr-4.0.0"; src = fetchurl { - url = http://www.cypherpunks.ca/otr/pidgin-otr-3.2.0.tar.gz; - sha256 = "1cp6s565sid657lvmm7jrwl9wnk4ywsl8d9sp4iba36r0s5qaw08"; + url = "http://www.cypherpunks.ca/otr/${name}.tar.gz"; + sha256 = "14a6vxvlkm8wazng9aj7p82dr12857fx5is1frcyd7my5l4kysym"; }; + postInstall = "ln -s \$out/lib/pidgin \$out/share/pidgin-otr"; + + buildInputs = [ libotr pidgin intltool ]; + meta = { - description = "OTR plugin for Pidgin IM."; homepage = http://www.cypherpunks.ca/otr; + description = "Plugin for Pidgin 2.x which implements OTR Messaging"; + license = "GPLv2"; }; - - postInstall = "ln -s \$out/lib/pidgin \$out/share/pidgin-otr"; - - buildInputs = [libotr pidgin]; } diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/skype4pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/skype4pidgin/default.nix new file mode 100644 index 000000000000..544aa06877ad --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/skype4pidgin/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchurl, pkgconfig, pidgin, libnotify, gdk_pixbuf, glib, dbus +, dbus_glib }: + +stdenv.mkDerivation rec { + name = "skype4pidgin-novas0x2a-20120411-6c53f7c48f"; + src = fetchurl { + url = "https://github.com/novas0x2a/skype4pidgin/tarball/6c53f7c48f"; + name = "${name}.tar.gz"; + sha256 = "116jfh5ravaixivqx4a4bz0lbb9c49d5r83nwmripja56zdbpgr0"; + }; + + NIX_CFLAGS_COMPILE = "-I${libnotify}/include/libnotify"; + + patchPhase = '' + sed -i -e 's/ [^ ]*-gcc/ gcc/' -e 's/-march[^ ]*//' \ + -e 's/GLIB_CFLAGS =.*/GLIB_CFLAGS=`pkg-config --cflags glib-2.0 gdk-pixbuf-2.0 libnotify purple dbus-glib-1`/' Makefile + pkg-config --cflags glib-2.0 gdk-pixbuf-2.0 libnotify + ''; + + buildPhase = "make libskype.so libskype_dbus.so"; + + installPhase = '' + ensureDir $out/pixmaps/pidgin/protocols/{16,22,48} $out/bin $out/lib/pidgin + cp icons/16/skypeout.png $out/pixmaps/pidgin/protocols/16 + cp icons/22/skypeout.png $out/pixmaps/pidgin/protocols/22 + cp icons/48/skypeout.png $out/pixmaps/pidgin/protocols/48 + cp libskype.so libskype_dbus.so $out/lib/pidgin + ''; + + postInstall = "ln -s \$out/lib/pidgin \$out/share/pidgin-otr"; + + buildInputs = [ pidgin pkgconfig libnotify gdk_pixbuf glib dbus dbus_glib ]; + + meta = { + homepage = https://github.com/novas0x2a/skype4pidgin; + license = "GPLv3+"; + description = "Plugin to use a running skype account through pidgin"; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix index 238e7e50f44f..00fba657d8a4 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix @@ -21,10 +21,10 @@ } : stdenv.mkDerivation rec { - name = "pidgin-2.10.6"; + name = "pidgin-2.10.7"; src = fetchurl { url = "mirror://sourceforge/pidgin/${name}.tar.bz2"; - sha256 = "3e25a633b97cbfa8326999a30282e7a662a9b9bbf2853be84af0b8fb60392c96"; + sha256 = "14piyx4xpc3l8286x4nh5pna2wfyn9cv0qa29br1q3d2xja2k8zb"; }; inherit nss ncurses; diff --git a/pkgs/applications/networking/instant-messengers/silc-client/default.nix b/pkgs/applications/networking/instant-messengers/silc-client/default.nix new file mode 100644 index 000000000000..a4035604168f --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/silc-client/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchurl, perl, pkgconfig, glib, ncurses +, enablePlugin ? false }: + +# Enabling the plugin and using it with a recent irssi, segafults on join: +# http://marc.info/?l=silc-devel&m=125610477802211 + +let + basename = "silc-client-1.1.8"; +in +stdenv.mkDerivation { + name = basename + stdenv.lib.optionalString enablePlugin "-irssi-plugin"; + + src = fetchurl { + url = "http://silcnet.org/download/client/sources/${basename}.tar.bz2"; + sha256 = "1qnk35g8sbnfps3bq2k9sy0ymlsijh5n8z59m2ccq4pkmqbfqgv2"; + }; + + dontDisableStatic = true; + + patches = [ ./server_setup.patch ]; + + configureFlags = "--with-ncurses=${ncurses}"; + + preConfigure = stdenv.lib.optionalString enablePlugin '' + configureFlags="$configureFlags --with-silc-plugin=$out/lib/irssi" + ''; + + buildInputs = [ perl pkgconfig glib ncurses ]; + + meta = { + homepage = http://silcnet.org/; + description = "Secure Internet Live Conferencing server"; + license = "GPLv2"; + maintainers = with stdenv.lib.maintainers; [viric]; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/silc-client/server_setup.patch b/pkgs/applications/networking/instant-messengers/silc-client/server_setup.patch new file mode 100644 index 000000000000..466194c0a8fe --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/silc-client/server_setup.patch @@ -0,0 +1,28 @@ +Add function to replace the behaviour of server_setup_find_port which was removed from irssi on revision 5125. Fixes bug #577501. +--- a/apps/irssi/src/silc/core/client_ops.c ++++ b/apps/irssi/src/silc/core/client_ops.c +@@ -2790,6 +2790,15 @@ + silc_free(a); + } + ++/* helper function to emulate server_setup_find_port */ ++static SERVER_SETUP_REC *silc_server_setup_find_port(const char *address, ++ int port) { ++ SERVER_SETUP_REC *rec; ++ ++ rec = server_setup_find(address, port, NULL); ++ return (rec == NULL || rec->port != port) ? NULL : rec; ++} ++ + /* Find authentication data by hostname and port. The hostname may be IP + address as well.*/ + +@@ -2811,7 +2820,7 @@ + + /* Check whether we find the password for this server in our + configuration. If it's set, always send it server. */ +- setup = server_setup_find_port(hostname, port); ++ setup = silc_server_setup_find_port(hostname, port); + if (setup && setup->password) { + completion(SILC_AUTH_PASSWORD, setup->password, strlen(setup->password), + context); diff --git a/pkgs/applications/networking/instant-messengers/skype-call-recorder/conference.patch b/pkgs/applications/networking/instant-messengers/skype-call-recorder/conference.patch new file mode 100644 index 000000000000..8b8ce8fd7bbf --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/skype-call-recorder/conference.patch @@ -0,0 +1,148 @@ +From abd67f1d44eef81baf2e9729f95e002c4ecc7350 Mon Sep 17 00:00:00 2001 +From: jlh <jlh@gmx.ch> +Date: Fri, 16 Oct 2009 17:40:54 +0200 +Subject: [PATCH] Rudimentary support for recording hosted conference calls + +--- + call.cpp | 37 +++++++++++++++++++++++++++++++++++-- + call.h | 11 ++++++++++- + 2 files changed, 45 insertions(+), 3 deletions(-) + +diff --git a/call.cpp b/call.cpp +index c2b02f2..663c1c1 100644 +--- a/call.cpp ++++ b/call.cpp +@@ -90,9 +90,10 @@ void AutoSync::reset() { + + // Call class + +-Call::Call(QObject *p, Skype *sk, CallID i) : +- QObject(p), ++Call::Call(CallHandler *h, Skype *sk, CallID i) : ++ QObject(h), + skype(sk), ++ handler(h), + id(i), + status("UNKNOWN"), + writer(NULL), +@@ -119,6 +120,13 @@ Call::Call(QObject *p, Skype *sk, CallID i) : + debug(QString("Call %1: cannot get partner display name").arg(id)); + displayName = "Unnamed Caller"; + } ++ ++ // Skype does not properly send updates when the CONF_ID property ++ // changes. since we need this information, check it now on all calls ++ handler->updateConfIDs(); ++ // this call isn't yet in the list of calls, thus we need to ++ // explicitely check its CONF_ID ++ updateConfID(); + } + + Call::~Call() { +@@ -134,6 +142,10 @@ Call::~Call() { + // QT takes care of deleting servers and sockets + } + ++void Call::updateConfID() { ++ confID = skype->getObject(QString("CALL %1 CONF_ID").arg(id)).toLong(); ++} ++ + bool Call::okToDelete() const { + // this is used for checking whether past calls may now be deleted. + // when a past call hasn't been decided yet whether it should have been +@@ -270,6 +282,11 @@ void Call::startRecording(bool force) { + if (isRecording) + return; + ++ if (handler->isConferenceRecording(confID)) { ++ debug(QString("Call %1: call is part of a conference that is already being recorded").arg(id)); ++ return; ++ } ++ + if (force) { + emit showLegalInformation(); + } else { +@@ -589,6 +606,22 @@ CallHandler::~CallHandler() { + delete legalInformationDialog; + } + ++void CallHandler::updateConfIDs() { ++ QList<Call *> list = calls.values(); ++ for (int i = 0; i < list.size(); i++) ++ list.at(i)->updateConfID(); ++} ++ ++bool CallHandler::isConferenceRecording(CallID id) const { ++ QList<Call *> list = calls.values(); ++ for (int i = 0; i < list.size(); i++) { ++ Call *c = list.at(i); ++ if (c->getConfID() == id && c->getIsRecording()) ++ return true; ++ } ++ return false; ++} ++ + void CallHandler::callCmd(const QStringList &args) { + CallID id = args.at(0).toInt(); + +diff --git a/call.h b/call.h +index cb8396d..b746f46 100644 +--- a/call.h ++++ b/call.h +@@ -43,6 +43,8 @@ class QTcpServer; + class QTcpSocket; + class LegalInformationDialog; + ++class CallHandler; ++ + typedef int CallID; + + class AutoSync { +@@ -68,18 +70,21 @@ private: + class Call : public QObject { + Q_OBJECT + public: +- Call(QObject *, Skype *, CallID); ++ Call(CallHandler *, Skype *, CallID); + ~Call(); + void startRecording(bool = false); + void stopRecording(bool = true); ++ void updateConfID(); + bool okToDelete() const; + void setStatus(const QString &); + QString getStatus() const { return status; } + bool statusDone() const; + bool statusActive() const; + CallID getID() const { return id; } ++ CallID getConfID() const { return confID; } + void removeFile(); + void hideConfirmation(int); ++ bool getIsRecording() const { return isRecording; } + + signals: + void startedCall(int, const QString &); +@@ -99,10 +104,12 @@ private: + + private: + Skype *skype; ++ CallHandler *handler; + CallID id; + QString status; + QString skypeName; + QString displayName; ++ CallID confID; + AudioFileWriter *writer; + bool isRecording; + int stereo; +@@ -140,6 +147,8 @@ class CallHandler : public QObject { + public: + CallHandler(QObject *, Skype *); + ~CallHandler(); ++ void updateConfIDs(); ++ bool isConferenceRecording(CallID) const; + void callCmd(const QStringList &); + + signals: +-- +1.6.5.GIT + diff --git a/pkgs/applications/networking/instant-messengers/skype-call-recorder/default.nix b/pkgs/applications/networking/instant-messengers/skype-call-recorder/default.nix new file mode 100644 index 000000000000..2fa82e1251bc --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/skype-call-recorder/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, cmake, lame, id3lib, libvorbis, qt4, libogg }: + +stdenv.mkDerivation { + name = "skype-call-recorder-0.8"; + src = fetchurl { + url = "http://atdot.ch/scr/files/0.8/skype-call-recorder-0.8.tar.gz"; + sha256 = "1iijkhq3aj9gr3bx6zl8ryvzkqcdhsm9yisimakwq0lnw0lgf5di"; + }; + + # Keep an rpath reference to the used libogg + prePatch = '' + sed -i -e '/ADD_EXECUTABLE/aSET(LIBRARIES ''${LIBRARIES} ogg)' CMakeLists.txt + ''; + + # Better support for hosted conferences + patches = [ ./conference.patch ]; + + buildInputs = [ cmake lame id3lib libvorbis qt4 libogg ]; + + meta = { + homepage = http://atdot.ch/scr/; + description = "Open source tool to record your Skype calls on Linux"; + license = "GPLv2+"; + platforms = with stdenv.lib.platforms; linux; + maintainers = with stdenv.lib.maintainers; [viric]; + }; +} diff --git a/pkgs/applications/networking/irc/irssi/fish/default.nix b/pkgs/applications/networking/irc/irssi/fish/default.nix new file mode 100644 index 000000000000..98d5afa0ba9f --- /dev/null +++ b/pkgs/applications/networking/irc/irssi/fish/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl, irssi, gmp, automake, autoconf, libtool, openssl, glib, pkgconfig }: + +stdenv.mkDerivation rec { + name = "fish-irssi-20130413-e98156bebd"; + + src = fetchurl { + url = https://github.com/falsovsky/FiSH-irssi/tarball/e98156bebd; + name = "${name}.tar.gz"; + sha256 = "1ndr51qrg66h1mfzacwzl1vd6lj39pdc4p4z5iihrj4r2f6gk11a"; + }; + + preConfigure = '' + tar xf ${irssi.src} + configureFlags="$configureFlags --with-irssi-source=`pwd`/${irssi.name}" + + ./regen.sh + ''; + + installPhase = '' + ensureDir $out/lib/irssi/modules + cp src/.libs/libfish.so $out/lib/irssi/modules + ''; + + buildInputs = [ gmp automake autoconf libtool openssl glib pkgconfig ]; + + meta = { + homepage = https://github.com/falsovsky/FiSH-irssi; + license = "unfree"; # I can't find any mention of license + maintainers = with stdenv.lib.maintainers; [viric]; + }; +} diff --git a/pkgs/applications/networking/irc/irssi/otr/default.nix b/pkgs/applications/networking/irc/irssi/otr/default.nix new file mode 100644 index 000000000000..ba3a56e642ed --- /dev/null +++ b/pkgs/applications/networking/irc/irssi/otr/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, libotr, automake, autoconf, libtool, glib, pkgconfig, irssi }: + +let + rev = "59ddcbe66a"; +in +with stdenv.lib; +stdenv.mkDerivation rec { + name = "irssi-otr-20130315-${rev}"; + + src = fetchurl { + url = "https://github.com/cryptodotis/irssi-otr/tarball/${rev}"; + name = "${name}.tar.gz"; + sha256 = "095dak0d10j6cpkwlqmk967p1wypwzvqr4wdqvb30w14dbn8dy0d"; + }; + + patchPhase = '' + sed -i 's,/usr/include/irssi,${irssi}/include/irssi,' src/Makefile.am + sed -i "s,/usr/lib/irssi,$out/lib/irssi," configure.ac + sed -i "s,/usr/share/irssi,$out/share/irssi," help/Makefile.am + ''; + + preConfigure = "sh ./bootstrap"; + + buildInputs = [ libotr automake autoconf libtool glib pkgconfig irssi ]; + + meta = { + homepage = https://github.com/cryptodotis/irssi-otr; + license = "GPLv2+"; + }; +} diff --git a/pkgs/applications/networking/offrss/default.nix b/pkgs/applications/networking/offrss/default.nix index 5166e8795d57..fd1406127ad8 100644 --- a/pkgs/applications/networking/offrss/default.nix +++ b/pkgs/applications/networking/offrss/default.nix @@ -9,6 +9,10 @@ stdenv.mkDerivation { ''; crossAttrs = { + propagatedBuildInputs = [ curl.crossDrv libmrss.crossDrv ]; + preConfigure = '' + sed 's/^PDF/#PDF/' -i Makefile + ''; makeFlags = "CC=${stdenv.cross.config}-gcc"; }; diff --git a/pkgs/applications/networking/p2p/freenet/default.nix b/pkgs/applications/networking/p2p/freenet/default.nix new file mode 100644 index 000000000000..8fb1a00ec328 --- /dev/null +++ b/pkgs/applications/networking/p2p/freenet/default.nix @@ -0,0 +1,55 @@ +{ stdenv, fetchurl, apacheAntOpenJDK, jre }: + +let + # The .gitmodules in freenet-official-20130413-eccc9b3198 + # points to freenet-contrib-staging-ce3b7d5 + freenet_ext = fetchurl { + url = https://downloads.freenetproject.org/latest/freenet-ext.jar; + sha1 = "507ab3f6ee91f47c187149136fb6d6e98f9a8c7f"; + }; + + bcprov = fetchurl { + url = http://www.bouncycastle.org/download/bcprov-jdk15on-148.jar; + sha256 = "12129q8rmqwlvj6z4j0gc3w0hq5ccrkf2gdlsggp3iws7cp7wjw0"; + }; +in +stdenv.mkDerivation { + name = "freenet-official-20130413-eccc9b3198"; + + src = fetchurl { + url = https://github.com/freenet/fred-official/tarball/eccc9b3198; + name = "freenet-official-eccc9b3198.tar.gz"; + sha256 = "0x0s8gmb95770l7968r99sq0588vf0n1687ivc2hixar19cw620y"; + }; + + patchPhase = '' + cp ${freenet_ext} lib/freenet/freenet-ext.jar + cp ${bcprov} lib/bcprov.jar + + sed '/antcall.*-ext/d' -i build.xml + ''; + + buildInputs = [ apacheAntOpenJDK jre ]; + + buildPhase = "ant package-only"; + + installPhase = '' + ensureDir $out/share/freenet $out/bin + cp lib/bcprov.jar $out/share/freenet + cp lib/freenet/freenet-ext.jar $out/share/freenet + cp dist/freenet.jar $out/share/freenet + + cat <<EOF > $out/bin/freenet + ${jre}/bin/java -cp $out/share/freenet/bcprov.jar:$out/share/freenet/freenet-ext.jar:$out/share/freenet/freenet.jar \\ + -Xmx1024M freenet.node.NodeStarter + EOF + chmod +x $out/bin/freenet + ''; + + meta = { + description = "Decentralised and censorship-resistant network"; + homepage = https://freenetproject.org/; + license = "GPLv2+"; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/applications/networking/p2p/gnunet/default.nix b/pkgs/applications/networking/p2p/gnunet/default.nix index 02f782c75a10..704dd5719c7e 100644 --- a/pkgs/applications/networking/p2p/gnunet/default.nix +++ b/pkgs/applications/networking/p2p/gnunet/default.nix @@ -4,11 +4,11 @@ , makeWrapper }: stdenv.mkDerivation rec { - name = "gnunet-0.9.5"; + name = "gnunet-0.9.5a"; src = fetchurl { url = "mirror://gnu/gnunet/${name}.tar.gz"; - sha256 = "162bahbskhzc0b2pda7v36dckm3p5p9rnbv2w0fbl0xl2gln63aa"; + sha256 = "1mxy1ikv44fia3cybpmiw298x5371a2qh8hr7pi55yg1xqbhfq0x"; }; buildInputs = [ diff --git a/pkgs/applications/search/recoll/default.nix b/pkgs/applications/search/recoll/default.nix new file mode 100644 index 000000000000..6bfa7c7905b0 --- /dev/null +++ b/pkgs/applications/search/recoll/default.nix @@ -0,0 +1,61 @@ +{ stdenv, fetchurl +, qt4, xapian, file, python +, djvulibre, groff, libxslt, unzip, xpdf, antiword, catdoc, lyx +, ghostscript, gawk, gnugrep, gnused, gnutar, gzip, libiconvOrLibc }: + +assert stdenv.system != "powerpc-linux"; + +stdenv.mkDerivation rec { + ver = "1.18.1"; + name = "recoll-${ver}"; + + src = fetchurl { + url = "http://www.lesbonscomptes.com/recoll/${name}.tar.gz"; + sha256 = "0cyrkx5aza3485avb2kxc6cbsqqrb32l1kq8ravr9d828331v84f"; + }; + + configureFlags = [ "--with-inotify" ]; + + buildInputs = [ qt4 xapian file python ]; + + # the filters search through ${PATH} using a sh proc 'checkcmds' for the + # filtering utils. Short circuit this by replacing the filtering command with + # the absolute path to the filtering command. + postInstall = '' + for f in $out/share/recoll/filters/* ; do + substituteInPlace $f --replace antiword ${antiword}/bin/antiword + substituteInPlace $f --replace awk ${gawk}/bin/awk + substituteInPlace $f --replace catppt ${catdoc}/bin/catppt + substituteInPlace $f --replace djvused ${djvulibre}/bin/djvused + substituteInPlace $f --replace djvutxt ${djvulibre}/bin/djvutxt + substituteInPlace $f --replace grep ${gnugrep}/bin/grep + substituteInPlace $f --replace groff ${groff}/bin/groff + substituteInPlace $f --replace gunzip ${gzip}/bin/gunzip + substituteInPlace $f --replace iconv ${libiconvOrLibc}/bin/iconv + substituteInPlace $f --replace lyx ${lyx}/bin/lyx + substituteInPlace $f --replace pdftotext ${xpdf}/bin/pdftotext + substituteInPlace $f --replace pstotext ${ghostscript}/bin/ps2ascii + substituteInPlace $f --replace sed ${gnused}/bin/sed + substituteInPlace $f --replace tar ${gnutar}/bin/tar + substituteInPlace $f --replace unzip ${unzip}/bin/unzip + substituteInPlace $f --replace xls2csv ${catdoc}/bin/xls2csv + substituteInPlace $f --replace xsltproc ${libxslt}/bin/xsltproc + done + ''; + # TODO: + #substituteInPlace $f --replace unrtf ${unrtf}/bin/unrtf + #substituteInPlace $f --replace untex ${untex}/bin/untex + #substituteInPlace $f --replace wpd2html ${wpd2html}/bin/wpd2html + + meta = { + description = "finds keywords inside documents as well as file names"; + longDescription = '' + Recoll is an Xapian frontend that can search through files, archive + members, email attachments. + ''; + homepage = http://www.lesbonscomptes.com/recoll/; + license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.unix; + maintainers = with stdenv.lib.maintainers; [ jcumming ]; + }; +} diff --git a/pkgs/applications/taxes/aangifte-2012/default.nix b/pkgs/applications/taxes/aangifte-2012/default.nix index 056ad81feb59..8f36fd485ddd 100644 --- a/pkgs/applications/taxes/aangifte-2012/default.nix +++ b/pkgs/applications/taxes/aangifte-2012/default.nix @@ -27,7 +27,8 @@ stdenv.mkDerivation { '' mkdir -p $out cp -prvd * $out/ - wrapProgram $out/bin/ib2012ux --prefix PATH : ${xdg_utils}/bin + wrapProgram $out/bin/ib2012ux --prefix PATH : ${xdg_utils}/bin \ + --prefix LD_PRELOAD : $(cat $NIX_GCC/nix-support/orig-gcc)/lib/libgcc_s.so.1 ''; meta = { diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index fa2d26470496..b6d7c1eb5d3b 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -51,7 +51,7 @@ rec { monadControl mtl network networkInfo networkMulticast networkProtocolXmpp QuickCheck random regexCompat SafeSemaphore SHA stm text time regexTdfa transformers transformersBase utf8String uuid wai waiLogger warp - xmlConduit xmlTypes yesod yesodDefault yesodForm yesodStatic testpack; + xmlConduit xmlTypes yesod yesodDefault yesodForm yesodStatic; }; qgit = import ./qgit { 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 697e7d3b42e0..b3a9f02ed9e9 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 @@ -6,18 +6,18 @@ , networkInfo, networkMulticast, networkProtocolXmpp, openssh, QuickCheck , random, regexCompat, rsync, SafeSemaphore, SHA, stm, text, time, transformers , transformersBase, utf8String, uuid, wai, waiLogger, warp, xmlConduit, xmlTypes -, yesod, yesodDefault, yesodForm, yesodStatic, testpack, regexTdfa +, yesod, yesodDefault, yesodForm, yesodStatic, regexTdfa }: let - version = "4.20130314"; + version = "4.20130405"; in stdenv.mkDerivation { name = "git-annex-${version}"; src = fetchurl { url = "http://git.kitenet.net/?p=git-annex.git;a=snapshot;sf=tgz;h=${version}"; - sha256 = "0rwirg9qdbd75c7wl6413blv9045sbxmw20idvbm47qc4q14gzv9"; + sha256 = "13lzkvk5095qj8026lc1p56w0q1c95v7nx8g9p9zrf8mhx6yxb9n"; name = "git-annex-${version}.tar.gz"; }; @@ -29,7 +29,7 @@ stdenv.mkDerivation { networkProtocolXmpp openssh QuickCheck random regexCompat rsync SafeSemaphore SHA stm text time transformers transformersBase utf8String uuid wai waiLogger warp xmlConduit xmlTypes yesod yesodDefault yesodForm - yesodStatic which perl testpack regexTdfa ]; + yesodStatic which perl regexTdfa ]; configurePhase = '' makeFlagsArray=( PREFIX=$out CABAL=./Setup ) diff --git a/pkgs/applications/version-management/git-and-tools/github-backup/default.nix b/pkgs/applications/version-management/git-and-tools/github-backup/default.nix index 6897ef003ad5..5f0df6c8ead1 100644 --- a/pkgs/applications/version-management/git-and-tools/github-backup/default.nix +++ b/pkgs/applications/version-management/git-and-tools/github-backup/default.nix @@ -1,20 +1,16 @@ -{ cabal, fetchurl, extensibleExceptions, filepath, github, hslogger, IfElse -, MissingH, mtl, network, prettyShow +{ cabal, extensibleExceptions, filepath, github, hslogger, IfElse +, MissingH, mtl, network, prettyShow, text }: cabal.mkDerivation (self: { pname = "github-backup"; - version = "1.20120314"; - src = fetchurl { - url = "https://github.com/joeyh/github-backup/archive/1.20120314.tar.gz"; - sha256 = "0rmgkylsnxbry02g5bxq5af03azgydfz6dzyvqzbhnkwavhqdlqy"; - name = "github-backup-${self.pname}.tar.gz"; - }; + version = "1.20130414"; + sha256 = "1s8s1kv4kj086kzq8iq28zyrlg65hrzg3563fw3dazfik73cmlcp"; isLibrary = false; isExecutable = true; buildDepends = [ extensibleExceptions filepath github hslogger IfElse MissingH mtl - network prettyShow + network prettyShow text ]; meta = { homepage = "https://github.com/joeyh/github-backup"; diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix index 42650b3afb30..6e099cd56083 100644 --- a/pkgs/applications/version-management/meld/default.nix +++ b/pkgs/applications/version-management/meld/default.nix @@ -1,8 +1,8 @@ {stdenv, fetchurl, pygtk, python, intltool, scrollkeeper, makeWrapper }: let - minor = "1.5"; - version = "${minor}.2"; + minor = "1.6"; + version = "${minor}.1"; in stdenv.mkDerivation { @@ -10,7 +10,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://ftp.gnome.org/pub/gnome/sources/meld/${minor}/meld-${version}.tar.xz"; - sha256 = "05rbkqflbqnh2c4682d2fmidhwz2bvlggrhp1p7xbi3z8ci87pdx"; + sha256 = "00rsff0yl5qwzh0igkdns6ry2xsbxad70avpqpkbd2bldi94v76y"; }; buildInputs = [ pygtk python intltool scrollkeeper makeWrapper ]; diff --git a/pkgs/applications/version-management/rcs/default.nix b/pkgs/applications/version-management/rcs/default.nix index 65625ff27695..afc7bca2d1ab 100644 --- a/pkgs/applications/version-management/rcs/default.nix +++ b/pkgs/applications/version-management/rcs/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "rcs-5.8.1"; + name = "rcs-5.8.2"; src = fetchurl { url = "mirror://gnu/rcs/${name}.tar.gz"; - sha256 = "1b1y6s4gy3miv2bvx0z01kvnv58h35sw766lccdkxkalk43cml04"; + sha256 = "1p4kqqrvc7plc3n6ls4xwp6d3mw1jcx9p36pilwd65q31mgbs07a"; }; doCheck = true; diff --git a/pkgs/applications/video/avxsynth/default.nix b/pkgs/applications/video/avxsynth/default.nix new file mode 100644 index 000000000000..70dcad49c978 --- /dev/null +++ b/pkgs/applications/video/avxsynth/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, ffmpeg, autoconf, automake, libtool, pkgconfig, log4cpp +, pango, cairo, python, libjpeg, ffms +, enableQt ? true, qt4}: + +stdenv.mkDerivation rec { + name = "avxsynth-4.0-e153e672bf"; + + src = fetchurl { + url = https://github.com/avxsynth/avxsynth/tarball/e153e672bf; + name = "${name}.tar.gz"; + sha256 = "16l2ld8k1nfsms6jd9d9r4l247xxbncsak66w87icr20yzyhs14s"; + }; + + buildInputs = [ ffmpeg autoconf automake libtool pkgconfig log4cpp pango cairo python + libjpeg ffms ] + ++ stdenv.lib.optional enableQt qt4; + + preConfigure = "autoreconf -vfi"; + + meta = { + homepage = https://github.com/avxsynth/avxsynth/wiki; + license = "GPLv2+"; + maintainers = with stdenv.lib.maintainers; [viric]; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/applications/video/mplayer2/default.nix b/pkgs/applications/video/mplayer2/default.nix index 79c25d65c05c..9e89d5384147 100644 --- a/pkgs/applications/video/mplayer2/default.nix +++ b/pkgs/applications/video/mplayer2/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchgit, freetype, pkgconfig, yasm, freefont_ttf, ffmpeg, libass , python3, docutils, which -, x11Support ? true, libX11 ? null, libXext ? null, mesa ? null +, x11Support ? true, libX11 ? null, libXext ? null, mesa ? null, libXxf86vm ? null , xineramaSupport ? true, libXinerama ? null , xvSupport ? true, libXv ? null , alsaSupport ? true, alsaLib ? null @@ -17,7 +17,7 @@ , useUnfreeCodecs ? false }: -assert x11Support -> (libX11 != null && libXext != null && mesa != null); +assert x11Support -> (libX11 != null && libXext != null && mesa != null && libXxf86vm != null); assert xineramaSupport -> (libXinerama != null && x11Support); assert xvSupport -> (libXv != null && x11Support); assert alsaSupport -> alsaLib != null; @@ -74,11 +74,13 @@ stdenv.mkDerivation rec { prePatch = '' sed -i /^_install_strip/d configure + + sed -i '/stdlib/a#include <ctype.h>/' sub/sub*.c ''; buildInputs = with stdenv.lib; [ freetype pkgconfig ffmpeg libass docutils which ] - ++ optionals x11Support [ libX11 libXext mesa ] + ++ optionals x11Support [ libX11 libXext mesa libXxf86vm ] ++ optional alsaSupport alsaLib ++ optional xvSupport libXv ++ optional theoraSupport libtheora diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index 5529fbeff836..3c96cd134181 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -5,16 +5,16 @@ , libcaca, pulseaudio, flac, schroedinger, libxml2, librsvg , mpeg2dec, udev, gnutls, avahi, libcddb, jackaudio, SDL, SDL_image , libmtp, unzip, taglib, libkate, libtiger, libv4l, samba, liboggz -, libass, libva, libdvbpsi, libdc1394, libraw1394 +, libass, libva, libdvbpsi, libdc1394, libraw1394, libopus }: stdenv.mkDerivation rec { name = "vlc-${version}"; - version = "2.0.5"; + version = "2.0.6"; src = fetchurl { url = "http://download.videolan.org/pub/videolan/vlc/${version}/${name}.tar.xz"; - sha256 = "0vkbv477a7z0v55sigz6c3abxljz7jyysp7z8s29zk8vhq0fpyfz"; + sha256 = "0qqrpry41vawihhggcx00vibbn73hxdal1gim1qnrqrcbq1rik1i"; }; buildInputs = @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { udev gnutls avahi libcddb jackaudio SDL SDL_image libmtp unzip taglib libkate libtiger libv4l samba liboggz libass libdvbpsi libva xlibs.xlibs xlibs.libXv xlibs.libXvMC xlibs.libXpm xlibs.xcbutilkeysyms - libdc1394 libraw1394 + libdc1394 libraw1394 libopus ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index fabe3fed47df..b1165b3535b9 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, python, zlib, pkgconfig, glib, SDL, ncurses, perl, pixman }: stdenv.mkDerivation rec { - name = "qemu-1.3.1"; + name = "qemu-1.4.0"; src = fetchurl { url = "http://wiki.qemu.org/download/${name}.tar.bz2"; - sha256 = "1bqfrb5dlsxm8gxhkksz8qzi5fhj3xqhxyfwbqcphhcv1kpyfwip"; + sha256 = "1a7d11vjs1p6i1ck2ff9annmkhpkbjl73hl9i1cbg3s0fznrfqh6"; }; buildInputs = [ python zlib pkgconfig glib SDL ncurses perl pixman ]; diff --git a/pkgs/applications/virtualization/virtualbox/build_fix_3.9.0.patch b/pkgs/applications/virtualization/virtualbox/build_fix_3.9.0.patch deleted file mode 100644 index 2c3cdebacde8..000000000000 --- a/pkgs/applications/virtualization/virtualbox/build_fix_3.9.0.patch +++ /dev/null @@ -1,22 +0,0 @@ -commit d725168153e3dc5a383b12e0bf9af9b6244ad3eb -Author: vboxsync <vboxsync@cfe28804-0f27-0410-a406-dd0f0b0b656f> -Date: Thu Feb 28 13:46:12 2013 +0000 - - Linux 3.9.0 rc0 compile fix - - git-svn-id: http://www.virtualbox.org/svn/vbox/trunk@44867 cfe28804-0f27-0410-a406-dd0f0b0b656f - -diff --git a/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h b/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h -index ec9b502..7a208d1 100644 ---- a/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h -+++ b/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h -@@ -90,6 +90,9 @@ - #include <linux/slab.h> - #include <linux/time.h> - #include <linux/sched.h> -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 9, 0) -+# include <linux/sched/rt.h> -+#endif - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 7) - # include <linux/jiffies.h> - #endif diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index d385d431fa39..3dd020dfa105 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -11,8 +11,8 @@ with stdenv.lib; let - version = "4.2.8"; - extpackRevision = "83876"; + version = "4.2.12"; + extpackRevision = "84980"; forEachModule = action: '' for mod in \ @@ -35,7 +35,7 @@ let name = "Oracle_VM_VirtualBox_Extension_Pack-${version}-${extpackRevision}" + ".vbox-extpack"; # Has to be base16 because it's used as an input to VBoxExtPackHelperApp! - sha256 = "fa579416f382b58c4e93d3740d076ceba728e28d987e51aced5865a46cb9111c"; + sha256 = "ad15a92e49095c2115bd1793b3b957d3eaf44af0f5d24bb53d6b4fc81c3e2fc4"; url = "https://www.virtualbox.org/wiki/Downloads"; }; @@ -44,7 +44,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2"; - sha256 = "f336af12244db74e6564dc22e438bbcba70f994aaf0d117fdf70caca9fab1b78"; + sha256 = "eb65ecac94f63d6292a967d39cb5e28326404c10d0e8c2c50399eedb59c17ee6"; }; buildInputs = @@ -54,11 +54,6 @@ in stdenv.mkDerivation { ++ optional javaBindings jdk ++ optional pythonBindings python; - patches = [ - ./strict_types.patch - ./build_fix_3.9.0.patch - ]; - prePatch = '' set -x MODULES_BUILD_DIR=`echo ${kernelDev}/lib/modules/*/build` diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index 20ef5c66997b..f3d7c18a2c69 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -2,14 +2,14 @@ , libX11, libXt, libXext, libXmu, libXcomposite, libXfixes, libXrandr, libXcursor , dbus }: -let version = "4.2.8"; in +let version = "4.2.12"; in stdenv.mkDerivation { name = "VirtualBox-GuestAdditions-${version}-${kernelDev.version}"; src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso"; - sha256 = "04a5402d8dcdefc83ffb2785351ddc57758781a3759137974469189392ae4ad5"; + sha256 = "aed4730b643aca8daa0829e1122b7c8d592b9f6cea902a98e390c4d22373dfb8"; }; KERN_DIR = "${kernelDev}/lib/modules/*/build"; diff --git a/pkgs/applications/virtualization/virtualbox/strict_types.patch b/pkgs/applications/virtualization/virtualbox/strict_types.patch deleted file mode 100644 index 18ccc77f9b16..000000000000 --- a/pkgs/applications/virtualization/virtualbox/strict_types.patch +++ /dev/null @@ -1,68 +0,0 @@ -diff --git a/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c b/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c -index 9cc124c..d86da0c 100644 ---- a/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c -+++ b/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c -@@ -253,7 +253,11 @@ static struct platform_device gPlatformDevice = - DECLINLINE(RTUID) vboxdrvLinuxUid(void) - { - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29) -+# ifdef CONFIG_UIDGID_STRICT_TYPE_CHECKS -+ return from_kuid(current_user_ns(), current_uid()); -+# else - return current->cred->uid; -+# endif - #else - return current->uid; - #endif -@@ -262,7 +266,11 @@ DECLINLINE(RTUID) vboxdrvLinuxUid(void) - DECLINLINE(RTGID) vboxdrvLinuxGid(void) - { - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29) -+# ifdef CONFIG_UIDGID_STRICT_TYPE_CHECKS -+ return from_kgid(current_user_ns(), current_gid()); -+# else - return current->cred->gid; -+# endif - #else - return current->gid; - #endif -@@ -271,7 +279,11 @@ DECLINLINE(RTGID) vboxdrvLinuxGid(void) - DECLINLINE(RTUID) vboxdrvLinuxEuid(void) - { - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29) -+# ifdef CONFIG_UIDGID_STRICT_TYPE_CHECKS -+ return from_kuid(current_user_ns(), current_euid()); -+# else - return current->cred->euid; -+# endif - #else - return current->euid; - #endif -diff --git a/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c b/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c -index 575f739..8909e79 100644 ---- a/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c -+++ b/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c -@@ -429,7 +429,11 @@ int vboxPciOsDevDetachHostDriver(PVBOXRAWPCIINS pIns) - if (!pNewCreds) - goto done; - -+# ifdef CONFIG_UIDGID_STRICT_TYPE_CHECKS -+ pNewCreds->fsuid = GLOBAL_ROOT_UID;; -+# else - pNewCreds->fsuid = 0; -+# endif - pOldCreds = override_creds(pNewCreds); - #endif - -@@ -539,7 +543,11 @@ int vboxPciOsDevReattachHostDriver(PVBOXRAWPCIINS pIns) - if (!pNewCreds) - goto done; - -+# ifdef CONFIG_UIDGID_STRICT_TYPE_CHECKS -+ pNewCreds->fsuid = GLOBAL_ROOT_UID;; -+# else - pNewCreds->fsuid = 0; -+# endif - pOldCreds = override_creds(pNewCreds); - #endif - RTStrPrintf(szFileBuf, cMaxBuf, diff --git a/pkgs/applications/window-managers/dwm/confnotify-6.0.patch b/pkgs/applications/window-managers/dwm/confnotify-6.0.patch new file mode 100644 index 000000000000..5b5e2ebb68a7 --- /dev/null +++ b/pkgs/applications/window-managers/dwm/confnotify-6.0.patch @@ -0,0 +1,36 @@ +Fix SDL fullscreen problems when the resolution changes: +https://groups.google.com/d/msg/wmii/nJBrSjrnnq8/ZEYWOWE5pj4J + +diff -r ec4baab78314 dwm.c +--- a/dwm.c Mon Dec 19 15:38:30 2011 +0100 ++++ b/dwm.c Sat Jan 14 12:35:50 2012 +0100 +@@ -397,9 +397,10 @@ + showhide(m->stack); + else for(m = mons; m; m = m->next) + showhide(m->stack); +- if(m) ++ if(m) { + arrangemon(m); +- else for(m = mons; m; m = m->next) ++ restack(m); ++ } else for(m = mons; m; m = m->next) + arrangemon(m); + } + +@@ -408,7 +409,6 @@ + strncpy(m->ltsymbol, m->lt[m->sellt]->symbol, sizeof m->ltsymbol); + if(m->lt[m->sellt]->arrange) + m->lt[m->sellt]->arrange(m); +- restack(m); + } + + void +@@ -1827,6 +1827,8 @@ + .event_mask = ButtonPressMask|ExposureMask + }; + for(m = mons; m; m = m->next) { ++ if (m->barwin) ++ continue; + m->barwin = XCreateWindow(dpy, root, m->wx, m->by, m->ww, bh, 0, DefaultDepth(dpy, screen), + CopyFromParent, DefaultVisual(dpy, screen), + CWOverrideRedirect|CWBackPixmap|CWEventMask, &wa); diff --git a/pkgs/applications/window-managers/dwm/default.nix b/pkgs/applications/window-managers/dwm/default.nix index db4692683507..82eb9e56935f 100644 --- a/pkgs/applications/window-managers/dwm/default.nix +++ b/pkgs/applications/window-managers/dwm/default.nix @@ -1,7 +1,10 @@ {stdenv, fetchurl, libX11, libXinerama, patches ? []}: -stdenv.mkDerivation rec { +let name = "dwm-6.0"; +in +stdenv.mkDerivation { + inherit name; src = fetchurl { url = "http://dl.suckless.org/dwm/${name}.tar.gz"; @@ -13,7 +16,7 @@ stdenv.mkDerivation rec { prePatch = ''sed -i "s@/usr/local@$out@" config.mk''; # Allow users set their own list of patches - inherit patches; + patches = [ ./confnotify-6.0.patch ] ++ patches; buildPhase = " make "; |