dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://github.com/vvanpo/nixpkgs into plan9port

Browse Source
This commit is contained in:
Victor van Poppelen 2014-08-01 10:58:32 -04:00
commit 45fbcadd3b
96 changed files with 514 additions and 553 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nixos/modules/services/web-servers/apache-httpd/tomcat-connector.nix
View File

@ -29,6 +29,14 @@ ${extraWorkersProperties}
'';
in
{
options = {
extraWorkersProperties = pkgs.lib.mkOption {
default = "";
description = "Additional configuration for the workers.properties file.";
};
};
extraModules = [
{ name = "jk"; path = "${pkgs.tomcat_connectors}/modules/mod_jk.so"; }
];

4
pkgs/applications/audio/a2jmidid/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, alsaLib, dbus, jackaudio, pkgconfig, python }:
{ stdenv, fetchurl, alsaLib, dbus, jack2, pkgconfig, python }:
stdenv.mkDerivation rec {
name = "a2jmidid-${version}";
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "0pzm0qk5ilqhwz74pydg1jwrds27vm47185dakdrxidb5bv3b5ia";
};
buildInputs = [ alsaLib dbus jackaudio pkgconfig python ];
buildInputs = [ alsaLib dbus jack2 pkgconfig python ];
configurePhase = "python waf configure --prefix=$out";

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

