ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-27 05:43:50 +03:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/x-updates' into wayland

Browse Source 
Conflicts:
	pkgs/development/libraries/mesa/default.nix
	pkgs/top-level/all-packages.nix
This commit is contained in:
Carles Pagès 2013-03-10 18:19:49 +01:00
commit 6c949148b6
903 changed files with 10029 additions and 9214 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
pkgs/applications/audio/ardour/default.nix
View File

@ -1,44 +1,37 @@
{ stdenv, fetchsvn, scons, boost, pkgconfig, fftw, librdf_raptor
{ stdenv, fetchurl, scons, boost, pkgconfig, fftw, librdf_raptor2
, librdf_rasqal, jackaudio, flac, libsamplerate, alsaLib, libxml2
, lilv, lv2, serd, sord, sratom, suil # these are probably optional
, libxslt, libsndfile, libsigcxx, libusb, cairomm, glib, pango
, gtk, glibmm, gtkmm, libgnomecanvas, liblo, aubio
, fftwSinglePrec, libmad, automake, autoconf, libtool, liblrdf }:
, gtk, glibmm, gtkmm, libgnomecanvas, libgnomecanvasmm, liblo, aubio
, fftwSinglePrec, libmad, automake, autoconf, libtool, liblrdf, curl }:
stdenv.mkDerivation rec {
name = "ardour-${version}";
version = "2.8.12";
version = "2.8.16";
# svn is the source to get official releases from their site?
# alternative: wget --data-urlencode 'key=7c4b2e1df903aae5ff5cc4077cda801e' http://ardour.org/downloader
# but hash is changing ?
# TODO: see if this is also true when using a tag (~goibhniu)
# This version does not run it exits with the following error:
# raptor_new_uri_for_rdf_concept called with Raptor V1 world object
# raptor_general.c:240:raptor_init: fatal error: raptor_init() failedAborted
src = fetchsvn {
url = "http://subversion.ardour.org/svn/ardour2/tags/${version}";
sha256 = "0d4y8bv12kb0yd2srvxn5388sa4cl5d5rk381saj9f3jgpiciyky";
src = fetchurl {
url = "mirror://gentoo/distfiles/${name}.tar.bz2";
sha256 = "0h2y0x4yznalllja53anjil2gmgcb26f39zshc4gl1d1kc8k5vip";
};
patchPhase = ''
sed -e "s#/usr/bin/which#type -P#" -i libs/glibmm2/autogen.sh
postPatch = ''
#sed -e "s#/usr/bin/which#type -P#" -i libs/glibmm2/autogen.sh
echo '#include "ardour/svn_revision.h"' > libs/ardour/svn_revision.cc
echo -e 'namespace ARDOUR {\n extern const char* svn_revision = "2.8.12";\n }\n' >> libs/ardour/svn_revision.cc
'';
buildInputs = [
scons boost pkgconfig fftw librdf_raptor librdf_rasqal jackaudio
scons boost pkgconfig fftw librdf_raptor2 librdf_rasqal jackaudio
flac libsamplerate alsaLib libxml2 libxslt libsndfile libsigcxx
libusb cairomm glib pango gtk glibmm gtkmm libgnomecanvas liblrdf
liblo aubio fftwSinglePrec libmad autoconf automake libtool
#lilv lv2 serd sord sratom suil
libusb cairomm glib pango gtk glibmm gtkmm libgnomecanvas libgnomecanvasmm liblrdf
liblo aubio fftwSinglePrec libmad autoconf automake libtool curl
];
buildPhase = ''
mkdir -p $out
export CXX=g++
scons PREFIX=$out install
scons PREFIX=$out SYSLIBS=1 install
'';
installPhase = ":";

2
pkgs/applications/audio/audacious/default.nix
View File

@ -41,7 +41,7 @@ stdenv.mkDerivation {
# Then build the plugins.
(
buildNativeInputs="$out $buildNativeInputs" # to find audacious
nativeBuildInputs="$out $nativeBuildInputs" # to find audacious
source $stdenv/setup
rm -rfv audacious-*
src=$pluginsSrc

29
pkgs/applications/audio/caps/default.nix Normal file
View File

@ -0,0 +1,29 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "caps-${version}";
version = "0.9.7";
src = fetchurl {
url = "http://www.quitte.de/dsp/caps_${version}.tar.bz2";
sha256 = "0ks98r3j404s9h88x50lj5lj4l64ijj29fz5i08iyq8jrb7r0zm0";
};
configurePhase = ''
echo "PREFIX = $out" > defines.make
'';
meta = {
description = "A selection of LADSPA plugins implementing classic effects";
longDescription = ''
The C* Audio Plugin Suite is a selection of classic effects,
unique filters and signal generators.  The digital guitarist
finds in CAPS a range of processors recreating key aspects of
the formation of tone in traditional electronic instrument
amplification.  Beyond sound quality, central design
considerations are latency-free realtime operation, modesty of
resource demands and meaningful control interfaces.
'';
homepage = http://www.quitte.de/dsp/caps.html;
license = stdenv.lib.licenses.gpl3;
maintainers = [ stdenv.lib.maintainers.astsmtl ];
platforms = stdenv.lib.platforms.linux;
};
}

21
pkgs/applications/audio/drumkv1/default.nix Normal file
View File

@ -0,0 +1,21 @@
{ stdenv, fetchurl, jackaudio, libsndfile, lv2, qt4 }:
stdenv.mkDerivation rec {
name = "drumkv1-${version}";
version = "0.3.2";
src = fetchurl {
url = "mirror://sourceforge/drumkv1/${name}.tar.gz";
sha256 = "0bafg06iavri9dmg7hpz554kpqf1iv9crcdq46y4n4wyyxd7kajl";
};
buildInputs = [ jackaudio libsndfile lv2 qt4 ];
meta = with stdenv.lib; {
description = "An old-school drum-kit sampler synthesizer with stereo fx";
homepage = http://drumkv1.sourceforge.net/;
license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = [ maintainers.goibhniu ];
};
}

2
pkgs/applications/audio/id3v2/default.nix
View File

@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
patches = [ ./id3v2-0.1.11-track-bad-free.patch ];
buildNativeInputs = [ groff ];
nativeBuildInputs = [ groff ];
buildInputs = [ id3lib ];
configurePhase = ''

26
pkgs/applications/audio/jack-oscrolloscope/default.nix Normal file
View File

@ -0,0 +1,26 @@
{ stdenv, fetchurl, SDL, jackaudio, mesa, pkgconfig }:
stdenv.mkDerivation rec {
name = "jack_oscrolloscope-${version}";
version = "0.7";
src = fetchurl {
url = "http://das.nasophon.de/download/${name}.tar.gz";
sha256 = "1pl55in0sj7h5r06n1v91im7d18pplvhbjhjm1fdl39zwnyxiash";
};
buildInputs = [ SDL jackaudio mesa pkgconfig ];
installPhase = ''
mkdir -p $out/bin
mv jack_oscrolloscope $out/bin/
'';
meta = with stdenv.lib; {
description = "A simple waveform viewer for JACK";
homepage = http://das.nasophon.de/jack_oscrolloscope;
license = licenses.gpl2;
maintainers = [ maintainers.goibhniu ];
platforms = stdenv.lib.platforms.linux;
};
}

3
pkgs/applications/audio/lash/default.nix
View File

@ -12,7 +12,8 @@ stdenv.mkDerivation rec {
sha256 = "05kc4brcx8mncai0rj2gz4s4bsrsy9q8xlnaddf75i0m8jl7snhh";
};
patches = [ ./socket.patch ];
# http://permalink.gmane.org/gmane.linux.redhat.fedora.extras.cvs/822346
patches = [ ./socket.patch ./gcc-47.patch ];
buildInputs = [ alsaLib gtk jackaudio libuuid libxml2 makeWrapper
pkgconfig readline ];

11
pkgs/applications/audio/lash/gcc-47.patch Normal file
View File

@ -0,0 +1,11 @@
diff -rupN liblash/lash.c lash-0.5.4/liblash/lash.c
--- a/liblash/lash.c 2007-03-09 10:34:40.000000000 -0500
+++ b/liblash/lash.c 2012-07-22 18:17:46.003963521 -0400
@@ -22,6 +22,7 @@
#include <string.h>
#include <strings.h>
#include <pthread.h>
+#include <sys/resource.h>
#include <sys/types.h>
#include <sys/wait.h>
#include <sys/socket.h>

2
pkgs/applications/audio/mopidy/default.nix
View File

@ -14,7 +14,7 @@ pythonPackages.buildPythonPackage rec {
};
propagatedBuildInputs = with pythonPackages; [
gst_python pygobject pykka pyspotify pylast
gst_python pygobject pykka pyspotify pylast cherrypy ws4py
];
# python zip complains about old timestamps

2
pkgs/applications/audio/mopidy/git.nix
View File

@ -14,7 +14,7 @@ pythonPackages.buildPythonPackage rec {
};
propagatedBuildInputs = with pythonPackages; [
gst_python pygobject pykka pyspotify pylast
gst_python pygobject pykka pyspotify pylast cherrypy ws4py
];
# python zip complains about old timestamps

21
pkgs/applications/audio/samplv1/default.nix Normal file
View File

@ -0,0 +1,21 @@
{ stdenv, fetchurl, jackaudio, libsndfile, lv2, qt4 }:
stdenv.mkDerivation rec {
name = "samplv1-${version}";
version = "0.3.2";
src = fetchurl {
url = "mirror://sourceforge/samplv1/${name}.tar.gz";
sha256 = "1j6q3ywbdsyhskc60p7k8ph058ylrrmjmri3q1wr2d2akcaqvb7m";
};
buildInputs = [ jackaudio libsndfile lv2 qt4 ];
meta = with stdenv.lib; {
description = "An old-school all-digital polyphonic sampler synthesizer with stereo fx";
homepage = http://samplv1.sourceforge.net/;
license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = [ maintainers.goibhniu ];
};
}

21
pkgs/applications/audio/synthv1/default.nix Normal file
View File

@ -0,0 +1,21 @@
{ stdenv, fetchurl, qt4, jackaudio, lv2 }:
stdenv.mkDerivation rec {
name = "synthv1-${version}";
version = "0.3.2";
src = fetchurl {
url = "mirror://sourceforge/synthv1/${name}.tar.gz";
sha256 = "1230yf49qfw540yvp5n7sh6mf3k8590pzwc5mragd3nd6k6apgw9";
};
buildInputs = [ qt4 jackaudio lv2 ];
meta = with stdenv.lib; {
description = "An old-school 4-oscillator subtractive polyphonic synthesizer with stereo fx";
homepage = http://synthv1.sourceforge.net/;
license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = [ maintainers.goibhniu ];
};
}

2
pkgs/applications/audio/yoshimi/default.nix
View File

@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
buildInputs = [ alsaLib boost fftwSinglePrec fltk jackaudio libsndfile mesa
minixml zlib ];
buildNativeInputs = [ cmake pkgconfig ];
nativeBuildInputs = [ cmake pkgconfig ];
preConfigure = "cd src";

2
pkgs/applications/audio/zynaddsubfx/default.nix
View File

@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [ alsaLib fftw fltk13 minixml zlib ];
buildNativeInputs = [ cmake pkgconfig ];
nativeBuildInputs = [ cmake pkgconfig ];
patches = [
(fetchurl {

4
pkgs/applications/editors/ed/default.nix
View File

@ -1,11 +1,11 @@
{ fetchurl, stdenv }:
stdenv.mkDerivation rec {
name = "ed-1.5";
name = "ed-1.7";
src = fetchurl {
url = "mirror://gnu/ed/${name}.tar.gz";
sha256 = "18gvhyhwpabmgv4lh21lg8vl3z7acdyhh2mr2kj9g75wksj39pcp";
sha256 = "0c908wb5pm48rjrrfbm5dhrqzys8f1dbvi90dn0vgwjzk80l2hl9";
};
/* FIXME: Tests currently fail on Darwin:

27
pkgs/applications/editors/emacs-22/builder.sh
View File

@ -1,27 +0,0 @@
source $stdenv/setup
preConfigure() {
libc=$(cat ${NIX_GCC}/nix-support/orig-libc)
echo "libc: $libc"
case "${system}" in
x86_64-*) glibclibdir=lib64 ;;
*) glibclibdir=lib ;;
esac
for i in src/s/*.h src/m/*.h; do
substituteInPlace $i \
--replace /usr/${glibclibdir}/crt1.o $libc/${glibclibdir}/crt1.o \
--replace /usr/${glibclibdir}/crti.o $libc/${glibclibdir}/crti.o \
--replace /usr/${glibclibdir}/crtn.o $libc/${glibclibdir}/crtn.o \
--replace /usr/lib/crt1.o $libc/${glibclibdir}/crt1.o \
--replace /usr/lib/crti.o $libc/${glibclibdir}/crti.o \
--replace /usr/lib/crtn.o $libc/${glibclibdir}/crtn.o
done
for i in Makefile.in ./src/Makefile.in ./lib-src/Makefile.in ./leim/Makefile.in; do
substituteInPlace $i --replace /bin/pwd pwd
done
}
genericBuild

58
pkgs/applications/editors/emacs-22/default.nix
View File

@ -1,58 +0,0 @@
{ xawSupport ? true
, xpmSupport ? true
, xaw3dSupport ? false
, gtkGUI ? false
, stdenv, fetchurl, x11, libXaw ? null, libXpm ? null, Xaw3d ? null
, pkgconfig ? null, gtk ? null
, ncurses
}:
assert xawSupport && !xaw3dSupport -> libXaw != null;
assert xawSupport && xaw3dSupport -> Xaw3d != null;
assert xpmSupport -> libXpm != null;
assert gtkGUI -> pkgconfig != null && gtk != null;
stdenv.mkDerivation rec {
name = "emacs-22.3";
builder = ./builder.sh;
src = fetchurl {
url = "mirror://gnu/emacs/${name}.tar.gz";
sha256 = "05hd89bchcpwzcx5la0alcp0wb7xywvnf98dxrshrqlfvccvgnbv";
};
buildInputs = [ncurses x11]
++ stdenv.lib.optional xawSupport (if xaw3dSupport then Xaw3d else libXaw)
++ stdenv.lib.optional xpmSupport libXpm
++ stdenv.lib.optionals gtkGUI [pkgconfig gtk];
configureFlags =
stdenv.lib.optional gtkGUI "--with-x-toolkit=gtk";
postInstall = ''
cat >$out/share/emacs/site-lisp/site-start.el <<EOF
;; nixos specific load-path
(when (getenv "NIX_PROFILES") (setq load-path
(append (reverse (mapcar (lambda (x) (concat x "/share/emacs/site-lisp/"))
(split-string (getenv "NIX_PROFILES"))))
load-path)))
EOF
'';
meta = {
description = "GNU Emacs, *the* text editor";
longDescription = ''
GNU Emacs is an extensible, customizable text editor—and more.
At its core is an interpreter for Emacs Lisp, a dialect of the
Lisp programming language with extensions to support text
editing.
'';
homepage = http://www.gnu.org/software/emacs/;
license = "GPLv3+";
platforms = stdenv.lib.platforms.all;
};
}

2
pkgs/applications/editors/emacs-modes/org/default.nix
View File

@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [ emacs ];
buildNativeInputs = [ texinfo texLive ];
nativeBuildInputs = [ texinfo texLive ];
configurePhase =
'' sed -i mk/default.mk \

2
pkgs/applications/editors/kdevelop/default.nix
View File

@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
buildInputs = [ kdevplatform kdebase_workspace okteta ];
buildNativeInputs = [ cmake pkgconfig automoc4 shared_mime_info gettext perl ];
nativeBuildInputs = [ cmake pkgconfig automoc4 shared_mime_info gettext perl ];
patches =
[ ( fetchurl {

2
pkgs/applications/editors/kile/default.nix
View File

@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "0nx5fmjrxrndnzvknxnybd8qh15jzfxzbny2rljq3amjw02y9lc2";
};
buildNativeInputs = [ cmake gettext ];
nativeBuildInputs = [ cmake gettext ];
buildInputs = [ kdelibs ];
# for KDE 4.7 the nl translations fail since kile-2.1.2

18
pkgs/applications/editors/vim/configurable.nix
View File

@ -13,7 +13,7 @@ composableDerivation {} {
configureFlags = ["--enable-gui=auto" "--with-features=${args.features}"];
buildNativeInputs = [ncurses pkgconfig]
nativeBuildInputs = [ncurses pkgconfig]
++ [ gtk libX11 libXext libSM libXpm libXt libXaw libXau libXmu glib
libICE ];
@ -27,11 +27,11 @@ composableDerivation {} {
// edf { name = "xsmp"; } #Disable XSMP session management
// edf { name = "xsmp_interact"; } #Disable XSMP interaction
// edf { name = "mzscheme"; } #Include MzScheme interpreter.
// edf { name = "perl"; feat = "perlinterp"; enable = { buildNativeInputs = [perl]; };} #Include Perl interpreter.
// edf { name = "python"; feat = "pythoninterp"; enable = { buildNativeInputs = [python]; }; } #Include Python interpreter.
// edf { name = "tcl"; enable = { buildNativeInputs = [tcl]; }; } #Include Tcl interpreter.
// edf { name = "ruby"; feat = "rubyinterp"; enable = { buildNativeInputs = [ruby]; };} #Include Ruby interpreter.
// edf { name = "lua" ; feat = "luainterp"; enable = { buildNativeInputs = [lua]; configureFlags = ["--with-lua-prefix=${args.lua}"];};}
// edf { name = "perl"; feat = "perlinterp"; enable = { nativeBuildInputs = [perl]; };} #Include Perl interpreter.
// edf { name = "python"; feat = "pythoninterp"; enable = { nativeBuildInputs = [python]; }; } #Include Python interpreter.
// edf { name = "tcl"; enable = { nativeBuildInputs = [tcl]; }; } #Include Tcl interpreter.
// edf { name = "ruby"; feat = "rubyinterp"; enable = { nativeBuildInputs = [ruby]; };} #Include Ruby interpreter.
// edf { name = "lua" ; feat = "luainterp"; enable = { nativeBuildInputs = [lua]; configureFlags = ["--with-lua-prefix=${args.lua}"];};}
// edf { name = "cscope"; } #Include cscope interface.
// edf { name = "workshop"; } #Include Sun Visual Workshop support.
// edf { name = "netbeans"; } #Disable NetBeans integration support.
@ -42,7 +42,7 @@ composableDerivation {} {
// edf { name = "fontset"; } #Include X fontset output support.
// edf { name = "acl"; } #Don't check for ACL support.
// edf { name = "gpm"; } #Don't use gpm (Linux mouse daemon).
// edf { name = "nls"; enable = {buildNativeInputs = [gettext];}; } #Don't support NLS (gettext()).
// edf { name = "nls"; enable = {nativeBuildInputs = [gettext];}; } #Don't support NLS (gettext()).
;
cfg = {
@ -70,11 +70,11 @@ composableDerivation {} {
postInstall = "
rpath=`patchelf --print-rpath \$out/bin/vim`;
for i in $\buildNativeInputs; do
for i in \$nativeBuildInputs; do
echo adding \$i/lib
rpath=\$rpath:\$i/lib
done
echo \$buildNativeInputs
echo \$nativeBuildInputs
echo \$rpath
patchelf --set-rpath \$rpath \$out/bin/{vim,gvim}
";

2
pkgs/applications/editors/vim/default.nix
View File

@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [ ncurses pkgconfig ];
buildNativeInputs = [ gettext ];
nativeBuildInputs = [ gettext ];
configureFlags = [
"--enable-multibyte"

4
pkgs/applications/editors/zile/default.nix
View File

@ -9,10 +9,10 @@ stdenv.mkDerivation rec {
};
buildInputs = [ ncurses boehmgc ];
buildNativeInputs = [ help2man perl ];
nativeBuildInputs = [ help2man perl ];
# `help2man' wants to run Zile, which fails when cross-compiling.
crossAttrs.buildNativeInputs = [];
crossAttrs.nativeBuildInputs = [];
# Tests can't be run because most of them rely on the ability to
# fiddle with the terminal.

2
pkgs/applications/graphics/cinepaint/default.nix
View File

@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
patches = [ ./install.patch ];
buildNativeInputs = [ cmake pkgconfig ];
nativeBuildInputs = [ cmake pkgconfig ];
NIX_LDFLAGS = "-llcms -ljpeg";

2
pkgs/applications/graphics/dia/default.nix
View File

@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
libxslt docbook_xsl libart_lgpl
] ++ stdenv.lib.optional withGNOME libgnomeui;
buildNativeInputs = [ pkgconfig intltool perl ];
nativeBuildInputs = [ pkgconfig intltool perl ];
configureFlags = stdenv.lib.optionalString withGNOME "--enable-gnome";

2
pkgs/applications/graphics/digikam/default.nix
View File

@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "1prnaywnbv0xpw6knqagzc4gn1vsj9kw2hvdasjwknc9ljiyl721";
};
buildNativeInputs = [ cmake automoc4 pkgconfig ];
nativeBuildInputs = [ cmake automoc4 pkgconfig ];
buildInputs = [ qt4 kdelibs phonon qimageblitz qca2 eigen lcms libjpeg libtiff
jasper libgphoto2 kdepimlibs gettext soprano liblqr1 lensfun qjson libkdcraw

2
pkgs/applications/graphics/djview/default.nix
View File

@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
buildInputs = [djvulibre qt4];
buildNativeInputs = [ pkgconfig ];
nativeBuildInputs = [ pkgconfig ];
patches = [ ./djview4-qt-4.8.patch ];

2
pkgs/applications/graphics/fbida/default.nix
View File

@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "1riia87v5nsx858xnlvc7sspr1p36adjqrdch1255ikr5xbv6h6x";
};
buildNativeInputs = [ pkgconfig which ];
nativeBuildInputs = [ pkgconfig which ];
buildInputs =
[ libexif libjpeg libpng libungif freetype fontconfig libtiff libwebp
imagemagick curl saneBackends

18
pkgs/applications/graphics/gimp/plugins/default.nix
View File

@ -36,7 +36,7 @@ let
libLQR = pluginDerivation {
name = "liblqr-1-0.4.1";
# required by lqrPlugin, you don't havet to install this lib explicitely
buildInputs = [ gimp ] ++ gimp.buildNativeInputs;
buildInputs = [ gimp ] ++ gimp.nativeBuildInputs;
src = fetchurl {
url = http://registry.gimp.org/files/liblqr-1-0.4.1.tar.bz2;
sha256 = "02g90wag7xi5rjlmwq8h0qs666b1i2sa90s4303hmym40il33nlz";
@ -50,7 +50,7 @@ rec {
Video
*/
name = "gap-2.6.0";
buildInputs = [ gimp pkgconfig glib pkgs.intltool gimp.gtk ] ++ gimp.buildNativeInputs;
buildInputs = [ gimp pkgconfig glib pkgs.intltool gimp.gtk ] ++ gimp.nativeBuildInputs;
src = fetchurl {
url = ftp://ftp.gimp.org/pub/gimp/plug-ins/v2.6/gap/gimp-gap-2.6.0.tar.bz2;
sha256 = "1jic7ixcmsn4kx2cn32nc5087rk6g8xsrz022xy11yfmgvhzb0ql";
@ -74,7 +74,7 @@ rec {
Filters/Generic/FFT Inverse
*/
name = "fourier-0.3.3";
buildInputs = [ gimp pkgs.fftwSinglePrec pkgconfig glib] ++ gimp.buildNativeInputs;
buildInputs = [ gimp pkgs.fftwSinglePrec pkgconfig glib] ++ gimp.nativeBuildInputs;
postInstall = "fail";
installPhase = "installPlugins fourier";
src = fetchurl {
@ -91,7 +91,7 @@ rec {
Filters/Enhance/Smart remove selection
*/
name = "resynthesizer-0.16";
buildInputs = [ gimp pkgs.fftw ] ++ gimp.buildNativeInputs;
buildInputs = [ gimp pkgs.fftw ] ++ gimp.nativeBuildInputs;
src = fetchurl {
url = http://www.logarithmic.net/pfh-files/resynthesizer/resynthesizer-0.16.tar.gz;
sha256 = "1k90a1jzswxmajn56rdxa4r60v9v34fmqsiwfdxqcvx3yf4yq96x";
@ -105,7 +105,7 @@ rec {
texturize = pluginDerivation {
name = "texturize-2.1";
buildInputs = [ gimp ] ++ gimp.buildNativeInputs;
buildInputs = [ gimp ] ++ gimp.nativeBuildInputs;
src = fetchurl {
url = http://prdownloads.sourceforge.net/gimp-texturize/texturize-2.1_src.tgz;
sha256 = "0cdjq25g3yfxx6bzx6nid21kq659s1vl9id4wxyjs2dhcv229cg3";
@ -118,7 +118,7 @@ rec {
Filters/Enhance/Wavelet sharpen
*/
name = "wavelet-sharpen-0.1.2";
buildInputs = [ gimp ] ++ gimp.buildNativeInputs;
buildInputs = [ gimp ] ++ gimp.nativeBuildInputs;
src = fetchurl {
url = http://registry.gimp.org/files/wavelet-sharpen-0.1.2.tar.gz;
sha256 = "0vql1k67i21g5ivaa1jh56rg427m0icrkpryrhg75nscpirfxxqw";
@ -131,7 +131,7 @@ rec {
Layer/Liquid Rescale
*/
name = "lqr-plugin-0.6.1";
buildInputs = [ pkgconfig libLQR gimp ] ++ gimp.buildNativeInputs;
buildInputs = [ pkgconfig libLQR gimp ] ++ gimp.nativeBuildInputs;
src = fetchurl {
url = http://registry.gimp.org/files/gimp-lqr-plugin-0.6.1.tar.bz2;
sha256 = "00hklkpcimcbpjly4rjhfipaw096cpy768g9wixglwrsyqhil7l9";
@ -146,7 +146,7 @@ rec {
let imagemagick = pkgs.imagemagickBig; # maybe the non big version is enough?
in pluginDerivation {
name = "gmic-1.3.2.0";
buildInputs = [ imagemagick pkgconfig gimp pkgs.fftwSinglePrec ] ++ gimp.buildNativeInputs;
buildInputs = [ imagemagick pkgconfig gimp pkgs.fftwSinglePrec ] ++ gimp.nativeBuildInputs;
src = fetchurl {
url = http://dfn.dl.sourceforge.net/sourceforge/gmic/gmic_1.3.2.0.tar.gz;
sha256 = "0mxq664vzzc2l6k6sqm9syp34mihhi262i6fixk1g12lmc28797h";
@ -172,7 +172,7 @@ rec {
# or use the binary
ufraw = pluginDerivation {
name = "ufraw-0.15";
buildInputs = [pkgs.lcms gimp] ++ gimp.buildNativeInputs;
buildInputs = [pkgs.lcms gimp] ++ gimp.nativeBuildInputs;
# --enable-mime - install mime files, see README for more information
# --enable-extras - build extra (dcraw, nikon-curve) executables
# --enable-dst-correction - enable DST correction for file timestamps.

2
pkgs/applications/graphics/graphicsmagick/default.nix
View File

@ -19,7 +19,7 @@ stdenv.mkDerivation {
zlib libtool
];
buildNativeInputs = [ xz ];
nativeBuildInputs = [ xz ];
postInstall = ''
sed -i 's/-ltiff.*'\'/\'/ $out/bin/*

2
pkgs/applications/graphics/hugin/default.nix
View File

@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
buildInputs = [ panotools wxGTK libtiff libpng openexr boost tclap
exiv2 gettext ilmbase mesa freeglut glew libXmu libXi ];
buildNativeInputs = [ cmake pkgconfig ];
nativeBuildInputs = [ cmake pkgconfig ];
propagatedUserEnvPackages = [ enblendenfuse autopanosiftc ];

2
pkgs/applications/graphics/kipi-plugins/default.nix
View File

@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
libksane libxslt gettext opencv libgpod gdk_pixbuf qjson
];
buildNativeInputs = [ pkgconfig cmake automoc4 ];
nativeBuildInputs = [ pkgconfig cmake automoc4 ];
meta = {
description = "Photo Management Program";

2
pkgs/applications/graphics/kuickshow/default.nix
View File

@ -10,5 +10,5 @@ stdenv.mkDerivation rec {
buildInputs = [ kdelibs imlib ];
buildNativeInputs = [ cmake gettext pkgconfig ];
nativeBuildInputs = [ cmake gettext pkgconfig ];
}

35
pkgs/applications/graphics/mypaint/default.nix Normal file
View File

@ -0,0 +1,35 @@
{ stdenv, fetchurl, gettext, glib, gtk, json_c, lcms2, libpng
, makeWrapper, pkgconfig, pygtk, python, pythonPackages, scons, swig
}:
stdenv.mkDerivation rec {
name = "mypaint-${version}";
version = "1.1.0";
src = fetchurl {
url = "http://download.gna.org/mypaint/${name}.tar.bz2";
sha256 = "0f7848hr65h909c0jkcx616flc0r4qh53g3kd1cgs2nr1pjmf3bq";
};
buildInputs = [
gettext glib gtk json_c lcms2 libpng makeWrapper pkgconfig pygtk
python scons swig
];
propagatedBuildInputs = [ pythonPackages.numpy ];
buildPhase = "scons prefix=$out";
installPhase = ''
scons prefix=$out install
wrapProgram $out/bin/mypaint --prefix PYTHONPATH : $PYTHONPATH
'';
meta = with stdenv.lib; {
description = "A graphics application for digital painters";
homepage = http://mypaint.intilinux.com;
license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = [ maintainers.goibhniu ];
};
}

3
pkgs/applications/graphics/panotools/default.nix
View File

@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
buildInputs = [ perl libjpeg libpng libtiff ];
doCheck = true;
# one of the tests succeeds on my machine but fails on Hydra (no idea why)
#doCheck = true;
meta = {
homepage = http://panotools.sourceforge.net/;

2
pkgs/applications/graphics/sane/frontends.nix
View File

@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
'';
buildInputs = [saneBackends libX11 gtk pkgconfig] ++
(if (libusb != null) then [libusb] else []);
(if libusb != null then [libusb] else []);
meta = {
homepage = "http://www.sane-project.org/";

2
pkgs/applications/graphics/sane/xsane.nix
View File

@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
'';
buildInputs = [libpng saneBackends saneFrontends libX11 gtk pkgconfig ] ++
(if (libusb != null) then [libusb] else []);
(if libusb != null then [libusb] else []);
meta = {
homepage = http://www.sane-project.org/;

2
pkgs/applications/graphics/xara/default.nix
View File

@ -9,7 +9,7 @@ stdenv.mkDerivation {
sha256 = "05xbzq1i1vw2mdsv7zjqfpxfv3g1j0g5kks0gq6sh373xd6y8lyh";
};
buildNativeInputs = [ automake pkgconfig gettext perl zip ];
nativeBuildInputs = [ automake pkgconfig gettext perl zip ];
buildInputs = [ wxGTK gtk libxml2 freetype pango ];
configureFlags = "--disable-svnversion";

2
pkgs/applications/graphics/xfig/default.nix
View File

@ -14,7 +14,7 @@ stdenv.mkDerivation {
buildInputs = [x11 libXpm libXmu libXi libXp Xaw3d libpng libjpeg];
buildNativeInputs = [ imake makeWrapper ];
nativeBuildInputs = [ imake makeWrapper ];
NIX_CFLAGS_COMPILE = "-I${libXpm}/include/X11";

2
pkgs/applications/graphics/xournal/default.nix
View File

@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
pango libX11 xproto zlib poppler poppler_data
];
buildNativeInputs = [ autoconf automake libtool pkgconfig ];
nativeBuildInputs = [ autoconf automake libtool pkgconfig ];
# Build with poppler-0.18.x
patchFlags = "-p0";

2
pkgs/applications/misc/calibre/default.nix
View File

@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
inherit python;
buildNativeInputs = [ makeWrapper pkgconfig ];
nativeBuildInputs = [ makeWrapper pkgconfig ];
buildInputs =
[ python pyqt4 sip popplerQt4 libpng imagemagick libjpeg

59
pkgs/applications/misc/evince/default.nix
View File

@ -1,59 +0,0 @@
{ fetchurl, stdenv, perl, perlXMLParser, gettext, intltool
, pkgconfig, glib, gtk, gnomedocutils, gnomeicontheme
, libgnome, libgnomeui, scrollkeeper, libxslt
, libglade, libgnome_keyring, dbus, dbus_glib
, poppler, libspectre, djvulibre, shared_mime_info
, makeWrapper, which, ghostscript
, recentListSize ? null # 5 is not enough, allow passing a different number
}:
stdenv.mkDerivation rec {
name = "evince-2.32.0";
src = fetchurl {
url = "http://ftp.gnome.org/pub/GNOME/sources/evince/2.32/${name}.tar.bz2";
sha256 = "2a4c91ae38f8b5028cebb91b9da9ddc50ea8ae3f3d429df89ba351da2d787ff7";
};
buildInputs = [
perl perlXMLParser gettext intltool pkgconfig glib gtk
gnomedocutils gnomeicontheme libgnome libgnomeui libglade
scrollkeeper libgnome_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";
postUnpack = if recentListSize != null then ''
sed -i 's/\(gtk_recent_chooser_set_limit .*\)5)/\1${builtins.toString recentListSize})/' */shell/ev-open-recent-action.c
sed -i 's/\(if (++n_items == \)5\(.*\)/\1${builtins.toString recentListSize}\2/' */shell/ev-window.c
'' else "";
postInstall = ''
# Tell Glib/GIO about the MIME info directory, which is used
# by `g_file_info_get_content_type ()'.
wrapProgram "$out/bin/evince" \
--prefix XDG_DATA_DIRS : "${shared_mime_info}/share:$out/share"
'';
meta = {
homepage = http://www.gnome.org/projects/evince/;
description = "Evince, GNOME's document viewer";
longDescription = ''
Evince is a document viewer for multiple document formats. It
currently supports PDF, PostScript, DjVu, TIFF and DVI. The goal
of Evince is to replace the multiple document viewers that exist
on the GNOME Desktop with a single simple application.
'';
license = "GPLv2+";
};
}

4
pkgs/applications/misc/googleearth/default.nix
View File

@ -13,7 +13,7 @@ stdenv.mkDerivation {
sha256 = "0bcpmnlk03382x577qbnbw3i6y08hr3qmg85pqj35scnl6van74c";
};
buildNativeInputs = [
nativeBuildInputs = [
glibc
glib
stdenv.gcc.gcc
@ -55,7 +55,7 @@ stdenv.mkDerivation {
chmod +x $out/bin/googleearth
fullPath=
for i in $buildNativeInputs; do
for i in $nativeBuildInputs; do
fullPath=$fullPath:$i/lib
done

2
pkgs/applications/misc/gphoto2/default.nix
View File

@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "08x1p8xhl65r79a6gn1fi63z1lspd5j55l05diiyzcwfxvqwsm47";
};
buildNativeInputs = [ pkgconfig gettext ];
nativeBuildInputs = [ pkgconfig gettext ];
buildInputs = [ libgphoto2 libexif popt libjpeg readline libtool ];
meta = {

2
pkgs/applications/misc/kde-wacomtablet/default.nix
View File

@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
buildInputs = [ kdelibs ];
buildNativeInputs = [ gettext ];
nativeBuildInputs = [ gettext ];
meta = with stdenv.lib; {
description = "KDE Wacom graphic tablet configuration tool";

19
pkgs/applications/misc/mysql-workbench/default.nix
View File

@ -1,30 +1,35 @@
{ stdenv, fetchurl, makeWrapper, boost, file, gettext
{ stdenv, fetchurl, makeWrapper, autoconf, automake, boost, file, gettext
, glib, glibc, libgnome_keyring, gnome_keyring, gtk, gtkmm, intltool
, libctemplate, libglade
, libiodbc
, libgnome, libsigcxx, libtool, libuuid, libxml2, libzip, lua, mesa, mysql
, pango, paramiko, pcre, pexpect, pkgconfig, pycrypto, python, sqlite
}:
stdenv.mkDerivation rec {
pname = "mysql-workbench";
version = "5.2.39";
version = "5.2.47";
name = "${pname}-${version}";
src = fetchurl {
url = "http://mirror.services.wisc.edu/mysql/Downloads/MySQLGUITools/mysql-workbench-gpl-${version}-src.tar.gz";
sha256 = "0e4e14f1b39dca2b65f924381d82b406dc25a530fbd25631b4cd05bddc4ab5bd";
url = "http://mirror.cogentco.com/pub/mysql/MySQLGUITools/mysql-workbench-gpl-${version}-src.tar.gz";
sha256 = "1343fn3msdxqfpxw0kgm0mdx5r7g9ra1cpc8p2xhl7kz2pmqp4p6";
};
buildInputs = [ boost file gettext glib glibc libgnome_keyring gtk gtkmm intltool
libctemplate libglade libgnome libsigcxx libtool libuuid libxml2 libzip lua makeWrapper mesa
buildInputs = [ autoconf automake boost file gettext glib glibc libgnome_keyring gtk gtkmm intltool
libctemplate libglade libgnome libiodbc libsigcxx libtool libuuid libxml2 libzip lua makeWrapper mesa
mysql paramiko pcre pexpect pkgconfig pycrypto python sqlite ];
preConfigure = ''
substituteInPlace $(pwd)/frontend/linux/workbench/mysql-workbench.in --replace "catchsegv" "${glibc}/bin/catchsegv"
'';
postConfigure = ''
autoreconf -fi
'';
postInstall = ''
wrapProgram "$out/bin/mysql-workbench-bin" \
wrapProgram "$out/bin/mysql-workbench" \
--prefix LD_LIBRARY_PATH : "${python}/lib" \
--prefix LD_LIBRARY_PATH : "$(cat ${stdenv.gcc}/nix-support/orig-gcc)/lib64" \
--prefix PATH : "${gnome_keyring}/bin" \

2
pkgs/applications/misc/nut/default.nix
View File

@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
buildInputs = [ neon libusb openssl udev avahi freeipmi ];
buildNativeInputs = [ pkgconfig ];
nativeBuildInputs = [ pkgconfig ];
configureFlags =
[ "--with-all"

2
pkgs/applications/misc/qgis/default.nix
View File

@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
buildInputs = [ gdal qt4 flex bison proj geos x11 sqlite gsl pyqt4 qwt
fcgi ];
buildNativeInputs = [ cmake python];
nativeBuildInputs = [ cmake python];
patches = [ ./r14988.diff ];

2
pkgs/applications/misc/rsibreak/default.nix
View File

@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "1yrf73r8mixskh8b531wb8dfs9z7rrw010xsrflhjhjmqh94h8mw";
};
buildNativeInputs = [ gettext ];
nativeBuildInputs = [ gettext ];
buildInputs = [ kdelibs kdebase_workspace ];

8
pkgs/applications/misc/tangogps/default.nix
View File

@ -11,6 +11,12 @@ stdenv.mkDerivation rec {
buildInputs = [ pkgconfig gettext gtk gconf curl libexif sqlite libxml2 ];
# bogus includes fail with newer library version
postPatch = ''
sed -i -e 's,#include <glib/.*>,#include <glib.h>,g' src/*.c
sed -i -e 's,#include <curl/.*>,#include <curl/curl.h>,g' src/*.c src/*.h
'';
meta = {
description = "tangoGPS, a user friendly map and GPS user interface";
@ -30,7 +36,7 @@ stdenv.mkDerivation rec {
conveniently pre-cache areas with tangoGPS.
'';
homepage = http://www.tangogps.org/;
#homepage = http://www.tangogps.org/; # no longer valid, I couldn't find any other
license = "GPLv2+";
};

2
pkgs/applications/misc/taskwarrior/default.nix
View File

@ -10,7 +10,7 @@ stdenv.mkDerivation {
sha256 = "0diy72sgiyvfl6bdy7k3qwv3ijx2z1y477smkk6jsbbd9fsp2lfg";
};
buildNativeInputs = [ cmake ];
nativeBuildInputs = [ cmake ];
meta = {
description = "GTD (getting things done) implementation";

2
pkgs/applications/misc/truecrypt/default.nix
View File

@ -69,7 +69,7 @@ stdenv.mkDerivation {
};
buildInputs = [ pkgconfig fuse devicemapper wxGTK nasm ];
makeFlags = if (wxGUI) then "" else "NOGUI=1";
makeFlags = if wxGUI then "" else "NOGUI=1";
meta = {
description = "Free Open-Source filesystem on-the-fly encryption";

58
pkgs/applications/misc/xmobar/add-freeration-variable.patch Normal file
View File

@ -0,0 +1,58 @@
diff --git a/readme.md b/readme.md
index f4f07e8..de679c7 100644
--- a/readme.md
+++ b/readme.md
@@ -645,7 +645,7 @@ something like:
- Args: default monitor arguments
- Variables that can be used with the `-t`/`--template` argument:
`total`, `free`, `buffer`, `cache`, `rest`, `used`,
- `usedratio`, `usedbar`, `freebar`
+ `usedratio`, `usedbar`, `freeratio`, `freebar`
- Default template: `Mem: <usedratio>% (<cache>M)`
### `Swap Args RefreshRate`
diff --git a/src/Plugins/Monitors/Mem.hs b/src/Plugins/Monitors/Mem.hs
index 5c55ee2..3cf46c7 100644
--- a/src/Plugins/Monitors/Mem.hs
+++ b/src/Plugins/Monitors/Mem.hs
@@ -19,8 +19,8 @@ import Plugins.Monitors.Common
memConfig :: IO MConfig
memConfig = mkMConfig
"Mem: <usedratio>% (<cache>M)" -- template
- ["usedbar", "freebar", "usedratio", "total",
- "free", "buffer", "cache", "rest", "used"] -- available replacements
+ ["usedbar", "freebar", "usedratio", "freeratio", "total",
+ "free", "buffer", "cache", "rest", "used"] -- available replacements
fileMEM :: IO String
fileMEM = readFile "/proc/meminfo"
@@ -33,7 +33,8 @@ parseMEM =
rest = free + buffer + cache
used = total - rest
usedratio = used / total
- return [usedratio, total, free, buffer, cache, rest, used]
+ freeratio = free / total
+ return [usedratio, freeratio, total, free, buffer, cache, rest, used, freeratio]
totalMem :: IO Float
totalMem = fmap ((*1024) . (!!1)) parseMEM
@@ -42,15 +43,16 @@ usedMem :: IO Float
usedMem = fmap ((*1024) . (!!6)) parseMEM
formatMem :: [Float] -> Monitor [String]
-formatMem (r:xs) =
+formatMem (r:fr:xs) =
do let f = showDigits 0
rr = 100 * r
ub <- showPercentBar rr r
fb <- showPercentBar (100 - rr) (1 - r)
rs <- showPercentWithColors r
+ fs <- showPercentWithColors fr
s <- mapM (showWithColors f) xs
- return (ub:fb:rs:s)
-formatMem _ = return $ replicate 9 "N/A"
+ return (ub:fb:rs:fs:s)
+formatMem _ = return $ replicate 10 "N/A"
runMem :: [String] -> Monitor String
runMem _ =

1
pkgs/applications/misc/xmobar/default.nix
View File

@ -13,6 +13,7 @@ cabal.mkDerivation (self: {
];
extraLibraries = [ libXrandr wirelesstools ];
configureFlags = "-fwith_xft -fwith_iwlib";
patches = [ ./add-freeration-variable.patch ];
meta = {
homepage = "http://projects.haskell.org/xmobar/";
description = "A Minimalistic Text Based Status Bar";

2
pkgs/applications/misc/yakuake/default.nix
View File

@ -14,7 +14,7 @@ stdenv.mkDerivation {
buildInputs = [ kdelibs ];
buildNativeInputs = [ gettext ];
nativeBuildInputs = [ gettext ];
meta = {
homepage = http://yakuake.kde.org;

12
pkgs/applications/misc/zathura/builder.sh
View File

@ -1,11 +1,21 @@
source $stdenv/setup
mkdir -pv $out/bin/
mkdir -pv $out/share/
mkdir -pv $out/share/applications/
mkdir -pv $out/share/pixmaps/
cat > $out/bin/zathura <<EOF
#!/bin/sh
exec $zathura --plugins-dir=$plugins_path "\$@"
exec $zathura_core/bin/zathura --plugins-dir=$plugins_path "\$@"
EOF
cp -rv $zathura_core/share/man $out/share
cp -rv $zathura_core/share/locale $out/share
cp -rv $icon $out/share/pixmaps/pwmt.xpm
cat $zathura_core/share/applications/zathura.desktop > $out/share/applications/zathura.desktop
echo "Icon=pwmt" >> $out/share/applications/zathura.desktop
chmod 755 $out/bin/zathura

11
pkgs/applications/misc/zathura/core/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, gtk, girara, gettext }:
{ stdenv, fetchurl, pkgconfig, gtk, girara, gettext, docutils }:
stdenv.mkDerivation rec {
@ -13,7 +13,14 @@ stdenv.mkDerivation rec {
buildInputs = [ pkgconfig gtk girara gettext ];
makeFlags = "PREFIX=$(out)";
# Bug in zathura build system: we should remove empty manfiles in order them
# to be compiled properly
preBuild = ''
rm zathura.1
rm zathurarc.5
'';
makeFlags = [ "PREFIX=$(out)" "RSTTOMAN=${docutils}/bin/rst2man.py" "VERBOSE=1" ];
meta = {
homepage = http://pwmt.org/projects/zathura/;

10
pkgs/applications/misc/zathura/default.nix
View File

@ -1,4 +1,4 @@
{ callPackage, pkgs }:
{ callPackage, pkgs, fetchurl }:
rec {
inherit (pkgs) stdenv;
@ -11,7 +11,9 @@ rec {
zathura_ps = callPackage ./ps { };
zathuraWrapper = stdenv.mkDerivation rec {
zathuraWrapper = stdenv.mkDerivation {
inherit zathura_core;
name = "zathura-${zathura_core.version}";
@ -21,7 +23,7 @@ rec {
zathura_ps
];
zathura = "${zathura_core}/bin/zathura";
icon = ./icon.xpm;
builder = ./builder.sh;
@ -36,7 +38,7 @@ rec {
'';
license = stdenv.lib.licenses.zlib;
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.garbas ];
maintainers = [ stdenv.lib.maintainers.garbas stdenv.lib.maintainers.smironov ];
};
};
}

120
pkgs/applications/misc/zathura/icon.xpm Normal file
View File

@ -0,0 +1,120 @@
/* XPM */
static char *freeimage[] = {
/* width height num_colors chars_per_pixel */
"16 16 96 2",
/* colors */
" c #1e1e1e",
" . c #222222",
" X c #212121",
" o c #535353",
" O c #a4a4a4",
" + c #202020",
" @ c #252525",
" # c #3c3c3c",
" $ c #292929",
" % c #979797",
" & c #cccccc",
" * c #303030",
" = c #1f1f1f",
" - c #494949",
" ; c #dddddd",
" : c #696969",
" > c #232323",
" , c #262626",
" < c #adadad",
" 1 c #bbbbbb",
" 2 c #1d1d1d",
" 3 c #1c1c1c",
" 4 c #5e5e5e",
" 5 c #e8e8e8",
" 6 c #9c9c9c",
" 7 c #242424",
" 8 c #b1b1b1",
" 9 c #b3b3b3",
" 0 c #090909",
" q c #161616",
" w c #131313",
" e c #4d4d4d",
" r c #dedede",
" t c #afafaf",
" y c #282828",
" u c #393939",
" i c #c4c4c4",
" p c #dcdcdc",
" a c #9a9a9a",
" s c #a2a2a2",
" d c #ababab",
" f c #313131",
" g c #a7a7a7",
" h c #e4e4e4",
" j c #f2f2f2",
" k c #eaeaea",
" l c #e2e2e2",
" z c #f0f0f0",
" x c #d5d5d5",
" c c #737373",
" v c #323232",
" b c #808080",
" n c #7a7a7a",
" m c #d3d3d3",
" M c #e5e5e5",
" N c #8a8a8a",
" B c #cbcbcb",
" V c #b5b5b5",
" C c #b9b9b9",
" Z c #272727",
" A c #b4b4b4",
" S c #bababa",
" D c #2d2d2d",
" F c #414141",
" G c #444444",
" H c #f4f4f4",
" J c #838383",
" K c #cfcfcf",
" L c #fafafa",
" P c #efefef",
" I c #e3e3e3",
" U c #8d8d8d",
" Y c #656565",
" T c #ffffff",
" R c #fbfbfb",
" E c #e9e9e9",
" W c #bdbdbd",
" Q c #e1e1e1",
" ! c #dfdfdf",
" ~ c #646464",
" ^ c #3a3a3a",
" / c #a1a1a1",
" ( c #999999",
" ) c #c0c0c0",
" _ c #3b3b3b",
" ` c #acacac",
" ' c #050505",
" ] c #151515",
" [ c #1b1b1b",
" { c #1a1a1a",
" } c #b2b2b2",
" | c #a5a5a5",
". c #c5c5c5",
".. c #a6a6a6",
".X c #bfbfbf",
".o c #747474",
/* pixels */
" ",
" . . . X X X X . o O + X . . ",
" . . X @ # $ . @ % & * = . . ",
" . . - ; : > , < 1 2 X . . ",
" . . 3 4 5 6 7 7 8 9 0 q q 3 ",
" . + w e r t y u i p a s d 4 ",
" X f g h j k p l z z x g c v ",
" X f b n m M N c B V 3 , > X ",
" X X w V C $ Z A S + $ , . ",
" D F G u S H 1 J K L P I U @ ",
" Y T T T R E & W Q ! d g ~ 7 ",
" ^ / 6 ( ; ) _ 2 ` 8 ' ] [ X ",
" + > 7 { A } 7 @ |. $ + . . ",
" X X X ].. 8 Z 7 n.X + X . . ",
" . . . { n.o 7 . @ y X X . . ",
" "
};

3
pkgs/applications/networking/browsers/chromium/default.nix
View File

@ -127,8 +127,7 @@ in stdenv.mkDerivation rec {
patches = optional cupsSupport ./cups_allow_deprecated.patch
++ optional pulseSupport ./pulseaudio_array_bounds.patch
++ optional post25 ./clone_detached.patch
# XXX: Remove after stdenv-updates merge!
++ singleton "/dev/null";
++ [ ./glibc-2.16-use-siginfo_t.patch ];
postPatch = ''
sed -i -r -e 's/-f(stack-protector)(-all)?/-fno-\1/' build/common.gypi

27
pkgs/applications/networking/browsers/chromium/glibc-2.16-use-siginfo_t.patch Normal file
View File

@ -0,0 +1,27 @@
--- a/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h.orig 2012-12-22 16:01:44.000000000 +0200
+++ b/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h 2012-12-23 21:53:26.746069153 +0200
@@ -250,7 +250,7 @@
struct kernel_old_sigaction {
union {
void (*sa_handler_)(int);
- void (*sa_sigaction_)(int, struct siginfo *, void *);
+ void (*sa_sigaction_)(int, siginfo_t *, void *);
};
unsigned long sa_mask;
unsigned long sa_flags;
@@ -287,13 +287,13 @@
unsigned long sa_flags;
union {
void (*sa_handler_)(int);
- void (*sa_sigaction_)(int, struct siginfo *, void *);
+ void (*sa_sigaction_)(int, siginfo_t *, void *);
};
struct kernel_sigset_t sa_mask;
#else
union {
void (*sa_handler_)(int);
- void (*sa_sigaction_)(int, struct siginfo *, void *);
+ void (*sa_sigaction_)(int, siginfo_t *, void *);
};
unsigned long sa_flags;
void (*sa_restorer)(void);

18
pkgs/applications/networking/browsers/chromium/sources.nix
View File

@ -1,18 +1,18 @@
# This file is autogenerated from update.sh in the same directory.
{
dev = {
version = "26.0.1410.12";
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-26.0.1410.12.tar.xz";
sha256 = "1cfzvlldzgm53jwys5zbrd4rszkinsr4n5ky5rcg6p6nw73b4hmj";
version = "26.0.1410.28";
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-26.0.1410.28.tar.xz";
sha256 = "1g32xyh06xsqkli0g83flqr1qvx2yxb7vaqshf9wcyqgkyzvy7il";
};
beta = {
version = "26.0.1410.12";
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-26.0.1410.12.tar.xz";
sha256 = "1cfzvlldzgm53jwys5zbrd4rszkinsr4n5ky5rcg6p6nw73b4hmj";
version = "26.0.1410.28";
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-26.0.1410.28.tar.xz";
sha256 = "1g32xyh06xsqkli0g83flqr1qvx2yxb7vaqshf9wcyqgkyzvy7il";
};
stable = {
version = "25.0.1364.97";
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-25.0.1364.97.tar.bz2";
sha256 = "1r8khcic82m6g5i7669q8fxsfhjrlvp99iggqc5qpihljsz33ghm";
version = "25.0.1364.152";
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-25.0.1364.152.tar.bz2";
sha256 = "1v8zpqk3q21d5hars1clss75n187hlg4zxbr68jj1ysmqclzbni8";
};
}

6
pkgs/applications/networking/browsers/elinks/default.nix
View File

@ -21,12 +21,12 @@ stdenv.mkDerivation rec {
'';
crossAttrs = {
propagatedBuildInputs = [ ncurses.hostDrv zlib.hostDrv openssl.hostDrv ];
propagatedBuildInputs = [ ncurses.crossDrv zlib.crossDrv openssl.crossDrv ];
configureFlags = ''
--enable-finger --enable-html-highlight
--enable-gopher --enable-cgi --enable-bittorrent --enable-nntp
--with-openssl=${openssl.hostDrv}
--with-bzip2=${bzip2.hostDrv}
--with-openssl=${openssl.crossDrv}
--with-bzip2=${bzip2.crossDrv}
'';
};

2
pkgs/applications/networking/browsers/links2/default.nix
View File

@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optionals enableX11 [ libX11 libXau libXt ]
++ stdenv.lib.optional enableDirectFB [ directfb ];
buildNativeInputs = [ pkgconfig bzip2 ];
nativeBuildInputs = [ pkgconfig bzip2 ];
configureFlags = [ "--with-ssl" ]
++ stdenv.lib.optional (enableX11 || enableFB || enableDirectFB) "--enable-graphics"

2
pkgs/applications/networking/browsers/lynx/default.nix
View File

@ -15,7 +15,7 @@ stdenv.mkDerivation {
configureFlags = if sslSupport then "--with-ssl" else "";
buildInputs = [ ncurses gzip ] ++ stdenv.lib.optional sslSupport openssl;
buildNativeInputs = [ ncurses ];
nativeBuildInputs = [ ncurses ];
crossAttrs = {
configureFlags = "--enable-widec" +

12
pkgs/applications/networking/browsers/rekonq/default.nix
View File

@ -1,16 +1,18 @@
{ stdenv, fetchurl, kdelibs, gettext, pkgconfig, shared_desktop_ontologies, qca2, qoauth }:
{ stdenv, fetchurl, kde4, gettext, pkgconfig, shared_desktop_ontologies, qca2, qoauth }:
assert builtins.compareVersions "4.8.3" kde4.release != 1; # https://bugs.kde.org/show_bug.cgi?id=306077
stdenv.mkDerivation rec {
name = "rekonq-1.1";
name = "rekonq-1.70"; # >=1.80 need kde >=4.9.0
src = fetchurl {
url = "mirror://sourceforge/rekonq/${name}.tar.bz2";
sha256 = "1bs733mwyfb7bxnial8n49b82ip04sark2mxwlq7ixxsbgq7972l";
sha256 = "05zqm329vajsn32l5b5nlbw92gl3irdcx8kifr4y921i9bkzigad";
};
buildInputs = [ kdelibs qca2 qoauth ];
buildInputs = [ kde4.kdelibs qca2 qoauth ];
buildNativeInputs = [ gettext pkgconfig shared_desktop_ontologies ];
nativeBuildInputs = [ gettext pkgconfig shared_desktop_ontologies ];
meta = with stdenv.lib; {
platforms = platforms.linux;

9
pkgs/applications/networking/browsers/w3m/default.nix
View File

@ -19,9 +19,10 @@ stdenv.mkDerivation rec {
sha256 = "1qx9f0kprf92r1wxl3sacykla0g04qsi0idypzz24b7xy9ix5579";
};
# Patch for the newer unstable boehm-gc 7.2alpha. Not all platforms use that
# alpha. At the time of writing this, boehm-gc-7.1 is the last stable.
patches = stdenv.lib.optional (boehmgc.name != "boehm-gc-7.1") [ ./newgc.patch ];
patches = [ ./glibc214.patch ]
# Patch for the newer unstable boehm-gc 7.2alpha. Not all platforms use that
# alpha. At the time of writing this, boehm-gc-7.1 is the last stable.
++ stdenv.lib.optional (boehmgc.name != "boehm-gc-7.1") [ ./newgc.patch ];
buildInputs = [ncurses boehmgc gettext zlib]
++ stdenv.lib.optional sslSupport openssl
@ -36,6 +37,8 @@ stdenv.mkDerivation rec {
substituteInPlace ./configure --replace /usr /no-such-path
'';
enableParallelBuilding = false;
meta = {
homepage = http://w3m.sourceforge.net/;
description = "A text-mode web browser";

60
pkgs/applications/networking/browsers/w3m/glibc214.patch Normal file
View File

@ -0,0 +1,60 @@
http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/www-client/w3m/files/w3m-0.5.3-glibc214.patch?revision=1.1
--- a/istream.c.~1.27.~ 2011-01-04 18:22:22.000000000 +0900
+++ b/istream.c 2011-06-24 08:15:23.522990618 +0900
@@ -22,8 +22,8 @@
static void basic_close(int *handle);
static int basic_read(int *handle, char *buf, int len);
-static void file_close(struct file_handle *handle);
-static int file_read(struct file_handle *handle, char *buf, int len);
+static void file_close(struct afile_handle *handle);
+static int file_read(struct afile_handle *handle, char *buf, int len);
static int str_read(Str handle, char *buf, int len);
@@ -114,7 +114,7 @@
stream = New(union input_stream);
init_base_stream(&stream->base, STREAM_BUF_SIZE);
stream->file.type = IST_FILE;
- stream->file.handle = New(struct file_handle);
+ stream->file.handle = New(struct afile_handle);
stream->file.handle->f = f;
if (closep)
stream->file.handle->close = closep;
@@ -658,13 +658,13 @@
}
static void
-file_close(struct file_handle *handle)
+file_close(struct afile_handle *handle)
{
handle->close(handle->f);
}
static int
-file_read(struct file_handle *handle, char *buf, int len)
+file_read(struct afile_handle *handle, char *buf, int len)
{
return fread(buf, 1, len, handle->f);
}
--- a/istream.h.~1.12.~ 2003-10-21 01:41:56.000000000 +0900
+++ b/istream.h 2011-06-24 08:15:54.392991144 +0900
@@ -20,7 +20,7 @@
typedef struct stream_buffer *StreamBuffer;
-struct file_handle {
+struct afile_handle {
FILE *f;
void (*close) ();
};
@@ -53,7 +53,7 @@
struct file_stream {
struct stream_buffer stream;
- struct file_handle *handle;
+ struct afile_handle *handle;
char type;
char iseos;
int (*read) ();

4
pkgs/applications/networking/instant-messengers/baresip/default.nix
View File

@ -4,11 +4,11 @@
, gsm, speex, portaudio, spandsp, libuuid
}:
stdenv.mkDerivation rec {
version = "0.4.2";
version = "0.4.3";
name = "baresip-${version}";
src=fetchurl {
url = "http://www.creytiv.com/pub/baresip-${version}.tar.gz";
sha256 = "3ac15b3d3cf17b2417ba871e7eaaaf41ab10cb30b900adcee357d5e91ea033e7";
sha256 = "03vpzn0c3mybnwn84ha3yci780qsjm669dwja1srj0hbrq81rbil";
};
buildInputs = [zlib openssl libre librem pkgconfig
cairo mpg123 gstreamer gst_ffmpeg gst_plugins_base gst_plugins_bad gst_plugins_good

8
pkgs/applications/networking/instant-messengers/centerim/default.nix
View File

@ -2,12 +2,18 @@
, withGpg ? true, gpgme ? null}:
stdenv.mkDerivation rec {
name = "centerim-4.22.10";
version = "4.22.10";
debPatch = "2";
name = "centerim-${version}";
src = fetchurl {
url = "http://centerim.org/download/releases/${name}.tar.gz";
sha256 = "0viz86jflp684vfginhl6aaw4gh2qvalc25anlwljjl3kkmibklk";
};
patches = fetchurl {
url = "mirror://debian/pool/main/c/centerim/centerim_${version}-${debPatch}.diff.gz";
sha256 = "18iz3hkvr31jsyznryvyldxm9ckyrpy9sczxikrnw2i2r1xyfj8m";
};
buildInputs = [ openssl curl ncurses libjpeg ]
++ stdenv.lib.optional withGpg gpgme;

2
pkgs/applications/networking/instant-messengers/linphone/default.nix
View File

@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
buildInputs = [ gtk libglade libosip libexosip readline mediastreamer speex libsoup ];
buildNativeInputs = [ intltool pkgconfig ];
nativeBuildInputs = [ intltool pkgconfig ];
preConfigure = "rm -r mediastreamer2 oRTP";

86
pkgs/applications/networking/instant-messengers/psi/linux-headers.patch Normal file
View File

@ -0,0 +1,86 @@
http://pkgs.fedoraproject.org/gitweb/?p=psimedia.git;a=blob_plain;f=psimedia-remove-v4l.patch;hb=HEAD
--- a/gstprovider/deviceenum/deviceenum_unix.cpp
+++ b/gstprovider/deviceenum/deviceenum_unix.cpp
@@ -35,7 +35,7 @@
# include <sys/stat.h>
# include <dirent.h>
# include <sys/ioctl.h>
-# include <linux/videodev.h>
+# include <linux/videodev2.h>
#endif
namespace DeviceEnum {
@@ -478,72 +478,7 @@
// v4l detection scheme adapted from PWLib (used by Ekiga/Gnomemeeting)
static QList<Item> get_v4l_items()
{
-#ifdef Q_OS_LINUX
- QList<Item> out;
-
- QList<V4LName> list = get_v4l_names("/sys/class/video4linux", true);
- if(list.isEmpty())
- list = get_v4l_names("/proc/video/dev", false);
-
- // if we can't find anything, then do a raw scan for possibilities
- if(list.isEmpty())
- {
- QStringList possible = scan_for_videodevs("/dev");
- foreach(QString str, possible)
- {
- V4LName v;
- v.dev = str;
- list += v;
- }
- }
-
- for(int n = 0; n < list.count(); ++n)
- {
- V4LName &v = list[n];
-
- // if we already have a friendly name then we'll skip the confirm
- // in order to save resources. the only real drawback here that
- // I can think of is if the device isn't a capture type. but
- // what does it mean to have a V4L device that isn't capture??
- if(v.friendlyName.isEmpty())
- {
- int fd = open(QFile::encodeName(v.dev).data(), O_RDONLY | O_NONBLOCK);
- if(fd == -1)
- continue;
-
- // get video capabilities and close
- struct video_capability caps;
- memset(&caps, 0, sizeof(caps));
- int ret = ioctl(fd, VIDIOCGCAP, &caps);
- close(fd);
- if(ret == -1)
- continue;
-
- if(!(caps.type & VID_TYPE_CAPTURE))
- continue;
-
- v.friendlyName = caps.name;
- }
-
- Item i;
- i.type = Item::Video;
- i.dir = Item::Input;
- i.name = v.friendlyName;
- i.driver = "v4l";
- i.id = v.dev;
-
- // HACK
- if(v.friendlyName == "Labtec Webcam Notebook")
- i.explicitCaptureSize = QSize(640, 480);
-
- out += i;
- }
-
- return out;
-#else
- // return empty list if non-linux
return QList<Item>();
-#endif
}
static QList<Item> get_v4l2_items()

6
pkgs/applications/networking/instant-messengers/psi/psimedia.nix
View File

@ -2,14 +2,14 @@
, glib, pkgconfig }:
stdenv.mkDerivation rec {
name = "psimedia";
name = "psimedia-1.0.3";
src = fetchurl {
url = "http://delta.affinix.com/download/psimedia/psimedia-1.0.3.tar.bz2";
url = "http://delta.affinix.com/download/psimedia/${name}.tar.bz2";
sha256 = "0fxjdz8afh75gfx2msysb1gss6zx578l3224jvc9jhm99w1ii781";
};
patches = [ ./glib-2.32.patch ];
patches = [ ./glib-2.32.patch ./linux-headers.patch ];
buildInputs = [ qt4 gstreamer gst_plugins_base liboil speex which glib pkgconfig ];

2
pkgs/applications/networking/instant-messengers/skype/default.nix
View File

@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
cp -r * $out/libexec/skype/
fullPath=
for i in $buildNativeInputs; do
for i in $nativeBuildInputs; do
fullPath=$fullPath''${fullPath:+:}$i/lib
done

6
pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix
View File

@ -2,14 +2,14 @@
, sqlite, libsoup, libnice, gnutls }:
stdenv.mkDerivation rec {
name = "telepathy-gabble-0.16.0";
name = "telepathy-gabble-0.17.2";
src = fetchurl {
url = "${meta.homepage}/releases/telepathy-gabble/${name}.tar.gz";
sha256 = "0fk65f7q75z3wm5h4wad7g5sm2j6r8v2845b74ycl29br78ki2hf";
sha256 = "137sslbgh0326lmwihcr2ybljgq9mzsx5wnciilpx884si22wpk8";
};
buildNativeInputs = [pkgconfig libxslt];
nativeBuildInputs = [pkgconfig libxslt];
buildInputs = [ libxml2 dbus_glib sqlite libsoup libnice telepathy_glib gnutls ];
configureFlags = "--with-ca-certificates=/etc/ca-bundle.crt";

6
pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix
View File

@ -2,16 +2,16 @@
stdenv.mkDerivation rec {
pname = "telepathy-haze";
name = "${pname}-0.6.0";
name = "${pname}-0.7.0";
src = fetchurl {
url = "http://telepathy.freedesktop.org/releases/${pname}/${name}.tar.gz";
sha256 = "1qrgmcr8ga6nvaz9hhn0mv0p7v799wsawrg3k5l791cgxx5carz2";
sha256 = "1gaj8518ilm3gnzqf3lmiqgnwkay8wfbsqngcz15whzji8sl608b";
};
buildInputs = [ glib telepathy_glib dbus_glib pidgin ];
buildNativeInputs = [ pkgconfig libxslt ];
nativeBuildInputs = [ pkgconfig libxslt ];
meta = {
description = "A Telepathy connection manager based on libpurple";

16
pkgs/applications/networking/instant-messengers/telepathy/kde/0.4.0.nix
View File

@ -1,16 +0,0 @@
[
{name="ktp-accounts-kcm";key="accounts_kcm";sha256="1a312cfm1i8ipqp0r09zfhlk7vacp006pbhwwvyf0sgracizr0cp";}
{name="ktp-approver";key="approver";sha256="0wfpwlk5f3n37xl619jzjxmgrq81qnr9kg9m955zbcad2jsx3z35";}
{name="ktp-auth-handler";key="auth_handler";sha256="1q5jjj3np3kg7py28jb74q8lpi6camw7907950igpnwzbzmacxwa";}
{name="ktp-call-ui";key="call_ui";sha256="08k59q0gf6fq0mmz72akiqkldqy6grw1gs7jz44gzmr82jvaqjb3";}
{name="ktp-common-internals";key="common_internals";sha256="1cmil7wp6rgqzl0bciphqmvdzipm856c45kx2mzrk6n1vnl9l500";}
{name="ktp-contact-applet";key="contact_applet";sha256="1j42yqq06bkpfb4jgm88qqbwnz9538ys5aghyfg147jr50h9pk8k";}
{name="ktp-contact-list";key="contact_list";sha256="1ndpr2z99clmy8f7l8l6ws7bljmmqvfrb5f0nrym91lyvcdz7sb2";}
{name="ktp-contact-runner";key="contact_runner";sha256="1v8mcp8q1cfmxdg65qqh159q9pynz3pc3y0ycr6hn1nrgxncs48k";}
{name="ktp-filetransfer-handler";key="filetransfer_handler";sha256="0dj2if34wxajwylgfxwd5chvxk63lxmsq52sc039dsj9p174cp3y";}
{name="ktp-kded-integration-module";key="kded_integration_module";sha256="0p873h6cjdinfinfz1cggyw611v2gllmkvzczszxnl8q2hcprx96";}
{name="ktp-presence-applet";key="presence_applet";sha256="1y8yhbbjp9qgycn93lqd6ss7jln1hpxa0dnqgirijfjn15c20nfl";}
{name="ktp-send-file";key="send_file";sha256="0sacvda2xs5g7w2xca9p6z61f2w69sgw0g3sj2fazrsm0x7a0z0d";}
{name="ktp-text-ui";key="text_ui";sha256="1xsslwaisk90wa45rgps3500wl1fbxq4qp6njljf4qbysyw4wfdb";}
{name="telepathy-logger-qt";key="telepathy_logger_qt";sha256="1398iyb72grhwwi0idxdwj1qdi2s02cp2wvjv72wvv3vyfwb51kn";}
]

16
pkgs/applications/networking/instant-messengers/telepathy/kde/0.5.3.nix Normal file
View File

@ -0,0 +1,16 @@
[
{name="ktp-accounts-kcm";key="accounts_kcm";sha256="0nmjwbm7ycy5awwlx359889am7qbvs64gk0bd1800a9jl2lhvw56";}
{name="ktp-approver";key="approver";sha256="0n0a2abbz7xvzp3p4l6khgbhbjylppvskcyma440fmfv3j3jdc12";}
{name="ktp-auth-handler";key="auth_handler";sha256="11vfim3ck60cy22x84bz6cw0267kf884qa00nbm033kpwjbx4zr6";}
{name="ktp-call-ui";key="call_ui";sha256="0gmppn4f5a9yd3pnzga3sdwz37c7qpmx586914r64jbkii196xg4";}
{name="ktp-common-internals";key="common_internals";sha256="1lkmaym8bv5ijy7sksbihr63qify9b9vrhrikck6q23n8sk112n9";}
{name="ktp-contact-applet";key="contact_applet";sha256="0gsf1m276mhvysy30qqw1h7ssdipyyjh43jbf2lx4bb934by9wby";}
{name="ktp-contact-list";key="contact_list";sha256="19nlzs650lwmzr30lrviv0qw1xd061pdrk17cm512ldvzibc70ab";}
{name="ktp-contact-runner";key="contact_runner";sha256="0x3zkk11x9npx30w330s8n49ybqlyhgcndvqizg4sbj1lfbrmhn1";}
{name="ktp-filetransfer-handler";key="filetransfer_handler";sha256="0w90hsypzgakqx96xkf0wk2qqns6v5ji814gvc3rf9ajcwh0d024";}
{name="ktp-kded-integration-module";key="kded_integration_module";sha256="0sz0d1yfj35q5r1gc4m6v2c8r0cik2vzvkqfx9pqy8g97d7q1nmj";}
{name="ktp-presence-applet";key="presence_applet";sha256="081jas1vzh6nwj3w60bw3w95gpdbi74pdi9rdxv0wvra5w76s4i6";}
{name="ktp-send-file";key="send_file";sha256="19nlm4sfa0m0y856nzs3hrncbznc35zwbsxavssd9wrbb8p9cns6";}
{name="ktp-text-ui";key="text_ui";sha256="0g8114adqyvzsdm8ldhidf2gyxkv0bnky71zg70gmhkdmzcfssyn";}
{name="telepathy-logger-qt";key="telepathy_logger_qt";sha256="17bfkbxc7gfcspmjd5w6vn9a75f36qinj7illqafb7k0jqqz2nq6";}
]

6
pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix
View File

@ -3,7 +3,7 @@
let
pkgconfig = pkgconfigUpstream;
version = "0.4.0";
version = "0.5.3";
manifest = import (./. + "/${version}.nix");
overrides = {
@ -20,7 +20,7 @@ let
text_ui = [ ktp.telepathy_logger_qt qt_gstreamer telepathy_logger ];
};
extraBuildNativeInputs = {
extraNativeBuildInputs = {
telepathy_logger_qt = [ flex bison ];
};
@ -37,7 +37,7 @@ let
inherit sha256;
};
buildNativeInputs = [ gettext pkgconfig ] ++ (stdenv.lib.attrByPath [ key ] [] extraBuildNativeInputs);
nativeBuildInputs = [ gettext pkgconfig ] ++ (stdenv.lib.attrByPath [ key ] [] extraNativeBuildInputs);
buildInputs = [ kdelibs telepathy_qt ]
++ stdenv.lib.optional (name != "ktp-common-internals") ktp.common_internals
++ (stdenv.lib.attrByPath [ key ] [] extraBuildInputs);

6
pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix
View File

@ -3,16 +3,16 @@
stdenv.mkDerivation rec {
project = "telepathy-logger";
name = "${project}-0.4.0";
name = "${project}-0.8.0";
src = fetchurl {
url = "http://telepathy.freedesktop.org/releases/${project}/${name}.tar.bz2";
sha256 = "1rb58ipz56c9bac8b31md5gk1fw7jim8x9dx3cm5gmxg2q3apd86";
sha256 = "18i00l8lnp5dghqmgmpxnn0is2a20pkisxy0sb78hnd2dz0z6xnl";
};
buildInputs = [ dbus_glib libxml2 sqlite telepathy_glib pkgconfig intltool ];
buildNativeInputs = [ libxslt ];
nativeBuildInputs = [ libxslt ];
configureFlags = "--enable-call";

6
pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix
View File

@ -1,15 +1,15 @@
{ stdenv, fetchurl, pkgconfig, telepathy_glib, libxslt }:
stdenv.mkDerivation rec {
name = "${pname}-5.12.0";
name = "${pname}-5.14.0";
pname = "telepathy-mission-control";
src = fetchurl {
url = "http://telepathy.freedesktop.org/releases/${pname}/${name}.tar.gz";
sha256 = "0xsycjk2l19h026adqms8ik7c2xj9j9rba76znfh46ryaijyn2k6";
sha256 = "0c4asjgk7pk39i8njf0q1df0mhisif83lq716ln6r0wja9zh9q2q";
};
buildInputs = [ telepathy_glib ];
buildNativeInputs = [ pkgconfig libxslt ];
nativeBuildInputs = [ pkgconfig libxslt ];
}

2
pkgs/applications/networking/instant-messengers/telepathy/rakia/default.nix
View File

@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "11cmmdq31kivm6nsv61hxy3hxnnmbd8sj55xqwx9hyqzybh70dyf";
};
buildNativeInputs = [pkgconfigUpstream libxslt python];
nativeBuildInputs = [pkgconfigUpstream libxslt python];
buildInputs = [ libxml2 dbus_glib telepathy_glib sofia_sip];
meta = {

2
pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix
View File

@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
buildInputs = [ glib libxml2 telepathy_glib avahi libsoup libuuid gnutls
sqlite ];
buildNativeInputs = [ libxslt pkgconfigUpstream ];
nativeBuildInputs = [ libxslt pkgconfigUpstream ];
configureFlags = "--disable-avahi-tests";

17
pkgs/applications/networking/p2p/transmission/default.nix
View File

@ -1,20 +1,23 @@
{ stdenv, fetchurl, pkgconfig, openssl, curl, intltool, libevent, gtkClient ? true, gtk }:
{ stdenv, fetchurl, pkgconfig, openssl, curl, intltool, libevent,
file, inotifyTools, gtk ? null }:
stdenv.mkDerivation rec {
name = "transmission-2.52";
name = "transmission-2.60"; # transmission >= 2.61 requires gtk3
src = fetchurl {
url = "http://download.transmissionbt.com/files/${name}.tar.xz";
sha256 = "05sfq5h3731xc9a1k5r1q4gbs9yk0dr229asfxjjgg0lw1xzppdw";
sha256 = "1ramdliyy8j7qqpkxg643lda11ynxwfhq6qcs31fr3h9x72l0rg4";
};
buildInputs = [ pkgconfig openssl curl intltool libevent ] ++
stdenv.lib.optional gtkClient gtk;
buildInputs = [ pkgconfig openssl curl intltool libevent
file inotifyTools gtk ];
configureFlags = if gtkClient then "--enable-gtk" else "--disable-gtk";
preConfigure = ''
sed -i -e 's|/usr/bin/file|${file}/bin/file|g' configure
'';
postInstall = ''
rm $out/share/icons/hicolor/icon-theme.cache
rm -f $out/share/icons/hicolor/icon-theme.cache
'';
meta = {

10
pkgs/applications/networking/sniffers/etherape/default.nix
View File

@ -1,5 +1,5 @@
{stdenv, fetchurl, pkgconfig, gtk, libpcap, libglade, libgnome, libgnomeui,
gnomedocutils, scrollkeeper, libxslt}:
{ stdenv, fetchurl, pkgconfig, libtool, gtk, libpcap, libglade, libgnome, libgnomeui
, gnomedocutils, scrollkeeper, libxslt }:
stdenv.mkDerivation rec {
name = "etherape-0.9.12";
@ -9,8 +9,10 @@ stdenv.mkDerivation rec {
};
configureFlags = [ "--disable-scrollkeeper" ];
buildInputs = [ gtk libpcap pkgconfig libglade libgnome libgnomeui gnomedocutils
scrollkeeper libxslt ];
buildInputs = [
pkgconfig libtool gtk libpcap libglade libgnome libgnomeui gnomedocutils
scrollkeeper libxslt
];
meta = {
homepage = http://etherape.sourceforge.net/;

2
pkgs/applications/networking/sync/rsync/default.nix
View File

@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
patches = [] ++ stdenv.lib.optional enableCopyDevicesPatch "./patches/copy-devices.diff";
buildInputs = stdenv.lib.optional enableACLs acl;
buildNativeInputs = [perl];
nativeBuildInputs = [perl];
meta = {
homepage = http://samba.anu.edu.au/rsync/;

2
pkgs/applications/networking/sync/unison/default.nix
View File

@ -27,7 +27,7 @@ stdenv.mkDerivation (rec {
done
'' else "";
dontStrip = if ! ocaml.nativeCompilers then true else false;
dontStrip = !ocaml.nativeCompilers;
meta = {
homepage = http://www.cis.upenn.edu/~bcpierce/unison/;

2
pkgs/applications/office/basket/default.nix
View File

@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
buildInputs = [ kdelibs qimageblitz kdepimlibs gpgme ];
buildNativeInputs = [ cmake gettext ];
nativeBuildInputs = [ cmake gettext ];
meta = {
description = "A multi-purpose note-taking application";

2
pkgs/applications/office/calligra/default.nix
View File

@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "0q6ydi7hzrzwqzb38gikdh1l2zf8qp4i3nkgyb01148bjwrhvf21";
};
buildNativeInputs = [ cmake perl pkgconfig ];
nativeBuildInputs = [ cmake perl pkgconfig ];
buildInputs = [ kdelibs attica zlib libpng boost mesa kdepimlibs
createresources eigen qca2 exiv2 soprano marble lcms2 fontconfig freetype

2
pkgs/applications/office/kmymoney/default.nix
View File

@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [ kdepimlibs perl boost gpgme gmpxx libalkimia libofx libical ];
buildNativeInputs = [ cmake automoc4 gettext shared_mime_info pkgconfig ];
nativeBuildInputs = [ cmake automoc4 gettext shared_mime_info pkgconfig ];
KDEDIRS = libalkimia;

3
pkgs/applications/office/koffice/default.nix
View File

@ -38,6 +38,7 @@ stdenv.mkDerivation rec {
license = "GPL";
homepage = http://www.koffice.org;
maintainers = with stdenv.lib.maintainers; [ sander urkud ];
inherit (kdelibs.meta) platforms;
# doesn't build, seems dead and superseded by calligra
#inherit (kdelibs.meta) platforms;
};
}

2
pkgs/applications/office/skrooge/default.nix
View File

@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
buildInputs = [ kdelibs grantlee qca2 libofx ];
buildNativeInputs = [ gettext ];
nativeBuildInputs = [ gettext ];
meta = {
inherit (kdelibs.meta) platforms;

2
pkgs/applications/science/chemistry/avogadro/default.nix
View File

@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
buildInputs = [ qt4 eigen zlib openbabel mesa libX11 ];
buildNativeInputs = [ cmake pkgconfig ];
nativeBuildInputs = [ cmake pkgconfig ];
NIX_CFLAGS_COMPILE = "-include ${mesa}/include/GL/glu.h";

7
pkgs/applications/science/electronics/qucs/default.nix
View File

@ -1,13 +1,16 @@
{stdenv, fetchurl, qt3, libX11}:
stdenv.mkDerivation rec {
name = "qucs-0.0.15";
name = "qucs-0.0.16";
src = fetchurl {
url = "mirror://sourceforge/qucs/${name}.tar.gz";
sha256 = "0ggs2nicj8q270l0rbmzg4jc0d0zdxvfsjh4wgww670ma5855xsp";
sha256 = "1h8ba84k06rix5zl5p9p414zj2facbnlf1vxwh4a1sp4h9dbfnzy";
};
patches = [ ./tr1-complex.patch ];
patchFlags = "-p0";
buildInputs = [ qt3 libX11 ];
meta = {

10
pkgs/applications/science/electronics/qucs/tr1-complex.patch Normal file
View File

@ -0,0 +1,10 @@
--- qucs-core/configure.orig 2011-07-03 07:34:09.069218113 -0500
+++ qucs-core/configure 2011-07-03 07:34:46.618990497 -0500
@@ -5884,7 +5884,6 @@
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-#include <tr1/complex>
using namespace std;
using namespace std::tr1;
int

2
pkgs/applications/science/logic/tptp/default.nix
View File

@ -14,7 +14,7 @@ let
version="5.4.0";
name="${baseName}-${version}";
url="http://www.cs.miami.edu/~tptp/TPTP/Distribution/TPTP-v${version}.tgz";
hash="0nyq2kkiphwgj3hczc7zglzqjj6hxxsh6zcygpy4yhxh9a9rpkg1";
hash="0rvrmh3vw4bk7mj29bx1pi76g2bsqyc13gsnpa1cbjs5pzyhm780";
};
in
rec {

2
pkgs/applications/science/math/ginac/default.nix
View File

@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ cln ];
buildInputs = [ readline ];
buildNativeInputs = [ pkgconfig ];
nativeBuildInputs = [ pkgconfig ];
configureFlags = "--disable-rpath";

2
pkgs/applications/science/math/yacas/default.nix
View File

@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
};
# Perl is only for the documentation
buildNativeInputs = [ perl ];
nativeBuildInputs = [ perl ];
patches = [ ./gcc43.patch ];

2
pkgs/applications/science/misc/tulip/default.nix
View File

@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
buildInputs = [ libxml2 freetype glew mesa qt4 libjpeg ];
buildNativeInputs = [ cmake makeWrapper ];
nativeBuildInputs = [ cmake makeWrapper ];
# FIXME: "make check" needs Docbook's DTD 4.4, among other things.
doCheck = false;

2
pkgs/applications/version-management/fossil/default.nix
View File

@ -9,7 +9,7 @@ stdenv.mkDerivation {
};
buildInputs = [ zlib openssl readline sqlite ];
buildNativeInputs = [ tcl ];
nativeBuildInputs = [ tcl ];
doCheck = true;

Some files were not shown because too many files have changed in this diff Show More