diff options
Diffstat (limited to 'pkgs/applications')
9 files changed, 124 insertions, 29 deletions
diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix index 6f25693f734..67ec6b5a419 100644 --- a/pkgs/applications/audio/audacity/default.nix +++ b/pkgs/applications/audio/audacity/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, wxGTK, pkgconfig, gettext, gtk, glib, zlib, perl, intltool, libogg, libvorbis, libmad, alsaLib, libsndfile, soxr, flac, lame, - expat, libid3tag, ffmpeg /*, portaudio - given up fighting their portaudio.patch */ + expat, libid3tag, ffmpeg, soundtouch /*, portaudio - given up fighting their portaudio.patch */ }: stdenv.mkDerivation rec { @@ -19,11 +19,13 @@ stdenv.mkDerivation rec { rm -r lib-src-rm/ ''; + configureFlags = "--with-libsamplerate"; + buildInputs = [ pkgconfig gettext wxGTK gtk expat alsaLib libsndfile soxr libid3tag - ffmpeg libmad lame libvorbis flac - ]; #ToDo: soundtouch, detach sbsms + ffmpeg libmad lame libvorbis flac soundtouch + ]; #ToDo: detach sbsms dontDisableStatic = true; doCheck = true; diff --git a/pkgs/applications/audio/jackmix/default.nix b/pkgs/applications/audio/jackmix/default.nix new file mode 100644 index 00000000000..8176a340470 --- /dev/null +++ b/pkgs/applications/audio/jackmix/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchurl, pkgs, jack ? pkgs.libjack2 }: + +stdenv.mkDerivation rec { + name = "jackmix-0.5.2"; + src = fetchurl { + url = https://github.com/kampfschlaefer/jackmix/archive/v0.5.2.tar.gz; + sha256 = "18f5v7g66mgarhs476frvayhch7fy4nyjf2xivixc061ipn0m82j"; + }; + + buildInputs = [ + pkgs.pkgconfig + pkgs.scons + pkgs.kde4.qt4 + pkgs.lash + jack + ]; + + buildPhase = '' + scons + ''; + installPhase = '' + mkdir -p $out/bin + cp jackmix/jackmix $out/bin + ''; + + meta = { + description = "Matrix-Mixer for the Jack-Audio-connection-Kit"; + homepage = http://www.arnoldarts.de/jackmix/; + license = stdenv.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.kampfschlaefer ]; + platforms = stdenv.lib.platforms.linux; + }; +} + + diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index ea638de7925..702911fee74 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -245,7 +245,7 @@ rec { /* =============== simple script files ==================== */ - # also have a look at enblendenfuse in all-packages.nix + # also have a look at enblend-enfuse in all-packages.nix exposureBlend = scriptDerivation { name = "exposure-blend"; src = fetchurl { diff --git a/pkgs/applications/graphics/hugin/default.nix b/pkgs/applications/graphics/hugin/default.nix index 88912cbda55..b11ed1a99df 100644 --- a/pkgs/applications/graphics/hugin/default.nix +++ b/pkgs/applications/graphics/hugin/default.nix @@ -1,7 +1,7 @@ { stdenv, cmake, fetchurl, gnumake, pkgconfig , boost, gettext, tclap, wxGTK , freeglut, glew, libXi, libXmu, mesa -, autopanosiftc, enblendenfuse, exiv2, ilmbase, lensfun, libpng, libtiff +, autopanosiftc, enblend-enfuse, exiv2, ilmbase, lensfun, libpng, libtiff , openexr, panotools, perlPackages }: @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { # commandline tools needed by the hugin batch processor # you may have to tell hugin (in the preferences) where these binaries reside - propagatedUserEnvPackages = [ autopanosiftc enblendenfuse gnumake + propagatedUserEnvPackages = [ autopanosiftc enblend-enfuse gnumake perlPackages.ImageExifTool ]; diff --git a/pkgs/applications/networking/ids/daq/default.nix b/pkgs/applications/networking/ids/daq/default.nix index c4a82966238..e0c40280bce 100644 --- a/pkgs/applications/networking/ids/daq/default.nix +++ b/pkgs/applications/networking/ids/daq/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, flex, bison, libpcap}: +{stdenv, fetchurl, flex, bison, libpcap, libdnet, libnfnetlink, libnetfilter_queue}: stdenv.mkDerivation rec { name = "daq-2.0.5"; @@ -9,7 +9,9 @@ stdenv.mkDerivation rec { sha256 = "0vdwb0r9kdlgj4g0i0swafbc7qik0zmks17mhqji8cl7hpdva13p"; }; - buildInputs = [ flex bison libpcap ]; + buildInputs = [ flex bison libpcap libdnet libnfnetlink libnetfilter_queue]; + + configureFlags = "--enable-nfq-module=yes --with-dnet-includes=${libdnet}/includes --with-dnet-libraries=${libdnet}/lib"; meta = { description = "Data AcQuisition library (DAQ), for packet I/O"; diff --git a/pkgs/applications/networking/iptraf-ng/default.nix b/pkgs/applications/networking/iptraf-ng/default.nix new file mode 100644 index 00000000000..368d78a36f9 --- /dev/null +++ b/pkgs/applications/networking/iptraf-ng/default.nix @@ -0,0 +1,44 @@ +{ stdenv, fetchurl, ncurses }: + +stdenv.mkDerivation rec { + version = "1.1.4"; + name = "iptraf-ng-${version}"; + + src = fetchurl { + url = "https://fedorahosted.org/releases/i/p/iptraf-ng/${name}.tar.gz"; + sha256 = "02gb8z9h2s6s1ybyikywz7jgb1mafdx88hijfasv3khcgkq0q53r"; + }; + + buildInputs = [ ncurses ]; + + configurePhase = '' + ./configure --prefix=$out/usr --sysconfdir=$out/etc \ + --localstatedir=$out/var --sbindir=$out/bin + ''; + + meta = { + description = "A console-based network monitoring utility (fork of iptraf)"; + longDescription = '' + IPTraf-ng is a console-based network monitoring utility. IPTraf-ng + gathers data like TCP connection packet and byte counts, interface + statistics and activity indicators, TCP/UDP traffic breakdowns, and LAN + station packet and byte counts. IPTraf-ng features include an IP traffic + monitor which shows TCP flag information, packet and byte counts, ICMP + details, OSPF packet types, and oversized IP packet warnings; interface + statistics showing IP, TCP, UDP, ICMP, non-IP and other IP packet counts, + IP checksum errors, interface activity and packet size counts; a TCP and + UDP service monitor showing counts of incoming and outgoing packets for + common TCP and UDP application ports, a LAN statistics module that + discovers active hosts and displays statistics about their activity; TCP, + UDP and other protocol display filters so you can view just the traffic + you want; logging; support for Ethernet, FDDI, ISDN, SLIP, PPP, and + loopback interfaces; and utilization of the built-in raw socket interface + of the Linux kernel, so it can be used on a wide variety of supported + network cards. + ''; + homepage = https://fedorahosted.org/iptraf-ng/; + license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.devhell ]; + }; +} diff --git a/pkgs/applications/version-management/git-and-tools/git-hub/default.nix b/pkgs/applications/version-management/git-and-tools/git-hub/default.nix index e47d2569b10..e657215f2cd 100644 --- a/pkgs/applications/version-management/git-and-tools/git-hub/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-hub/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, docutils, python }: let version = "0.9.0"; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "git-hub-${version}"; src = fetchFromGitHub { @@ -11,20 +11,6 @@ stdenv.mkDerivation { owner = "sociomantic"; }; - meta = with stdenv.lib; { - inherit version; - description = "Git command line interface to GitHub"; - longDescription = '' - A simple command line interface to GitHub, enabling most useful GitHub - tasks (like creating and listing pull request or issues) to be accessed - directly through the Git command line. - ''; - homepage = https://github.com/sociomantic/git-hub; - license = licenses.gpl3Plus; - platforms = with platforms; linux; - maintainers = with maintainers; [ nckx ]; - }; - buildInputs = [ python ]; nativeBuildInputs = [ docutils ]; @@ -41,4 +27,18 @@ stdenv.mkDerivation { # Remove inert ftdetect vim plugin and a README that's a man page subset: rm -r $out/share/{doc,vim} ''; + + meta = with stdenv.lib; { + inherit version; + inherit (src.meta) homepage; + description = "Git command line interface to GitHub"; + longDescription = '' + A simple command line interface to GitHub, enabling most useful GitHub + tasks (like creating and listing pull request or issues) to be accessed + directly through the Git command line. + ''; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ nckx ]; + }; } diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index db29360c9ec..f563bebd9db 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -8,6 +8,7 @@ , stdenv, fetchurl, apr, aprutil, zlib, sqlite , apacheHttpd ? null, expat, swig ? null, jdk ? null, python ? null, perl ? null , sasl ? null, serf ? null +, branch ? "1.9" }: assert bdbSupport -> aprutil.bdbSupport; @@ -15,15 +16,26 @@ assert httpServer -> apacheHttpd != null; assert pythonBindings -> swig != null && python != null; assert javahlBindings -> jdk != null && perl != null; +let + config = { + "1.9".ver_min = "2"; + "1.9".sha1 = "fb9db3b7ddf48ae37aa8785872301b59bfcc7017"; + + "1.8".ver_min = "14"; + "1.8".sha1 = "0698efc58373e7657f6dd3ce13cab7b002ffb497"; + }; +in +assert builtins.hasAttr branch config; + stdenv.mkDerivation (rec { - version = "1.9.2"; + version = "${branch}." + config.${branch}.ver_min; name = "subversion-${version}"; src = fetchurl { url = "mirror://apache/subversion/${name}.tar.bz2"; - sha1 = "fb9db3b7ddf48ae37aa8785872301b59bfcc7017"; + inherit (config.${branch}) sha1; }; buildInputs = [ zlib apr aprutil sqlite ] diff --git a/pkgs/applications/video/smplayer/default.nix b/pkgs/applications/video/smplayer/default.nix index 22935064c4b..d56ef964967 100644 --- a/pkgs/applications/video/smplayer/default.nix +++ b/pkgs/applications/video/smplayer/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchurl, qt4 }: +{ stdenv, fetchurl, qt5 }: stdenv.mkDerivation rec { - name = "smplayer-14.9.0.6690"; + name = "smplayer-15.9.0"; src = fetchurl { url = "mirror://sourceforge/smplayer/${name}.tar.bz2"; - sha256 = "0nmw69kg8rqvl9icyx1r1v1pyxg6560363l0kyqyja18j79a3j2y"; + sha256 = "1yx6kikaj9v5aj8aavvrcklx283wl6wrnpl905hjc7v03kgp1ac5"; }; patches = [ ./basegui.cpp.patch ]; - buildInputs = [ qt4 ]; + buildInputs = [ qt5.script ]; preConfigure = '' makeFlags="PREFIX=$out" |