@ -1,5 +1,5 @@
{ stdenv, fetchgit, alsaLib, aubio, boost, cairomm, curl, fftw
, fftwSinglePrec, flac, glibc, glibmm, gtk, gtkmm, jackaudio
, fftwSinglePrec, flac, glibc, glibmm, gtk, gtkmm, jack2
, libgnomecanvas, libgnomecanvasmm, liblo, libmad, libogg, librdf
, librdf_raptor, librdf_rasqal, libsamplerate, libsigcxx, libsndfile
, libusb, libuuid, libxml2, libxslt, lilv, lv2, makeWrapper, pango
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
buildInputs =
[ alsaLib aubio boost cairomm curl fftw fftwSinglePrec flac glibc
glibmm gtk gtkmm jackaudio libgnomecanvas libgnomecanvasmm liblo
glibmm gtk gtkmm jack2 libgnomecanvas libgnomecanvasmm liblo
libmad libogg librdf librdf_raptor librdf_rasqal libsamplerate
libsigcxx libsndfile libusb libuuid libxml2 libxslt lilv lv2
makeWrapper pango perl pkgconfig python serd sord sratom suil

4
pkgs/applications/audio/bristol/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, alsaLib, jackaudio, pkgconfig, pulseaudio, xlibs }:
{ stdenv, fetchurl, alsaLib, jack2, pkgconfig, pulseaudio, xlibs }:
stdenv.mkDerivation rec {
name = "bristol-${version}";
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [
alsaLib jackaudio pkgconfig pulseaudio xlibs.libX11 xlibs.libXext
alsaLib jack2 pkgconfig pulseaudio xlibs.libX11 xlibs.libXext
xlibs.xproto
];

4
pkgs/applications/audio/calf/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, cairo, expat, fftwSinglePrec, fluidsynth, glib
, gtk, jackaudio, ladspaH , libglade, lv2, pkgconfig }:
, gtk, jack2, ladspaH , libglade, lv2, pkgconfig }:
stdenv.mkDerivation rec {
name = "calf-${version}";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [
cairo expat fftwSinglePrec fluidsynth glib gtk jackaudio ladspaH
cairo expat fftwSinglePrec fluidsynth glib gtk jack2 ladspaH
libglade lv2 pkgconfig
];

4
pkgs/applications/audio/distrho/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchgit, alsaLib, fftwSinglePrec, freetype, jackaudio
{ stdenv, fetchgit, alsaLib, fftwSinglePrec, freetype, jack2
, libxslt, lv2, pkgconfig, premake3, xlibs }:
let
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
'';
buildInputs = [
alsaLib fftwSinglePrec freetype jackaudio pkgconfig premake3
alsaLib fftwSinglePrec freetype jack2 pkgconfig premake3
xlibs.libX11 xlibs.libXcomposite xlibs.libXcursor xlibs.libXext
xlibs.libXinerama xlibs.libXrender
];

4
pkgs/applications/audio/drumkv1/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, jackaudio, libsndfile, lv2, qt4 }:
{ stdenv, fetchurl, jack2, libsndfile, lv2, qt4 }:
stdenv.mkDerivation rec {
name = "drumkv1-${version}";
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "18rvfgblynlmklk25azmppibn1bdjid97hipa323gnzmxgq0rfjq";
};
buildInputs = [ jackaudio libsndfile lv2 qt4 ];
buildInputs = [ jack2 libsndfile lv2 qt4 ];
meta = with stdenv.lib; {
description = "An old-school drum-kit sampler synthesizer with stereo fx";

4
pkgs/applications/audio/fluidsynth/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, alsaLib, glib, jackaudio, libsndfile, pkgconfig
{ stdenv, fetchurl, alsaLib, glib, jack2, libsndfile, pkgconfig
, pulseaudio }:
stdenv.mkDerivation rec {
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
"-framework CoreAudio";
buildInputs = [ glib libsndfile pkgconfig ]
++ stdenv.lib.optionals (!stdenv.isDarwin) [ alsaLib pulseaudio jackaudio ];
++ stdenv.lib.optionals (!stdenv.isDarwin) [ alsaLib pulseaudio jack2 ];
meta = with stdenv.lib; {
description = "Real-time software synthesizer based on the SoundFont 2 specifications";

40
pkgs/applications/audio/gtkpod/default.nix
View File

@ -1,25 +1,43 @@
{ stdenv, fetchurl, pkgconfig, libgpod, gtk, glib, gettext, perl, perlXMLParser
, libglade, flex, libid3tag, libvorbis, intltool }:
{ stdenv, fetchurl, pkgconfig, makeWrapper, intltool, libgpod, curl, flac,
gnome3_12, gtk3, glib, gettext, perl, perlXMLParser , libglade, flex, libid3tag,
libvorbis, hicolor_icon_theme, gdk_pixbuf }:
stdenv.mkDerivation {
name = "gtkpod-1.0.0";
let
gnome = gnome3_12;
in stdenv.mkDerivation rec {
version = "2.1.4";
name = "gtkpod-${version}";
src = fetchurl {
url = mirror://sourceforge/gtkpod/gtkpod-1.0.0.tar.gz;
sha256 = "04jzybs55c27kyp7r9c58prcq0q4ssvj5iggva857f49s1ar826q";
url = "mirror://sourceforge/gtkpod/${name}.tar.gz";
sha256 = "ba12b35f3f24a155b68f0ffdaf4d3c5c7d1b8df04843a53306e1c83fc811dfaa";
};
buildInputs = [ pkgconfig libgpod gettext perl perlXMLParser gtk libglade flex
libid3tag libvorbis intltool ];
propagatedUserEnvPkgs = [ gnome.gnome_themes_standard ];
buildInputs = [ pkgconfig makeWrapper intltool curl gettext perl perlXMLParser
flex libgpod libid3tag flac libvorbis gtk3 gdk_pixbuf libglade gnome.anjuta
gnome.gdl gnome.gnome_icon_theme_symbolic gnome.gnome_icon_theme
hicolor_icon_theme ];
patchPhase = ''
sed -i 's/which/type -P/' scripts/*.sh
'';
meta = {
preFixup = ''
wrapProgram "$out/bin/gtkpod" \
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
'';
enableParallelBuilding = true;
meta = with stdenv.lib; {
description = "GTK Manager for an Apple ipod";
homepage = http://gtkpod.sourceforge.net;
license = stdenv.lib.licenses.gpl2Plus;
platforms = with stdenv.lib.platforms; linux;
license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = [ maintainers.skeidel ];
};
}

4
pkgs/applications/audio/guitarix/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, avahi, boost, fftw, gettext, glib, glibmm, gtk
, gtkmm, intltool, jackaudio, ladspaH, librdf, libsndfile, lv2
, gtkmm, intltool, jack2, ladspaH, librdf, libsndfile, lv2
, pkgconfig, python }:
stdenv.mkDerivation rec {
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [
avahi boost fftw gettext glib glibmm gtk gtkmm intltool jackaudio
avahi boost fftw gettext glib glibmm gtk gtkmm intltool jack2
ladspaH librdf libsndfile lv2 pkgconfig python
];

4
pkgs/applications/audio/hydrogen/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, alsaLib, boost, glib, jackaudio, ladspaPlugins
{ stdenv, fetchurl, alsaLib, boost, glib, jack2, ladspaPlugins
, libarchive, liblrdf , libsndfile, pkgconfig, qt4, scons, subversion }:
stdenv.mkDerivation rec {
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [
alsaLib boost glib jackaudio ladspaPlugins libarchive liblrdf
alsaLib boost glib jack2 ladspaPlugins libarchive liblrdf
libsndfile pkgconfig qt4 scons subversion
];

4
pkgs/applications/audio/ingen/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchsvn, boost, ganv, glibmm, gtk, gtkmm, jackaudio, lilv
{ stdenv, fetchsvn, boost, ganv, glibmm, gtk, gtkmm, jack2, lilv
, lv2, pkgconfig, python, raul, serd, sord, sratom, suil
}:
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [
boost ganv glibmm gtk gtkmm jackaudio lilv lv2 pkgconfig python
boost ganv glibmm gtk gtkmm jack2 lilv lv2 pkgconfig python
raul serd sord sratom suil
];

4
pkgs/applications/audio/jack-capture/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, jackaudio, libsndfile, pkgconfig }:
{ stdenv, fetchurl, jack2, libsndfile, pkgconfig }:
stdenv.mkDerivation rec {
name = "jack_capture-${version}";
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "0sk7b92my1v1g7rhkpl1c608rb0rdb28m9zqfll95kflxajd16zv";
};
buildInputs = [ jackaudio libsndfile pkgconfig ];
buildInputs = [ jack2 libsndfile pkgconfig ];
buildPhase = "PREFIX=$out make jack_capture";

4
pkgs/applications/audio/jack-oscrolloscope/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, SDL, jackaudio, mesa, pkgconfig }:
{ stdenv, fetchurl, SDL, jack2, mesa, pkgconfig }:
stdenv.mkDerivation rec {
name = "jack_oscrolloscope-${version}";
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "1pl55in0sj7h5r06n1v91im7d18pplvhbjhjm1fdl39zwnyxiash";
};
buildInputs = [ SDL jackaudio mesa pkgconfig ];
buildInputs = [ SDL jack2 mesa pkgconfig ];
installPhase = ''
mkdir -p $out/bin

4
pkgs/applications/audio/jack-rack/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, jackaudio, ladspaH, gtk, alsaLib, libxml2, librdf }:
{ stdenv, fetchurl, pkgconfig, jack2, ladspaH, gtk, alsaLib, libxml2, librdf }:
stdenv.mkDerivation rec {
name = "jack-rack-1.4.7";
src = fetchurl {
url = "mirror://sourceforge/jack-rack/${name}.tar.bz2";
sha256 = "1lmibx9gicagcpcisacj6qhq6i08lkl5x8szysjqvbgpxl9qg045";
};
buildInputs = [ pkgconfig jackaudio ladspaH gtk alsaLib libxml2 librdf ];
buildInputs = [ pkgconfig jack2 ladspaH gtk alsaLib libxml2 librdf ];
meta = {
description = ''An effects "rack" for the JACK low latency audio API'';

4
pkgs/applications/audio/jackmeter/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, jackaudio, pkgconfig }:
{ stdenv, fetchurl, jack2, pkgconfig }:
stdenv.mkDerivation rec {
name = "jackmeter-0.4";
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "1cnvgx3jv0yvxlqy0l9k285zgvazmh5k8m4l7lxckjfm5bn6hm1r";
};
buildInputs = [ jackaudio pkgconfig ];
buildInputs = [ jack2 pkgconfig ];
meta = {
description = "Console jack loudness meter";

4
pkgs/applications/audio/jalv/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, gtk, jackaudio, lilv, lv2, pkgconfig, python
{ stdenv, fetchurl, gtk, jack2, lilv, lv2, pkgconfig, python
, serd, sord , sratom, suil }:
stdenv.mkDerivation rec {
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [
gtk jackaudio lilv lv2 pkgconfig python serd sord sratom suil
gtk jack2 lilv lv2 pkgconfig python serd sord sratom suil
];
configurePhase = "python waf configure --prefix=$out";

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

@ -1,4 +1,4 @@
{ stdenv, fetchurl, alsaLib, gtk, jackaudio, libuuid, libxml2
{ stdenv, fetchurl, alsaLib, gtk, jack2, libuuid, libxml2
, makeWrapper, pkgconfig, readline }:
assert libuuid != null;
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
# http://permalink.gmane.org/gmane.linux.redhat.fedora.extras.cvs/822346
patches = [ ./socket.patch ./gcc-47.patch ];
buildInputs = [ alsaLib gtk jackaudio libuuid libxml2 makeWrapper
buildInputs = [ alsaLib gtk jack2 libuuid libxml2 makeWrapper
pkgconfig readline ];
postInstall = ''

4
pkgs/applications/audio/linuxsampler/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchsvn, alsaLib, asio, autoconf, automake, bison
, jackaudio, libgig, libsndfile, libtool, lv2, pkgconfig }:
, jack2, libgig, libsndfile, libtool, lv2, pkgconfig }:
stdenv.mkDerivation rec {
name = "linuxsampler-svn-${version}";
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
'';
buildInputs = [
alsaLib asio autoconf automake bison jackaudio libgig libsndfile
alsaLib asio autoconf automake bison jack2 libgig libsndfile
libtool lv2 pkgconfig
];

4
pkgs/applications/audio/lmms/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, SDL, alsaLib, cmake, fftwSinglePrec, jackaudio, libogg
{ stdenv, fetchurl, SDL, alsaLib, cmake, fftwSinglePrec, jack2, libogg
, libsamplerate, libsndfile, pkgconfig, pulseaudio, qt4
}:
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [
SDL alsaLib cmake fftwSinglePrec jackaudio libogg libsamplerate
SDL alsaLib cmake fftwSinglePrec jack2 libogg libsamplerate
libsndfile pkgconfig pulseaudio qt4
];

4
pkgs/applications/audio/mhwaveedit/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, SDL , alsaLib, gtk, jackaudio, ladspaH
{ stdenv, fetchurl, SDL , alsaLib, gtk, jack2, ladspaH
, ladspaPlugins, libsamplerate, libsndfile, pkgconfig, pulseaudio }:
stdenv.mkDerivation rec {
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
};
buildInputs =
[ SDL alsaLib gtk jackaudio ladspaH libsamplerate libsndfile
[ SDL alsaLib gtk jack2 ladspaH libsamplerate libsndfile
pkgconfig pulseaudio
];

4
pkgs/applications/audio/milkytracker/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, SDL, alsaLib, autoconf, automake, jackaudio, perl
{ stdenv, fetchurl, SDL, alsaLib, autoconf, automake, jack2, perl
, zlib, zziplib
}:
@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
export CPATH=${zlib}/lib
'';
buildInputs = [ SDL alsaLib autoconf automake jackaudio perl zlib zziplib ];
buildInputs = [ SDL alsaLib autoconf automake jack2 perl zlib zziplib ];
meta = {
description = "Music tracker application, similar to Fasttracker II.";

4
pkgs/applications/audio/moc/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, ncurses, pkgconfig, alsaLib, flac, libmad, speex, ffmpeg
, libvorbis, mpc, libsndfile, jackaudio, db, libmodplug, timidity, libid3tag
, libvorbis, mpc, libsndfile, jack2, db, libmodplug, timidity, libid3tag
, libtool
}:
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
buildInputs = [
ncurses pkgconfig alsaLib flac libmad speex ffmpeg libvorbis
mpc libsndfile jackaudio db libmodplug timidity libid3tag libtool
mpc libsndfile jack2 db libmodplug timidity libid3tag libtool
];
meta = {

4
pkgs/applications/audio/petrifoo/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchgit, alsaLib, cmake, gtk, jackaudio, libgnomecanvas
{ stdenv, fetchgit, alsaLib, cmake, gtk, jack2, libgnomecanvas
, libpthreadstubs, libsamplerate, libsndfile, libtool, libxml2
, pkgconfig }:
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
};
buildInputs =
[ alsaLib cmake gtk jackaudio libgnomecanvas libpthreadstubs
[ alsaLib cmake gtk jack2 libgnomecanvas libpthreadstubs
libsamplerate libsndfile libtool libxml2 pkgconfig
];

4
pkgs/applications/audio/projectm/default.nix
View File

@ -2,7 +2,7 @@
, glew, ftgl, ttf_bitstream_vera
, withQt ? true, qt4
, withLibvisual ? false, libvisual, SDL
, withJack ? false, jackaudio
, withJack ? false, jack2
, withPulseAudio ? true, pulseaudio
}:
@ -45,7 +45,7 @@ stdenv.mkDerivation {
[ glew ftgl ]
++ optional withQt qt4
++ optionals withLibvisual [ libvisual SDL ]
++ optional withJack jackaudio
++ optional withJack jack2
++ optional withPulseAudio pulseaudio
;
}

4
pkgs/applications/audio/puredata/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, autoreconfHook, gettext, makeWrapper
, alsaLib, jackaudio, tk
, alsaLib, jack2, tk
}:
stdenv.mkDerivation rec {
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook gettext makeWrapper ];
buildInputs = [ alsaLib jackaudio ];
buildInputs = [ alsaLib jack2 ];
configureFlags = ''
--enable-alsa

4
pkgs/applications/audio/qjackctl/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, qt4, alsaLib, jackaudio, dbus }:
{ stdenv, fetchurl, qt4, alsaLib, jack2, dbus }:
stdenv.mkDerivation rec {
version = "0.3.11";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "1wjzrgx3n2asyxk6cnfcm34msaw84qvsqy08bd4qnghrgpl96hwl";
};
buildInputs = [ qt4 alsaLib jackaudio dbus ];
buildInputs = [ qt4 alsaLib jack2 dbus ];
configureFlags = "--enable-jack-version";

4
pkgs/applications/audio/qsynth/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, alsaLib, fluidsynth, jackaudio, qt4 }:
{ stdenv, fetchurl, alsaLib, fluidsynth, jack2, qt4 }:
stdenv.mkDerivation rec {
name = "qsynth-${version}";
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "0wmq61cq93x2l00xwr871373mj3dwamz1dg6v62x7s8m1612ndrw";
};
buildInputs = [ alsaLib fluidsynth jackaudio qt4 ];
buildInputs = [ alsaLib fluidsynth jack2 qt4 ];
meta = with stdenv.lib; {
description = "Fluidsynth GUI";

4
pkgs/applications/audio/qtractor/default.nix
View File

@ -1,4 +1,4 @@
{ alsaLib, autoconf, automake, dssi, fetchurl, gtk, jackaudio
{ alsaLib, autoconf, automake, dssi, fetchurl, gtk, jack2
, ladspaH, ladspaPlugins, liblo, libmad, libsamplerate, libsndfile
, libtool, libvorbis, pkgconfig, qt4, rubberband, stdenv }:
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
};
buildInputs =
[ alsaLib autoconf automake dssi gtk jackaudio ladspaH
[ alsaLib autoconf automake dssi gtk jack2 ladspaH
ladspaPlugins liblo libmad libsamplerate libsndfile libtool
libvorbis pkgconfig qt4 rubberband
];

4
pkgs/applications/audio/rakarrack/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, alsaLib, alsaUtils, fltk, jackaudio, libXft,
{ stdenv, fetchurl, alsaLib, alsaUtils, fltk, jack2, libXft,
libXpm, libjpeg, libpng, libsamplerate, libsndfile, zlib }:
stdenv.mkDerivation rec {
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
patches = [ ./fltk-path.patch ];
buildInputs = [ alsaLib alsaUtils fltk jackaudio libXft libXpm libjpeg
buildInputs = [ alsaLib alsaUtils fltk jack2 libXft libXpm libjpeg
libpng libsamplerate libsndfile zlib ];
meta = with stdenv.lib; {

4
pkgs/applications/audio/samplv1/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, jackaudio, libsndfile, lv2, qt4 }:
{ stdenv, fetchurl, jack2, libsndfile, lv2, qt4 }:
stdenv.mkDerivation rec {
name = "samplv1-${version}";
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "1vr6jbqnsgdq3v2h1ndp4pirnil3119dqwlq0k0kdscmcskvb9j4";
};
buildInputs = [ jackaudio libsndfile lv2 qt4 ];
buildInputs = [ jack2 libsndfile lv2 qt4 ];
meta = with stdenv.lib; {
description = "An old-school all-digital polyphonic sampler synthesizer with stereo fx";

4
pkgs/applications/audio/seq24/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, alsaLib, gtkmm, jackaudio, pkgconfig }:
{ stdenv, fetchurl, alsaLib, gtkmm, jack2, pkgconfig }:
stdenv.mkDerivation rec {
name = "seq24-${version}";
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "07n80zj95i80vjmsflnlbqx5vv90qmp5f6a0zap8d30849l4y258";
};
buildInputs = [ alsaLib gtkmm jackaudio pkgconfig ];
buildInputs = [ alsaLib gtkmm jack2 pkgconfig ];
meta = with stdenv.lib; {
description = "minimal loop based midi sequencer";

4
pkgs/applications/audio/setbfree/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, alsaLib, freetype, ftgl, jackaudio, libX11, lv2
{ stdenv, fetchurl, alsaLib, freetype, ftgl, jack2, libX11, lv2
, mesa, pkgconfig, ttf_bitstream_vera
}:
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
'';
buildInputs = [
alsaLib freetype ftgl jackaudio libX11 lv2 mesa pkgconfig
alsaLib freetype ftgl jack2 libX11 lv2 mesa pkgconfig
ttf_bitstream_vera
];

4
pkgs/applications/audio/sonic-visualiser/default.nix
View File

@ -1,6 +1,6 @@
# TODO add plugins having various licenses, see http://www.vamp-plugins.org/download.html
{ stdenv, fetchurl, alsaLib, bzip2, fftw, jackaudio, libX11, liblo
{ stdenv, fetchurl, alsaLib, bzip2, fftw, jack2, libX11, liblo
, libmad, libogg, librdf, librdf_raptor, librdf_rasqal, libsamplerate
, libsndfile, pkgconfig, pulseaudio, qt5, redland
, rubberband, serd, sord, vampSDK
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
sord
pkgconfig
# optional
jackaudio
jack2
# portaudio
pulseaudio
libmad

4
pkgs/applications/audio/synthv1/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, qt4, jackaudio, lv2 }:
{ stdenv, fetchurl, qt4, jack2, lv2 }:
stdenv.mkDerivation rec {
name = "synthv1-${version}";
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "1r4fszbzwd0yfcch0mcsmh7781zw1317hiljn85w79721fs2m8hc";
};
buildInputs = [ qt4 jackaudio lv2 ];
buildInputs = [ qt4 jack2 lv2 ];
meta = with stdenv.lib; {
description = "An old-school 4-oscillator subtractive polyphonic synthesizer with stereo fx";

4
pkgs/applications/audio/vmpk/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, cmake, pkgconfig
, qt4, jackaudio
, qt4, jack2
}:
let
@ -22,5 +22,5 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ qt4 jackaudio ];
buildInputs = [ qt4 jack2 ];
}

4
pkgs/applications/audio/xsynth-dssi/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, alsaLib, autoconf, automake, dssi, gtk, jackaudio,
{ stdenv, fetchurl, alsaLib, autoconf, automake, dssi, gtk, jack2,
ladspaH, ladspaPlugins, liblo, pkgconfig }:
stdenv.mkDerivation rec {
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "00nwv2pqjbmxqdc6xdm0cljq6z05lv4y6bibmhz1kih9lm0lklnk";
};
buildInputs = [ alsaLib autoconf automake dssi gtk jackaudio ladspaH
buildInputs = [ alsaLib autoconf automake dssi gtk jack2 ladspaH
ladspaPlugins liblo pkgconfig ];
installPhase = ''

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

@ -1,5 +1,5 @@
{ stdenv, fetchurl, alsaLib, boost, cairo, cmake, fftwSinglePrec, fltk
, jackaudio, libsndfile, mesa, minixml, pkgconfig, zlib
, jack2, libsndfile, mesa, minixml, pkgconfig, zlib
}:
assert stdenv ? glibc;
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [
alsaLib boost cairo fftwSinglePrec fltk jackaudio libsndfile mesa
alsaLib boost cairo fftwSinglePrec fltk jack2 libsndfile mesa
minixml zlib
];

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

@ -1,4 +1,4 @@
{ stdenv, fetchurl, alsaLib, cmake, jackaudio, fftw, fltk13, minixml
{ stdenv, fetchurl, alsaLib, cmake, jack2, fftw, fltk13, minixml
, pkgconfig, zlib
}:
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "0kgmwyh4rhyqdfrdzhbzjjk2hzggkp9c4aac6sy3xv6cc1b5jjxq";
};
buildInputs = [ alsaLib jackaudio fftw fltk13 minixml zlib ];
buildInputs = [ alsaLib jack2 fftw fltk13 minixml zlib ];
nativeBuildInputs = [ cmake pkgconfig ];
meta = with stdenv.lib; {

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

@ -2,7 +2,7 @@
, ilmbase, libXi, libjpeg, libpng, libsamplerate, libsndfile
, libtiff, mesa, openal, opencolorio, openexr, openimageio, openjpeg, python
, zlib, fftw
, jackaudioSupport ? false, jackaudio
, jackaudioSupport ? false, jack2
}:
with lib;
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
[ SDL boost cmake ffmpeg gettext glew ilmbase libXi
libjpeg libpng libsamplerate libsndfile libtiff mesa openal
opencolorio openexr openimageio /* openjpeg */ python zlib fftw
] ++ optional jackaudioSupport jackaudio;
] ++ optional jackaudioSupport jack2;
postUnpack =
''

28
pkgs/applications/networking/instant-messengers/utox/default.nix Normal file
View File

@ -0,0 +1,28 @@
{ stdenv, fetchFromGitHub, pkgconfig, libtoxcore, dbus, libvpx, libX11, openal, freetype, libv4l
, libXrender, fontconfig, libXext, libXft }:
stdenv.mkDerivation rec {
name = "utox-dev";
src = fetchFromGitHub {
owner = "notsecure";
repo = "uTox";
rev = "d70f9bfb4ff8a156ec35803da6226b0ac8c47961";
sha256 = "10cvsg0phv0jsrdl3zkk339c4bzn3xc82q1x90h6gcnrbg4vzmp0";
};
buildInputs = [ pkgconfig libtoxcore dbus libvpx libX11 openal freetype
libv4l libXrender fontconfig libXext libXft ];
doCheck = false;
makeFlags = "DESTDIR=$(out)";
meta = with stdenv.lib; {
description = "Lightweight Tox client";
license = licenses.gpl3;
maintainers = with stdenv.lib.maintainers; [ iElectric ];
platforms = stdenv.lib.platforms.all;
};
}

99
pkgs/applications/networking/mailreaders/thunderbird/default.nix
View File

@ -1,9 +1,10 @@
{ stdenv, fetchurl, pkgconfig, gtk, perl, python, zip, unzip
, libIDL, dbus_glib, bzip2, alsaLib, nspr, yasm, mesa, nss
, libnotify, cairo, pixman, fontconfig
, libjpeg
, pythonPackages
{ stdenv, fetchurl, pkgconfig, m4, gtk, pango, perl, python, zip, libIDL
, libjpeg, libpng, zlib, dbus, dbus_glib, bzip2, xlibs
, freetype, fontconfig, file, alsaLib, nspr, nss, libnotify
, yasm, mesa, sqlite, unzip, makeWrapper, pysqlite
, hunspell, libevent, libstartup_notification, libvpx
, cairo, gstreamer, gst_plugins_base, icu
, debugBuild ? false
, # If you want the resulting program to call itself "Thunderbird"
# instead of "Shredder", enable this option. However, those
# binaries may not be distributed without permission from the
@ -12,59 +13,75 @@
enableOfficialBranding ? false
}:
let version = "17.0.11"; in
let verName = "${version}esr"; in
let version = "31.0"; in
let verName = "${version}"; in
stdenv.mkDerivation {
stdenv.mkDerivation rec {
name = "thunderbird-${verName}";
src = fetchurl {
url = "ftp://ftp.mozilla.org/pub/thunderbird/releases/${verName}/source/thunderbird-${verName}.source.tar.bz2";
sha256 = "1m2lph8x82kgxqzlyaxr1l1x7s4qnqfzfnqck4b777914mrv1mdp";
sha1 = "0fe6666fddd4db82ec2e389f30c5ea11d4f72be5";
};
#enableParallelBuilding = true;
buildInputs = # from firefox30Pkgs.xulrunner, but without gstreamer and libvpx
[ pkgconfig libpng gtk perl zip libIDL libjpeg zlib 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
hunspell libevent libstartup_notification cairo icu
] ++ [ m4 ];
buildInputs =
[ pkgconfig perl python zip unzip bzip2 gtk dbus_glib alsaLib libIDL nspr
libnotify cairo pixman fontconfig yasm mesa nss
libjpeg pythonPackages.sqlite3
];
configureFlags =
[ "--enable-application=mail"
"--enable-optimize"
"--with-pthreads"
"--disable-debug"
"--enable-strip"
"--with-pthreads"
configureFlags = [ "--enable-application=mail" ]
# from firefox30Pkgs.commonConfigureFlags, but without gstreamer and libvpx
++ [
"--with-system-jpeg"
#"--with-system-png"
"--with-system-zlib"
"--with-system-bz2"
"--with-system-nspr"
"--with-system-nss"
# Broken: https://bugzilla.mozilla.org/show_bug.cgi?id=722975
#"--enable-system-cairo"
"--with-system-libevent"
#"--with-system-libvpx"
"--with-system-png"
"--with-system-icu"
"--enable-system-ffi"
"--enable-system-hunspell"
"--enable-system-pixman"
"--enable-system-sqlite"
"--enable-system-cairo"
"--disable-gstreamer"
"--enable-startup-notification"
# "--enable-content-sandbox" # available since 26.0, but not much info available
# "--enable-content-sandbox-reporter" # keeping disabled for now
"--disable-crashreporter"
"--disable-necko-wifi"
"--disable-webm"
"--disable-tests"
"--enable-calendar"
"--disable-ogg"
"--disable-necko-wifi" # maybe we want to enable this at some point
"--disable-installer"
"--disable-updater"
"--disable-pulseaudio"
] ++ (if debugBuild then [ "--enable-debug" "--enable-profiling"]
else [ "--disable-debug" "--enable-release"
"--enable-optimize" "--enable-strip" ])
++ [
"--disable-javaxpcom"
"--enable-stdcxx-compat" # Avoid dependency on libstdc++ 4.7
]
++ stdenv.lib.optional enableOfficialBranding "--enable-official-branding";
# The Thunderbird Makefiles refer to the variables LIBXUL_DIST,
# prefix, and PREFIX in some places where they are not set. In
# particular, there are some linker flags like
# `-rpath-link=$(LIBXUL_DIST)/bin'. Since this expands to
# `-rpath-link=/bin', the build fails due to the purity checks in
# the ld wrapper. So disable the purity check for now.
preBuild = "NIX_ENFORCE_PURITY=0";
configurePhase = ''
patchShebangs .
# This doesn't work:
#makeFlags = "LIBXUL_DIST=$(out) prefix=$(out) PREFIX=$(out)";
echo '${stdenv.lib.concatMapStrings (s : "ac_add_options ${s}\n") configureFlags}' > .mozconfig
echo "ac_add_options --prefix='$out'" >> .mozconfig
echo "mk_add_options MOZ_MAKE_FLAGS='-j$NIX_BUILD_CORES'" >> .mozconfig
make ${makeFlags} configure
'';
makeFlags = "-f client.mk";
buildFlags = "build";
postInstall =
''
@ -84,7 +101,7 @@ stdenv.mkDerivation {
'';
meta = with stdenv.lib; {
description = "Mozilla Thunderbird, a full-featured email client";
description = "A full-featured e-mail client";
homepage = http://www.mozilla.org/thunderbird/;
license =
# Official branding implies thunderbird name and logo cannot be reuse,

6
pkgs/applications/networking/mumble/default.nix
View File

@ -1,12 +1,12 @@
{ stdenv, fetchurl, qt4, boost, protobuf, libsndfile
, speex, libopus, avahi, pkgconfig
, jackSupport ? false
, jackaudio ? null
, jack2 ? null
, speechdSupport ? false
, speechd ? null
}:
assert jackSupport -> jackaudio != null;
assert jackSupport -> jack2 != null;
assert speechdSupport -> speechd != null;
let
@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
buildInputs = [ qt4 boost protobuf libsndfile speex
libopus avahi pkgconfig ]
++ (optional jackSupport jackaudio)
++ (optional jackSupport jack2)
++ (optional speechdSupport speechd);
installPhase = ''

6
pkgs/applications/video/mplayer/default.nix
View File

@ -15,7 +15,7 @@
, speexSupport ? true, speex ? null
, theoraSupport ? true, libtheora ? null
, x264Support ? false, x264 ? null
, jackaudioSupport ? false, jackaudio ? null
, jackaudioSupport ? false, jack2 ? null
, pulseSupport ? false, pulseaudio ? null
, bs2bSupport ? false, libbs2b ? null
# For screenshots
@ -40,7 +40,7 @@ assert lameSupport -> lame != null;
assert speexSupport -> speex != null;
assert theoraSupport -> libtheora != null;
assert x264Support -> x264 != null;
assert jackaudioSupport -> jackaudio != null;
assert jackaudioSupport -> jack2 != null;
assert pulseSupport -> pulseaudio != null;
assert bs2bSupport -> libbs2b != null;
assert libpngSupport -> libpng != null;
@ -109,7 +109,7 @@ stdenv.mkDerivation rec {
++ optional dvdnavSupport libdvdnav
++ optional bluraySupport libbluray
++ optional cddaSupport cdparanoia
++ optional jackaudioSupport jackaudio
++ optional jackaudioSupport jack2
++ optionals amrSupport [ amrnb amrwb ]
++ optional x264Support x264
++ optional pulseSupport pulseaudio

6
pkgs/applications/video/mplayer2/default.nix
View File

@ -10,7 +10,7 @@
, bluraySupport ? true, libbluray ? null
, speexSupport ? true, speex ? null
, theoraSupport ? true, libtheora ? null
, jackaudioSupport ? false, jackaudio ? null
, jackaudioSupport ? false, jack2 ? null
, pulseSupport ? true, pulseaudio ? null
, bs2bSupport ? false, libbs2b ? null
# For screenshots
@ -28,7 +28,7 @@ assert dvdnavSupport -> libdvdnav != null;
assert bluraySupport -> libbluray != null;
assert speexSupport -> speex != null;
assert theoraSupport -> libtheora != null;
assert jackaudioSupport -> jackaudio != null;
assert jackaudioSupport -> jack2 != null;
assert pulseSupport -> pulseaudio != null;
assert bs2bSupport -> libbs2b != null;
assert libpngSupport -> libpng != null;
@ -89,7 +89,7 @@ stdenv.mkDerivation rec {
++ optional xineramaSupport libXinerama
++ optionals dvdnavSupport [ libdvdnav libdvdnav.libdvdread ]
++ optional bluraySupport libbluray
++ optional jackaudioSupport jackaudio
++ optional jackaudioSupport jack2
++ optional pulseSupport pulseaudio
++ optional screenSaverSupport libXScrnSaver
++ optional vdpauSupport libvdpau

6
pkgs/applications/video/mpv/default.nix
View File

@ -14,7 +14,7 @@
, bluraySupport ? true, libbluray ? null
, speexSupport ? true, speex ? null
, theoraSupport ? true, libtheora ? null
, jackaudioSupport ? true, jackaudio ? null
, jackaudioSupport ? true, jack2 ? null
, pulseSupport ? true, pulseaudio ? null
, bs2bSupport ? false, libbs2b ? null
# For screenshots
@ -36,7 +36,7 @@ assert dvdnavSupport -> libdvdnav != null;
assert bluraySupport -> libbluray != null;
assert speexSupport -> speex != null;
assert theoraSupport -> libtheora != null;
assert jackaudioSupport -> jackaudio != null;
assert jackaudioSupport -> jack2 != null;
assert pulseSupport -> pulseaudio != null;
assert bs2bSupport -> libbs2b != null;
assert libpngSupport -> libpng != null;
@ -74,7 +74,7 @@ stdenv.mkDerivation rec {
++ optional dvdreadSupport libdvdread
++ optionals dvdnavSupport [ libdvdnav libdvdnav.libdvdread ]
++ optional bluraySupport libbluray
++ optional jackaudioSupport jackaudio
++ optional jackaudioSupport jack2
++ optional pulseSupport pulseaudio
++ optional screenSaverSupport libXScrnSaver
++ optional vdpauSupport libvdpau

4
pkgs/applications/video/simplescreenrecorder/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, alsaLib, ffmpeg, jackaudio, libX11, libXext
{ stdenv, fetchurl, alsaLib, ffmpeg, jack2, libX11, libXext
, libXfixes, mesa, pkgconfig, pulseaudio, qt4
}:
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [
alsaLib ffmpeg jackaudio libX11 libXext libXfixes mesa pkgconfig
alsaLib ffmpeg jack2 libX11 libXext libXfixes mesa pkgconfig
pulseaudio qt4
];

4
pkgs/applications/video/vlc/default.nix
View File

@ -3,7 +3,7 @@
, pkgconfig, dbus, fribidi, qt4, freefont_ttf, libebml, libmatroska
, libvorbis, libtheora, speex, lua5, libgcrypt, libupnp
, libcaca, pulseaudio, flac, schroedinger, libxml2, librsvg
, mpeg2dec, udev, gnutls, avahi, libcddb, jackaudio, SDL, SDL_image
, mpeg2dec, udev, gnutls, avahi, libcddb, jack2, SDL, SDL_image
, libmtp, unzip, taglib, libkate, libtiger, libv4l, samba, liboggz
, libass, libva, libdvbpsi, libdc1394, libraw1394, libopus
, libvdpau
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
[ xz bzip2 perl zlib a52dec libmad faad2 ffmpeg alsaLib libdvdnav libdvdnav.libdvdread
libbluray dbus fribidi qt4 libvorbis libtheora speex lua5 libgcrypt
libupnp libcaca pulseaudio flac schroedinger libxml2 librsvg mpeg2dec
udev gnutls avahi libcddb jackaudio SDL SDL_image libmtp unzip taglib
udev gnutls avahi libcddb jack2 SDL SDL_image libmtp unzip taglib
libkate libtiger libv4l samba liboggz libass libdvbpsi libva
xlibs.xlibs xlibs.libXv xlibs.libXvMC xlibs.libXpm xlibs.xcbutilkeysyms
libdc1394 libraw1394 libopus libebml libmatroska libvdpau

7
pkgs/desktops/gnome-3/3.12/default.nix
View File

@ -215,6 +215,11 @@ rec {
seahorse = callPackage ./apps/seahorse { };
#### Dev http://ftp.gnome.org/pub/GNOME/devtools/
anjuta = callPackage ./devtools/anjuta { };
gdl = callPackage ./devtools/gdl { };
#### Misc -- other packages on http://ftp.gnome.org/pub/GNOME/sources/
@ -226,6 +231,8 @@ rec {
gitg = callPackage ./misc/gitg { };
libgda = callPackage ./misc/libgda { };
libgit2-glib = callPackage ./misc/libgit2-glib { };
libmediaart = callPackage ./misc/libmediaart { };

28
pkgs/desktops/gnome-3/3.12/devtools/anjuta/default.nix Normal file
View File

@ -0,0 +1,28 @@
{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, flex, bison, libxml2, intltool,
itstool, python }:
let
major = "3.13";
minor = "1";
in stdenv.mkDerivation rec {
version = "${major}.${minor}";
name = "anjuta-${version}";
src = fetchurl {
url = "mirror://gnome/sources/anjuta/${major}/${name}.tar.xz";
sha256 = "71bdad9a0e427d9481858eec40b9c1facef4b551d732023cc18a50019df4b78b";
};
enableParallelBuilding = true;
buildInputs = [ pkgconfig flex bison gtk3 libxml2 gnome3.gjs gnome3.gdl
gnome3.libgda gnome3.gtksourceview intltool itstool python ];
meta = with stdenv.lib; {
description = "Software development studio";
homepage = http://anjuta.org/;
license = licenses.gpl2;
platforms = platforms.linux;
};
}

24
pkgs/desktops/gnome-3/3.12/devtools/gdl/default.nix Normal file
View File

@ -0,0 +1,24 @@
{ stdenv, fetchurl, pkgconfig, libxml2, gtk3, intltool }:
let
major = "3.12";
minor = "0";
in stdenv.mkDerivation rec {
version = "${major}.${minor}";
name = "gdl-${version}";
src = fetchurl {
url = "https://download.gnome.org/sources/gdl/${major}/${name}.tar.xz";
sha256 = "4770f959f31ed5e616fe623c284e8dd6136e49902d19b6e37938d34be4f6b88d";
};
buildInputs = [ pkgconfig libxml2 gtk3 intltool ];
meta = with stdenv.lib; {
description = "Gnome docking library";
homepage = https://developer.gnome.org/gdl/;
license = [ licenses.gpl2 ];
platforms = platforms.linux;
};
}

30
pkgs/desktops/gnome-3/3.12/misc/libgda/default.nix Normal file
View File

@ -0,0 +1,30 @@
{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gtk3 }:
let
major = "5.2";
minor = "2";
in stdenv.mkDerivation rec {
version = "${major}.${minor}";
name = "libgda-${version}";
src = fetchurl {
url = "mirror://gnome/sources/libgda/${major}/${name}.tar.xz";
sha256 = "c9b8b1c32f1011e47b73c5dcf36649aaef2f1edaa5f5d75be20d9caadc2bc3e4";
};
configureFlags = [
"--enable-gi-system-install=no"
];
enableParallelBuilding = true;
buildInputs = [ pkgconfig intltool itstool libxml2 gtk3 ];
meta = with stdenv.lib; {
description = "Database access library";
homepage = http://www.gnome-db.org/;
license = [ licenses.lgpl2 licenses.gpl2 ];
platforms = platforms.linux;
};
}

4
pkgs/desktops/xfce/core/libxfce4util.nix
View File

@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
p_name = "libxfce4util";
ver_maj = "4.10";
ver_min = "0";
ver_min = "1";
src = fetchurl {
url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
sha256 = "13k0wwbbqvdmbj4xmk4nxdlgvrdgr5y6r3dk380mzfw053hzwy89";
sha256 = "1fygyq9dywa989z1vb3d8hj4fg5ai75lcrngnf2s60jwf6nx2b78";
};
name = "${p_name}-${ver_maj}.${ver_min}";

6
pkgs/desktops/xfce/core/xfce4-appfinder.nix
View File

@ -3,12 +3,12 @@
stdenv.mkDerivation rec {
p_name = "xfce4-appfinder";
ver_maj = "4.9"; # no 4.10 (stable) release yet
ver_min = "4";
ver_maj = "4.10";
ver_min = "1";
src = fetchurl {
url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
sha256 = "12lgrbd1n50w9n8xkpai98s2aw8vmjasrgypc57sp0x0qafsqaxq";
sha256 = "0xzbi1vvy724s7vljf4153h7s7zqqwg51bn9wirx4d33lzzp9vk5";
};
name = "${p_name}-${ver_maj}.${ver_min}";

307
pkgs/desktops/xfce/core/xfce4-power-manager-brightness.patch
View File

@ -1,307 +0,0 @@
From 05d12e12596512f7a31d3cdb4845a69dc2d4c611 Mon Sep 17 00:00:00 2001
From: Martin Matuska <martin@matuska.org>
Date: Tue, 23 Jul 2013 11:27:41 +0200
Subject: Change brightness level from glong to gint32
The "Backlight" RandR property is a 32-bit integer. This means that the int32 (gint32) type should be used to represent brightness levels. The attached patch does nothing else than changing the brightness level representation from glong to gint32. This fixes the screen auto-dimming issue and brightness panel plugin issue.
diff --git a/common/xfpm-brightness.c b/common/xfpm-brightness.c
index aa1ef33..f1524cb 100644
--- a/common/xfpm-brightness.c
+++ b/common/xfpm-brightness.c
@@ -92,11 +92,11 @@ out:
}
static gboolean
-xfpm_brightness_xrandr_get_level (XfpmBrightness *brightness, RROutput output, long *current)
+xfpm_brightness_xrandr_get_level (XfpmBrightness *brightness, RROutput output, gint32 *current)
{
unsigned long nitems;
unsigned long bytes_after;
- long *prop;
+ gint32 *prop;
Atom actual_type;
int actual_format;
gboolean ret = FALSE;
@@ -124,7 +124,7 @@ xfpm_brightness_xrandr_get_level (XfpmBrightness *brightness, RROutput output, l
}
static gboolean
-xfpm_brightness_xrandr_set_level (XfpmBrightness *brightness, RROutput output, long level)
+xfpm_brightness_xrandr_set_level (XfpmBrightness *brightness, RROutput output, gint32 level)
{
gboolean ret = TRUE;
@@ -137,7 +137,7 @@ xfpm_brightness_xrandr_set_level (XfpmBrightness *brightness, RROutput output, l
if ( gdk_error_trap_pop () )
{
- g_warning ("failed to XRRChangeOutputProperty for brightness %li", level);
+ g_warning ("failed to XRRChangeOutputProperty for brightness %d", level);
ret = FALSE;
}
@@ -225,11 +225,11 @@ xfpm_brightness_setup_xrandr (XfpmBrightness *brightness)
}
static gboolean
-xfpm_brightness_xrand_up (XfpmBrightness *brightness, glong *new_level)
+xfpm_brightness_xrand_up (XfpmBrightness *brightness, gint32 *new_level)
{
- long hw_level;
+ gint32 hw_level;
gboolean ret = FALSE;
- long set_level;
+ gint32 set_level;
ret = xfpm_brightness_xrandr_get_level (brightness, brightness->priv->output, &hw_level);
@@ -250,14 +250,14 @@ xfpm_brightness_xrand_up (XfpmBrightness *brightness, glong *new_level)
if ( !ret )
{
- g_warning ("xfpm_brightness_xrand_up failed for %li", set_level);
+ g_warning ("xfpm_brightness_xrand_up failed for %d", set_level);
return FALSE;
}
/* Nothing changed in the hardware*/
if ( *new_level == hw_level )
{
- g_warning ("xfpm_brightness_xrand_up did not change the hw level to %li", set_level);
+ g_warning ("xfpm_brightness_xrand_up did not change the hw level to %d", set_level);
return FALSE;
}
@@ -265,11 +265,11 @@ xfpm_brightness_xrand_up (XfpmBrightness *brightness, glong *new_level)
}
static gboolean
-xfpm_brightness_xrand_down (XfpmBrightness *brightness, long *new_level)
+xfpm_brightness_xrand_down (XfpmBrightness *brightness, gint32 *new_level)
{
- long hw_level;
+ gint32 hw_level;
gboolean ret;
- long set_level;
+ gint32 set_level;
ret = xfpm_brightness_xrandr_get_level (brightness, brightness->priv->output, &hw_level);
@@ -290,14 +290,14 @@ xfpm_brightness_xrand_down (XfpmBrightness *brightness, long *new_level)
if ( !ret )
{
- g_warning ("xfpm_brightness_xrand_down failed for %li", set_level);
+ g_warning ("xfpm_brightness_xrand_down failed for %d", set_level);
return FALSE;
}
/* Nothing changed in the hardware*/
if ( *new_level == hw_level )
{
- g_warning ("xfpm_brightness_xrand_down did not change the hw level to %li", set_level);
+ g_warning ("xfpm_brightness_xrand_down did not change the hw level to %d", set_level);
return FALSE;
}
@@ -361,7 +361,7 @@ xfpm_brightness_setup_helper (XfpmBrightness *brightness)
}
static gboolean
-xfpm_brightness_helper_get_level (XfpmBrightness *brg, glong *level)
+xfpm_brightness_helper_get_level (XfpmBrightness *brg, gint32 *level)
{
int ret;
@@ -406,11 +406,11 @@ out:
}
static gboolean
-xfpm_brightness_helper_up (XfpmBrightness *brightness, glong *new_level)
+xfpm_brightness_helper_up (XfpmBrightness *brightness, gint32 *new_level)
{
- glong hw_level;
+ gint32 hw_level;
gboolean ret = FALSE;
- gint set_level;
+ gint32 set_level;
ret = xfpm_brightness_helper_get_level (brightness, &hw_level);
@@ -446,11 +446,11 @@ xfpm_brightness_helper_up (XfpmBrightness *brightness, glong *new_level)
}
static gboolean
-xfpm_brightness_helper_down (XfpmBrightness *brightness, glong *new_level)
+xfpm_brightness_helper_down (XfpmBrightness *brightness, gint32 *new_level)
{
- glong hw_level;
+ gint32 hw_level;
gboolean ret;
- gint set_level;
+ gint32 set_level;
ret = xfpm_brightness_helper_get_level (brightness, &hw_level);
@@ -572,7 +572,7 @@ xfpm_brightness_setup (XfpmBrightness *brightness)
return FALSE;
}
-gboolean xfpm_brightness_up (XfpmBrightness *brightness, glong *new_level)
+gboolean xfpm_brightness_up (XfpmBrightness *brightness, gint32 *new_level)
{
gboolean ret = FALSE;
@@ -589,7 +589,7 @@ gboolean xfpm_brightness_up (XfpmBrightness *brightness, glong *new_level)
return ret;
}
-gboolean xfpm_brightness_down (XfpmBrightness *brightness, glong *new_level)
+gboolean xfpm_brightness_down (XfpmBrightness *brightness, gint32 *new_level)
{
gboolean ret = FALSE;
@@ -618,7 +618,7 @@ gint xfpm_brightness_get_max_level (XfpmBrightness *brightness)
return brightness->priv->max_level;
}
-gboolean xfpm_brightness_get_level (XfpmBrightness *brightness, glong *level)
+gboolean xfpm_brightness_get_level (XfpmBrightness *brightness, gint32 *level)
{
gboolean ret = FALSE;
@@ -632,7 +632,7 @@ gboolean xfpm_brightness_get_level (XfpmBrightness *brightness, glong *level)
return ret;
}
-gboolean xfpm_brightness_set_level (XfpmBrightness *brightness, glong level)
+gboolean xfpm_brightness_set_level (XfpmBrightness *brightness, gint32 level)
{
gboolean ret = FALSE;
diff --git a/common/xfpm-brightness.h b/common/xfpm-brightness.h
index 0c4e3ed..26b3dbe 100644
--- a/common/xfpm-brightness.h
+++ b/common/xfpm-brightness.h
@@ -51,20 +51,20 @@ XfpmBrightness *xfpm_brightness_new (void);
gboolean xfpm_brightness_setup (XfpmBrightness *brightness);
gboolean xfpm_brightness_up (XfpmBrightness *brightness,
- glong *new_level);
+ gint32 *new_level);
gboolean xfpm_brightness_down (XfpmBrightness *brightness,
- glong *new_level);
+ gint32 *new_level);
gboolean xfpm_brightness_has_hw (XfpmBrightness *brightness);
gint xfpm_brightness_get_max_level (XfpmBrightness *brightness);
gboolean xfpm_brightness_get_level (XfpmBrightness *brightness,
- glong *level);
+ gint32 *level);
gboolean xfpm_brightness_set_level (XfpmBrightness *brightness,
- glong level);
+ gint32 level);
gboolean xfpm_brightness_dim_down (XfpmBrightness *brightness);
diff --git a/panel-plugins/brightness/brightness-button.c b/panel-plugins/brightness/brightness-button.c
index 6e60c29..bd466c9 100644
--- a/panel-plugins/brightness/brightness-button.c
+++ b/panel-plugins/brightness/brightness-button.c
@@ -186,7 +186,7 @@ static gboolean
brightness_button_popup_win (GtkWidget *widget, GdkEvent *ev, guint32 ev_time)
{
gint x, y;
- glong current_level = 0;
+ gint32 current_level = 0;
GdkDisplay *display;
GdkScreen *screen;
BrightnessButton *button;
@@ -342,7 +342,7 @@ plus_clicked (GtkWidget *widget, BrightnessButton *button)
static void
range_value_changed (GtkWidget *widget, BrightnessButton *button)
{
- glong range_level, hw_level;
+ gint32 range_level, hw_level;
range_level = (gint) gtk_range_get_value (GTK_RANGE (button->priv->range));
@@ -428,8 +428,8 @@ brightness_button_create_popup (BrightnessButton *button)
static void
brightness_button_up (BrightnessButton *button)
{
- glong level;
- glong max_level;
+ gint32 level;
+ gint32 max_level;
xfpm_brightness_get_level (button->priv->brightness, &level);
max_level = xfpm_brightness_get_max_level (button->priv->brightness);
@@ -443,7 +443,7 @@ brightness_button_up (BrightnessButton *button)
static void
brightness_button_down (BrightnessButton *button)
{
- glong level;
+ gint32 level;
xfpm_brightness_get_level (button->priv->brightness, &level);
if ( level != 0 )
diff --git a/src/xfpm-backlight.c b/src/xfpm-backlight.c
index baeeb43..45c990f 100644
--- a/src/xfpm-backlight.c
+++ b/src/xfpm-backlight.c
@@ -63,8 +63,8 @@ struct XfpmBacklightPrivate
gboolean has_hw;
gboolean on_battery;
- glong last_level;
- glong max_level;
+ gint32 last_level;
+ gint32 max_level;
gboolean dimmed;
gboolean block;
@@ -79,7 +79,7 @@ xfpm_backlight_dim_brightness (XfpmBacklight *backlight)
if (xfpm_power_get_mode (backlight->priv->power) == XFPM_POWER_MODE_NORMAL )
{
- glong dim_level;
+ gint32 dim_level;
g_object_get (G_OBJECT (backlight->priv->conf),
backlight->priv->on_battery ? BRIGHTNESS_LEVEL_ON_BATTERY : BRIGHTNESS_LEVEL_ON_AC, &dim_level,
@@ -101,7 +101,7 @@ xfpm_backlight_dim_brightness (XfpmBacklight *backlight)
**/
if (backlight->priv->last_level > dim_level)
{
- XFPM_DEBUG ("Current brightness level before dimming : %li, new %li", backlight->priv->last_level, dim_level);
+ XFPM_DEBUG ("Current brightness level before dimming : %d, new %d", backlight->priv->last_level, dim_level);
backlight->priv->dimmed = xfpm_brightness_set_level (backlight->priv->brightness, dim_level);
}
}
@@ -182,7 +182,7 @@ xfpm_backlight_reset_cb (EggIdletime *idle, XfpmBacklight *backlight)
{
if ( !backlight->priv->block)
{
- XFPM_DEBUG ("Alarm reset, setting level to %li", backlight->priv->last_level);
+ XFPM_DEBUG ("Alarm reset, setting level to %d", backlight->priv->last_level);
xfpm_brightness_set_level (backlight->priv->brightness, backlight->priv->last_level);
}
backlight->priv->dimmed = FALSE;
@@ -192,7 +192,7 @@ xfpm_backlight_reset_cb (EggIdletime *idle, XfpmBacklight *backlight)
static void
xfpm_backlight_button_pressed_cb (XfpmButton *button, XfpmButtonKey type, XfpmBacklight *backlight)
{
- glong level;
+ gint32 level;
gboolean ret = TRUE;
gboolean enable_brightness, show_popup;
--
cgit v0.10.1

10
pkgs/desktops/xfce/core/xfce4-power-manager.nix
View File

@ -1,26 +1,24 @@
{ stdenv, fetchurl, pkgconfig, intltool, gtk, dbus_glib, xfconf
{ stdenv, fetchurl, pkgconfig, intltool, gtk, dbus_glib, upower, xfconf
, libxfce4ui, libxfce4util, libnotify, xfce4panel }:
stdenv.mkDerivation rec {
p_name = "xfce4-power-manager";
ver_maj = "1.2";
ver_maj = "1.3";
ver_min = "0";
src = fetchurl {
url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
sha256 = "1sc4f4wci5yl3l9lk7vcsbwj6hdjshbxw9qm43s64jr882jriyyp";
sha256 = "1q0mnj9hjqw4zpk7wqnfayy6zzbjbhzd1mcplfjik2h753gaxgh5";
};
name = "${p_name}-${ver_maj}.${ver_min}";
buildInputs =
[ pkgconfig intltool gtk dbus_glib xfconf libxfce4ui libxfce4util
[ pkgconfig intltool gtk dbus_glib upower xfconf libxfce4ui libxfce4util
libnotify xfce4panel
];
preFixup = "rm $out/share/icons/hicolor/icon-theme.cache";
patches = ./xfce4-power-manager-brightness.patch;
meta = {
homepage = http://goodies.xfce.org/projects/applications/xfce4-power-manager;
description = "A power manager for the Xfce Desktop Environment";

6
pkgs/development/compilers/agda/2.4.0.1.nix → pkgs/development/compilers/agda/2.4.0.2.nix
View File

@ -1,3 +1,5 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, alex, binary, boxes, dataHash, deepseq, emacs, equivalence
, filepath, geniplate, happy, hashable, hashtables, haskeline
, haskellSrcExts, mtl, parallel, QuickCheck, STMonadTrans, strict
@ -6,8 +8,8 @@
cabal.mkDerivation (self: {
pname = "Agda";
version = "2.4.0.1";
sha256 = "11my5k606zvra3w3m1wllc4dy5mfv4lr32fqd579vqcks6wpirjq";
version = "2.4.0.2";
sha256 = "13c4ipscnlnbv94k93yajrp32mwzikqa8rhc95h8pmqzhjgwyh8b";
isLibrary = true;
isExecutable = true;
buildDepends = [

2
pkgs/development/compilers/idris/default.nix
View File

@ -15,7 +15,6 @@ cabal.mkDerivation (self: {
sha256 = "11x4f0hvd51m9rlf9r0i5xsjmc73kjsayny4xyv0wgb88v9v737b";
isLibrary = true;
isExecutable = true;
jailbreak = true;
buildDepends = [
annotatedWlPprint ansiTerminal ansiWlPprint base64Bytestring binary
blazeHtml blazeMarkup Cabal cheapskate deepseq filepath fingertree
@ -27,6 +26,7 @@ cabal.mkDerivation (self: {
buildTools = [ happy ];
extraLibraries = [ boehmgc gmp ];
configureFlags = "-fllvm -fgmp -fffi";
jailbreak = true;
meta = {
homepage = "http://www.idris-lang.org/";
description = "Functional Programming Language with Dependent Types";

4
pkgs/development/interpreters/octave/default.nix
View File

@ -6,13 +6,13 @@ fftw, fftwSinglePrec, zlib, curl, qrupdate
}:
let
version = "3.8.0";
version = "3.8.1";
in
stdenv.mkDerivation rec {
name = "octave-${version}";
src = fetchurl {
url = "mirror://gnu/octave/${name}.tar.bz2";
sha256 = "1yclb8p4mcx9xcjajyynxfnc5spw90lp44d84v56ksrlvp3314si";
sha256 = "1gcvzbgyz98mxzy3gjkdbdiirafkl73l9ywml11j412amp92wxnn";
};
buildInputs = [ gfortran readline ncurses perl flex texinfo qhull libX11

4
pkgs/development/interpreters/supercollider/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, cmake, pkgconfig
, jackaudio, libsndfile, fftw, curl
, jack2, libsndfile, fftw, curl
, libXt, qt, readline
, useSCEL ? false, emacs
}:
@ -35,6 +35,6 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [
jackaudio libsndfile fftw curl libXt qt readline ]
jack2 libsndfile fftw curl libXt qt readline ]
++ optional useSCEL emacs;
}

4
pkgs/development/libraries/aubio/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, alsaLib, fftw, jackaudio, libsamplerate
{ stdenv, fetchurl, alsaLib, fftw, jack2, libsamplerate
, libsndfile, pkgconfig, python
}:
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [
alsaLib fftw jackaudio libsamplerate libsndfile pkgconfig python
alsaLib fftw jack2 libsamplerate libsndfile pkgconfig python
];
configurePhase = "python waf configure --prefix=$out";

2
pkgs/development/libraries/dssi/default.nix
View File

@ -1,5 +1,5 @@
x@{builderDefsPackage
, ladspaH, jackaudio, liblo, alsaLib, qt4, libX11, libsndfile, libSM
, ladspaH, jack2, liblo, alsaLib, qt4, libX11, libsndfile, libSM
, libsamplerate, libtool, autoconf, automake, xproto, libICE, pkgconfig
, ...}:
builderDefsPackage

4
pkgs/development/libraries/haskell/GLUtil/default.nix
View File

@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "GLUtil";
version = "0.7.5";
sha256 = "1rbnq1nrs2b06ph60lh0yvygk82vvnm8c4d0anhjrqw9i58nd3iz";
version = "0.8";
sha256 = "00r9gmwsb9gx6bcc012rhz0z0hj3my8k1i0yjnaw0jmlqswm45h8";
buildDepends = [
cpphs JuicyPixels linear OpenGL OpenGLRaw transformers vector
];

4
pkgs/development/libraries/haskell/cgrep/default.nix
View File

@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "cgrep";
version = "6.4.4";
sha256 = "1czy9skv3jcfljwxml4nprmsxq70pav7mqhk92jg5wj1klgrz21k";
version = "6.4.5";
sha256 = "0pp3gfy8dvdbv40vfy3dhqymjp0knnbzv9hmbc18f3s8zpy4lis0";
isLibrary = false;
isExecutable = true;
buildDepends = [

4
pkgs/development/libraries/haskell/fay-base/default.nix
View File

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "fay-base";
version = "0.19.1.2";
sha256 = "0y2gpyh0gama6mz0rfvqdgpf7wfwx7r8k0cdfh60kjcxr029dx5i";
version = "0.19.2";
sha256 = "08iv3097h877hxbmpmar1p526famm5pb1djq3qwla3bkqrzxgmf4";
buildDepends = [ fay ];
meta = {
homepage = "https://github.com/faylang/fay-base";

4
pkgs/development/libraries/haskell/hackage-db/default.nix
View File

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "hackage-db";
version = "1.7";
sha256 = "0mf22xxbcbjb7l4jahknp6s7lsfn43ib7z9m2jsg9py92vkacfp1";
version = "1.8";
sha256 = "0iav085xq4d6k9z0x7jlnw3r3wwnzbr7ygbaqnblj6mcpnps9r3q";
buildDepends = [ Cabal filepath tar utf8String ];
meta = {
homepage = "http://github.com/peti/hackage-db";

4
pkgs/development/libraries/haskell/jack/default.nix
View File

@ -1,6 +1,6 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, enumset, eventList, explicitException, jackaudio, midi
{ cabal, enumset, eventList, explicitException, jack2, midi
, nonNegative, transformers
}:
@ -13,7 +13,7 @@ cabal.mkDerivation (self: {
buildDepends = [
enumset eventList explicitException midi nonNegative transformers
];
pkgconfigDepends = [ jackaudio ];
pkgconfigDepends = [ jack2 ];
meta = {
homepage = "http://www.haskell.org/haskellwiki/JACK";
description = "Bindings for the JACK Audio Connection Kit";

4
pkgs/development/libraries/haskell/lens/default.nix
View File

@ -12,8 +12,8 @@
cabal.mkDerivation (self: {
pname = "lens";
version = "4.3.2";
sha256 = "0bkdiggw3lzq18ijl9md0v6j847hx4qda0sqf9l6plf0b8yirryj";
version = "4.3.3";
sha256 = "0k7qslnh15xnrj86wwsp0mvz6g363ma4g0dxkmvvg4sa1bxljr1f";
buildDepends = [
aeson attoparsec bifunctors comonad contravariant distributive
exceptions filepath free hashable mtl parallel primitive

19
pkgs/development/libraries/haskell/liblastfm/default.nix
View File

@ -1,16 +1,23 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, aeson, cereal, contravariant, cryptoApi, httpConduit
, httpTypes, network, pureMD5, semigroups, tagged, text, void
{ cabal, aeson, cereal, contravariant, cryptoApi, hspec
, hspecExpectationsLens, httpClient, httpClientTls, HUnit, lens
, network, profunctors, pureMD5, semigroups, text, void, xmlConduit
, xmlHtmlConduitLens
}:
cabal.mkDerivation (self: {
pname = "liblastfm";
version = "0.3.2.0";
sha256 = "09xsjkwknfvdd3zb7a1qbch45ri6knkn33wl6xbi48sw5i79lxnv";
version = "0.4.0.0";
sha256 = "0dr1nvb7sxlp1fihvnwz9lyfmaynbj39npah2ndvlgnzz670j0z9";
buildDepends = [
aeson cereal contravariant cryptoApi httpConduit httpTypes network
pureMD5 semigroups tagged text void
aeson cereal contravariant cryptoApi httpClient httpClientTls
network profunctors pureMD5 semigroups text void xmlConduit
];
testDepends = [
aeson cereal contravariant cryptoApi hspec hspecExpectationsLens
httpClient httpClientTls HUnit lens network profunctors pureMD5
text void xmlConduit xmlHtmlConduitLens
];
meta = {
description = "Lastfm API interface";

4
pkgs/development/libraries/haskell/network-simple/default.nix
View File

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "network-simple";
version = "0.4";
sha256 = "1jw0xd53c0mydh6jm6627c0d8w014r1s46fycdhavnimh7bb77cp";
version = "0.4.0.1";
sha256 = "113vaxgsfny9iv6hnbywk97qr1y6qkap49p803anakamss4bdmyj";
buildDepends = [ exceptions network transformers ];
jailbreak = true;
meta = {

4
pkgs/development/libraries/haskell/optparse-applicative/default.nix
View File

@ -7,8 +7,8 @@
cabal.mkDerivation (self: {
pname = "optparse-applicative";
version = "0.9.0";
sha256 = "1nmwrg74wz8k3zwgw5aaf7padkawi0dlrclq6nsr17xz5yx524ay";
version = "0.9.1.1";
sha256 = "1fy8839y9dg2a5pj7abjiqkm3qcz8faip32q3x1zi5mrz4v3q2g6";
buildDepends = [ ansiWlPprint transformers transformersCompat ];
testDepends = [
HUnit QuickCheck testFramework testFrameworkHunit

4
pkgs/development/libraries/haskell/pipes-network/default.nix
View File

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "pipes-network";
version = "0.6.3";
sha256 = "09gihca0hinq3sqsx9753gmas6g22pg792ag6ckdw5z3607razrg";
version = "0.6.4";
sha256 = "1wabyv5j4q0wxiz8ry7dq3amlvfh4r0721pd2lksx7hj3a5qzm2p";
buildDepends = [
network networkSimple pipes pipesSafe transformers
];

4
pkgs/development/libraries/haskell/profunctors/default.nix
View File

@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = "profunctors";
version = "4.2";
sha256 = "0ikbp88798q7hdvi5vpc68q5bblsh43g9xnlwrifrn5fp3x3lq56";
version = "4.2.0.1";
sha256 = "00cfria3zjijx9nm533a25x240c7q0sn9vna6m4y4rz1f7l2gnqc";
buildDepends = [
comonad distributive semigroupoids tagged transformers
];

4
pkgs/development/libraries/haskell/resourcet/default.nix
View File

@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "resourcet";
version = "1.1.2.2";
sha256 = "1j468zkjd7j2xpgzx1i36h3lpamnqpk0rj3miwfr9a0ibm7bz1as";
version = "1.1.2.3";
sha256 = "1n1z1q3k8lg3wqdkrmcfl9mvlx1p81gkh5j911w1006rnm8r87im";
buildDepends = [
exceptions liftedBase mmorph monadControl mtl transformers
transformersBase

4
pkgs/development/libraries/haskell/semigroupoids/default.nix
View File

@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "semigroupoids";
version = "4.0.4";
sha256 = "0yk536pbjblncpjinl739lppxsvb0w7z3hgrj43c0dqam0dyr38r";
version = "4.2";
sha256 = "18zip518f2l2ccmg3hjzy5mq2b8r98crzm10kr77yc4m64w5vac8";
buildDepends = [
comonad contravariant distributive semigroups transformers
];

4
pkgs/development/libraries/haskell/snaplet-redis/default.nix
View File

@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "snaplet-redis";
version = "0.1.3.2";
sha256 = "0554farc76ncbynzks4ryi7a2nbahsgnjvazmw5n9b79cp207bjf";
version = "0.1.3.3";
sha256 = "17w2b9cnri45m535hyszb1fickhhglid3zy5a4bbljmnwvi4y08l";
buildDepends = [
configurator hedis lens mtl network snap transformers
];

4
pkgs/development/libraries/haskell/vty/5.1.3.nix → pkgs/development/libraries/haskell/vty/5.1.4.nix
View File

@ -9,8 +9,8 @@
cabal.mkDerivation (self: {
pname = "vty";
version = "5.1.3";
sha256 = "0li20ypydal2xab5hpcwi2az78j2hsdwfx3cv7hinsc55w08wchj";
version = "5.1.4";
sha256 = "157saacy6lp2ngl0dz9ri4ji1vj191d1239x1xykna8y618r0vqf";
isLibrary = true;
isExecutable = true;
buildDepends = [

21
pkgs/development/libraries/haskell/xml-html-conduit-lens/default.nix Normal file
View File

@ -0,0 +1,21 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, doctest, hspec, hspecExpectationsLens, htmlConduit, lens
, text, xmlConduit
}:
cabal.mkDerivation (self: {
pname = "xml-html-conduit-lens";
version = "0.3.2.0";
sha256 = "150b772wkl2k8xcrcbqj3qhndjkl35qzwqdjbgs9mxp867aihiv0";
buildDepends = [ htmlConduit lens text xmlConduit ];
testDepends = [
doctest hspec hspecExpectationsLens lens xmlConduit
];
meta = {
homepage = "https://github.com/supki/xml-html-conduit-lens#readme";
description = "Optics for xml-conduit and html-conduit";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

4
pkgs/development/libraries/haskell/yesod-core/default.nix
View File

@ -13,8 +13,8 @@
cabal.mkDerivation (self: {
pname = "yesod-core";
version = "1.2.18";
sha256 = "08d62wjx8smvi75490fp2f5ayv5jsgkxqi33lqhv9lxgv3ckk8vi";
version = "1.2.19";
sha256 = "0dlvg8zpr1qyav3svqybsqsrmrl9n8s1kdzxf6zxa3pn582d48il";
buildDepends = [
aeson attoparsecConduit blazeBuilder blazeHtml blazeMarkup
caseInsensitive cereal clientsession conduit conduitExtra cookie

4
pkgs/development/libraries/haskell/yesod-form/default.nix
View File

@ -9,8 +9,8 @@
cabal.mkDerivation (self: {
pname = "yesod-form";
version = "1.3.13";
sha256 = "1asywf0a75gj3d55g700132m49mglim23kxqczrx10ll1k076sfw";
version = "1.3.14";
sha256 = "0a2xlar67f0y48zqml8kqjna33i474j3j04gmgglsfmk1wikr7sh";
buildDepends = [
aeson attoparsec blazeBuilder blazeHtml blazeMarkup byteable
dataDefault emailValidate hamlet network persistent resourcet

6
pkgs/development/libraries/libav/default.nix
View File

@ -26,9 +26,9 @@ with { inherit (stdenv.lib) optional optionals; };
let
result = {
libav_0_8 = libavFun "0.8.12" "0069zv9s0f4silzdyjac87g7a89jhh27sadd1zcr9xngxbvd93fr";
libav_9 = libavFun "9.13" "1jp6vlza5srks1scgl000x9y1y0l88inrcby4yxv6n92rpv5vw1g";
libav_10 = libavFun "10.1" "05cy1yq9rxarajs9gfdhkji8gmcpar125xi8lrx4cfplmp4lvq6m";
libav_0_8 = libavFun "0.8.13" "1fr3rzykrlm1cla0csm9hqa3gcqp19hf5rgn70nyb9w92r67v685";
libav_9 = libavFun "9.14" "07gn4lbqx6wfhb2h2ddj88hcsacwmzb4syalg211m55xmp1g1fp4";
libav_10 = libavFun "10.2" "06wvk51cnllw6367qagc90sva4jr5d0r6jx8183wcwzwzgv01w29";
};
libavFun = version : sha256 : stdenv.mkDerivation rec {

29
pkgs/development/libraries/libid3tag/default.nix
View File

@ -1,7 +1,10 @@
{stdenv, fetchurl, zlib, gperf}:
{stdenv, fetchurl, writeText, zlib, gperf}:
stdenv.mkDerivation rec {
version = "0.15.1b";
name = "libid3tag-${version}";
stdenv.mkDerivation {
name = "libid3tag-0.15.1b";
src = fetchurl {
url = mirror://sourceforge/mad/libid3tag-0.15.1b.tar.gz;
sha256 = "63da4f6e7997278f8a3fef4c6a372d342f705051d1eeb6a46a86b03610e26151";
@ -11,6 +14,26 @@ stdenv.mkDerivation {
patches = [ ./debian-patches.patch ];
postInstall = let pkgconfigFile = writeText "id3tag.pc" ''
prefix=@out@
exec_prefix=''${prefix}
libdir=''${exec_prefix}/lib
includedir=''${exec_prefix}/include
Name: libid3tag
Description: ID3 tag manipulation library
Version: ${version}
Libs: -L''${libdir} -lid3tag
Cflags: -I''${includedir}
'';
in ''
ensureDir $out/share/pkgconfig
cp ${pkgconfigFile} $out/share/pkgconfig/id3tag.pc
substituteInPlace $out/share/pkgconfig/id3tag.pc \
--subst-var-by out $out
'';
meta = with stdenv.lib; {
description = "ID3 tag manipulation library";
homepage = http://mad.sourceforge.net/;

4
pkgs/development/libraries/mlt/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, SDL, frei0r, jackaudio, libav, libdv, libsamplerate
{ stdenv, fetchurl, SDL, frei0r, jack2, libav, libdv, libsamplerate
, libvorbis, libxml2, makeWrapper, movit, pkgconfig, qt, sox
}:
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [
SDL frei0r jackaudio libav libdv libsamplerate libvorbis libxml2
SDL frei0r jack2 libav libdv libsamplerate libvorbis libxml2
makeWrapper movit pkgconfig qt sox
];

4
pkgs/development/tools/haskell/cabal2nix/default.nix
View File

@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = "cabal2nix";
version = "1.66";
sha256 = "1is72jfv6snz59jpmg7dfcinpi3q4kdiqchd7zf45rqrszd5h43p";
version = "1.67";
sha256 = "1l614lx5l3rhn0jvs45is9m8bil32ms5lb74j30ialv3qnjsvjnv";
isLibrary = false;
isExecutable = true;
buildDepends = [ Cabal filepath hackageDb HTTP mtl regexPosix ];

4
pkgs/development/tools/misc/lttng-tools/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, popt, libuuid, liburcu, lttngUst, kmod }:
{ stdenv, fetchurl, popt, libuuid, liburcu, lttng-ust, kmod }:
stdenv.mkDerivation rec {
name = "lttng-tools-2.4.1";
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "1v9f7a3c2shwgn4g759bblgr27h9ql9sfq71r1mbkf8rd235g2jr";
};
buildInputs = [ popt libuuid liburcu lttngUst ];
buildInputs = [ popt libuuid liburcu lttng-ust ];
prePatch = ''
sed -e "s|/sbin/modprobe|${kmod}/sbin/modprobe|g" \

4
pkgs/misc/emulators/mednafen/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig
, libX11, mesa, freeglut
, jackaudio, libcdio, libsndfile, libsamplerate
, jack2, libcdio, libsndfile, libsamplerate
, SDL, SDL_net, zlib
}:
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
};
buildInputs = with stdenv.lib;
[ libX11 mesa freeglut jackaudio libcdio libsndfile libsamplerate SDL SDL_net zlib ];
[ libX11 mesa freeglut jack2 libcdio libsndfile libsamplerate SDL SDL_net zlib ];
nativeBuildInputs = [ pkgconfig ];

2
pkgs/misc/jackaudio/default.nix
View File

@ -5,7 +5,7 @@
assert firewireSupport -> ffado != null;
stdenv.mkDerivation rec {
name = "jackaudio-${version}";
name = "jack2-${version}";
version = "1.9.9.5";
src = fetchurl {

30
pkgs/misc/jackaudio/jack1.nix Normal file
View File

@ -0,0 +1,30 @@
{ stdenv, fetchurl, pkgconfig, alsaLib, db, libuuid
, firewireSupport ? false, ffado ? null }:
assert firewireSupport -> ffado != null;
stdenv.mkDerivation rec {
name = "jack1-${version}";
version = "0.124.1";
src = fetchurl {
url = "http://jackaudio.org/downloads/jack-audio-connection-kit-${version}.tar.gz";
sha256 = "1mk1wnx33anp6haxfjjkfhwbaknfblsvj35nxvz0hvspcmhdyhpb";
};
preBuild = "echo ok";
configureFlags = ''
${if firewireSupport then "--enable-firewire" else ""}
'';
buildInputs =
[ pkgconfig alsaLib db libuuid
] ++ (stdenv.lib.optional firewireSupport ffado);
meta = {
description = "JACK audio connection kit";
homepage = "http://jackaudio.org";
license = "GPL";
};
}

6
pkgs/os-specific/linux/alsa-plugins/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, lib, pkgconfig, alsaLib, libogg, pulseaudio ? null, jackaudio ? null }:
{ stdenv, fetchurl, lib, pkgconfig, alsaLib, libogg, pulseaudio ? null, jack2 ? null }:
stdenv.mkDerivation rec {
name = "alsa-plugins-1.0.28";
@ -14,9 +14,9 @@ stdenv.mkDerivation rec {
buildInputs =
[ pkgconfig alsaLib libogg ]
++ stdenv.lib.optional (pulseaudio != null) pulseaudio
++ stdenv.lib.optional (jackaudio != null) jackaudio;
++ stdenv.lib.optional (jack2 != null) jack2;
meta = {
meta = {
description = "Various plugins for ALSA";
homepage = http://alsa-project.org/;
license = stdenv.lib.licenses.lgpl21;

6
pkgs/servers/pulseaudio/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, gnum4, gdbm, libtool, glib, dbus, avahi
, gconf, gtk, intltool, gettext, alsaLib, libsamplerate, libsndfile, speex
, bluez, sbc, udev, libcap, json_c
, jackaudioSupport ? false, jackaudio ? null
, jackaudioSupport ? false, jack2 ? null
, x11Support ? false, xlibs
, useSystemd ? false, systemd ? null }:
assert jackaudioSupport -> jackaudio != null;
assert jackaudioSupport -> jack2 != null;
stdenv.mkDerivation rec {
name = "pulseaudio-5.0";
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
buildInputs =
[ pkgconfig gnum4 libtool intltool glib dbus avahi libsamplerate libsndfile
speex json_c ]
++ stdenv.lib.optional jackaudioSupport jackaudio
++ stdenv.lib.optional jackaudioSupport jack2
++ stdenv.lib.optionals x11Support [ xlibs.xlibs xlibs.libXtst xlibs.libXi ]
++ stdenv.lib.optional useSystemd systemd
++ stdenv.lib.optionals stdenv.isLinux [ alsaLib bluez sbc udev ];

6
pkgs/tools/misc/timidity/default.nix
View File

@ -1,4 +1,4 @@
{ composableDerivation, stdenv, fetchurl, alsaLib, jackaudio, ncurses }:
{ composableDerivation, stdenv, fetchurl, alsaLib, jack2, ncurses }:
let inherit (composableDerivation) edf; in
@ -30,8 +30,8 @@ composableDerivation.composableDerivation {} {
};
jack = {
audioModes = "jack";
buildInputs = [jackaudio];
NIX_LDFLAGS = ["-ljack -L${jackaudio}/lib64"];
buildInputs = [jack2];
NIX_LDFLAGS = ["-ljack -L${jack2}/lib64"];
};
} // edf { name = "ncurses"; enable = { buildInputs = [ncurses]; };};

18
pkgs/tools/networking/cadaver/default.nix Normal file
View File

@ -0,0 +1,18 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "cadaver-0.23.3";
src = fetchurl {
url = "http://www.webdav.org/cadaver/${name}.tar.gz";
sha256 = "1jizq69ifrjbjvz5y79wh1ny94gsdby4gdxwjad4bfih6a5fck7x";
};
meta = with stdenv.lib; {
description = "A command-line WebDAV client for Unix";
homepage = http://www.webdav.org/cadaver;
maintainers = with maintainers; [ ianwookim ];
license = licenses.gpl2;
platforms = platforms.unix;
};
}

4
pkgs/tools/security/tor/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, libevent, openssl, zlib }:
stdenv.mkDerivation rec {
name = "tor-0.2.4.22";
name = "tor-0.2.4.23";
src = fetchurl {
url = "https://archive.torproject.org/tor-package-archive/${name}.tar.gz";
sha256 = "0k39ppcvld6p08yaf4rpspb34z4f5863j0d605yrm4dqjcp99xvb";
sha256 = "0a8l6d82hk4wbn7nlphd3c1maxhgdli8338wbg5r9dk6zcy7k8q5";
};
buildInputs = [ libevent openssl zlib ];

25
pkgs/top-level/all-packages.nix
View File

@ -719,6 +719,8 @@ let
cabextract = callPackage ../tools/archivers/cabextract { };
cadaver = callPackage ../tools/networking/cadaver { };
cantata = callPackage ../applications/audio/cantata { };
can-utils = callPackage ../os-specific/linux/can-utils { };
@ -4004,9 +4006,9 @@ let
ltrace = callPackage ../development/tools/misc/ltrace { };
lttngTools = callPackage ../development/tools/misc/lttng-tools { };
lttng-tools = callPackage ../development/tools/misc/lttng-tools { };
lttngUst = callPackage ../development/tools/misc/lttng-ust { };
lttng-ust = callPackage ../development/tools/misc/lttng-ust { };
lttv = callPackage ../development/tools/misc/lttv { };
@ -7062,7 +7064,7 @@ let
alsaLib = callPackage ../os-specific/linux/alsa-lib { };
alsaPlugins = callPackage ../os-specific/linux/alsa-plugins {
jackaudio = null;
jack2 = null;
};
alsaPluginWrapper = callPackage ../os-specific/linux/alsa-plugins/wrapper.nix { };
@ -7437,7 +7439,7 @@ let
ktap = callPackage ../os-specific/linux/ktap { };
lttngModules = callPackage ../os-specific/linux/lttng-modules { };
lttng-modules = callPackage ../os-specific/linux/lttng-modules { };
broadcom_sta = callPackage ../os-specific/linux/broadcom-sta/default.nix { };
@ -9508,9 +9510,9 @@ let
qt = qt4;
};
retroshare06 = callPackage ../applications/networking/p2p/retroshare/0.6.nix {
retroshare06 = lowPrio (callPackage ../applications/networking/p2p/retroshare/0.6.nix {
qt = qt4;
};
});
rsync = callPackage ../applications/networking/sync/rsync {
enableACLs = !(stdenv.isDarwin || stdenv.isSunOS || stdenv.isFreeBSD);
@ -9737,6 +9739,8 @@ let
thunderbird = callPackage ../applications/networking/mailreaders/thunderbird {
inherit (gnome) libIDL;
inherit (pythonPackages) pysqlite;
libpng = libpng_apng;
};
thunderbird-bin = callPackage ../applications/networking/mailreaders/thunderbird-bin {
@ -9807,6 +9811,8 @@ let
uzbl = callPackage ../applications/networking/browsers/uzbl {
webkit = webkitgtk2;
};
uTox = callPackage ../applications/networking/instant-messengers/utox { };
vanitygen = callPackage ../applications/misc/vanitygen { };
@ -11076,7 +11082,10 @@ let
hplipWithPlugin = hplip.override { withPlugin = true; };
jackaudio = callPackage ../misc/jackaudio { };
# using the new configuration style proposal which is unstable
jack1 = callPackage ../misc/jackaudio/jack1.nix { };
jack2 = callPackage ../misc/jackaudio { };
keynav = callPackage ../tools/X11/keynav { };
@ -11411,6 +11420,8 @@ let
# Attributes for backward compatibility.
adobeReader = adobe-reader;
asciidocFull = asciidoc-full; # added 2014-06-22
lttngTools = lttng-tools; # added 2014-07-31
lttngUst = lttng-ust; # added 2014-07-31
}; in self; in pkgs

16
pkgs/top-level/haskell-packages.nix
View File

@ -2575,8 +2575,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
void = callPackage ../development/libraries/haskell/void {};
vty_4_7_5 = callPackage ../development/libraries/haskell/vty/4.7.5.nix {};
vty_5_1_3 = callPackage ../development/libraries/haskell/vty/5.1.3.nix {};
vty = self.vty_5_1_3;
vty_5_1_4 = callPackage ../development/libraries/haskell/vty/5.1.4.nix {};
vty = self.vty_5_1_4;
vtyUi = callPackage ../development/libraries/haskell/vty-ui {};
@ -2681,6 +2681,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
xmlhtml = callPackage ../development/libraries/haskell/xmlhtml {};
xmlHtmlConduitLens = callPackage ../development/libraries/haskell/xml-html-conduit-lens {};
xmlLens = callPackage ../development/libraries/haskell/xml-lens {};
xmlTypes = callPackage ../development/libraries/haskell/xml-types {};
@ -2758,18 +2760,14 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
# Compilers.
Agda_2_3_2_2 = callPackage ../development/compilers/agda/2.3.2.2.nix {};
Agda_2_4_0_1 = callPackage ../development/compilers/agda/2.4.0.1.nix {
binary = self.binary_0_7_2_1;
QuickCheck = self.QuickCheck_2_7_5;
equivalence = self.equivalence_0_2_3;
};
Agda = self.Agda_2_4_0_1;
Agda_2_4_0_2 = callPackage ../development/compilers/agda/2.4.0.2.nix {};
Agda = self.Agda_2_4_0_2;
AgdaStdlib_0_7 = callPackage ../development/compilers/agda/stdlib-0.7.nix {
Agda = self.Agda_2_3_2_2;
};
AgdaStdlib_0_8 = callPackage ../development/compilers/agda/stdlib-0.8.nix {
Agda = self.Agda_2_4_0_1;
Agda = self.Agda_2_4_0_2;
};
AgdaStdlib = self.AgdaStdlib_0_8;

2
pkgs/top-level/python-packages.nix
View File

@ -2654,7 +2654,7 @@ rec {
sed -i "/use_setuptools/d" setup.py
'';
buildInputs = [ pkgs.alsaLib pkgs.jackaudio ];
buildInputs = [ pkgs.alsaLib pkgs.jack2 ];
meta = with stdenv.lib; {
description = "A Python wrapper for the RtMidi C++ library written with Cython";