diff options
Diffstat (limited to 'pkgs/applications')
26 files changed, 218 insertions, 89 deletions
diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix new file mode 100644 index 000000000000..a0bb87896582 --- /dev/null +++ b/pkgs/applications/audio/musescore/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchurl, makeWrapper, cmake, qt4, pkgconfig, alsaLib, portaudio, jack2, libsndfile}: + +stdenv.mkDerivation rec { + name = "musescore-1.3"; + + src = fetchurl { + url = "http://ftp.osuosl.org/pub/musescore/releases/MuseScore-1.3/mscore-1.3.tar.bz2"; + sha256 = "a0b60cc892ac0266c58fc6392be72c0a21c3aa7fd0b6e4f1dddad1c8b36be683"; + }; + + buildInputs = [ makeWrapper cmake qt4 pkgconfig alsaLib portaudio jack2 libsndfile ]; + + configurePhase = '' + cd mscore; + mkdir build; + cd build; + cmake -DCMAKE_INSTALL_PREFIX=$out -DQT_PLUGINS_DIR=$out/lib/qt4/plugins -DCMAKE_BUILD_TYPE=Release ..''; + + preBuild = ''make lrelease;''; + + postInstall = '' + wrapProgram $out/bin/mscore --prefix QT_PLUGIN_PATH : $out/lib/qt4/plugins + ''; + + meta = with stdenv.lib; { + description = "Qt-based score editor"; + homepage = http://musescore.org/; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = [ stdenv.lib.maintainers.vandenoever ]; + repositories.git = https://github.com/musescore/MuseScore; + }; +} diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix index caa9523af6f6..c673ea672c7c 100644 --- a/pkgs/applications/editors/idea/default.nix +++ b/pkgs/applications/editors/idea/default.nix @@ -42,7 +42,9 @@ let mkdir -p $out/bin - jdk=${jdk}/lib/openjdk + [ -d ${jdk}/lib/openjdk ] \ + && jdk=${jdk}/lib/openjdk \ + || jdk=${jdk} makeWrapper $out/idea-$build/bin/idea.sh $out/bin/idea \ --prefix PATH : ${jdk}/bin:${coreutils}/bin:${gnugrep}/bin:${which}/bin:${git}/bin \ diff --git a/pkgs/applications/graphics/panotools/default.nix b/pkgs/applications/graphics/panotools/default.nix index 8e5204ac6382..9ca90d2f5df3 100644 --- a/pkgs/applications/graphics/panotools/default.nix +++ b/pkgs/applications/graphics/panotools/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, libjpeg, libpng, libtiff, perl }: stdenv.mkDerivation rec { - name = "libpano13-2.9.18"; + name = "libpano13-2.9.19"; src = fetchurl { url = "mirror://sourceforge/panotools/${name}.tar.gz"; - sha256 = "0wm1r9waa47n482yrl3hnphicdahr581rahgbklk0d2wy51lwpfy"; + sha256 = "1a4m3plmfcrrplqs9zfzhc5apibn10m5sajpizm1sd3q74w5fwq3"; }; buildInputs = [ perl libjpeg libpng libtiff ]; diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 1bf5d6a9ff85..1426fb8e3d71 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation rec { - name = "calibre-2.2.0"; + name = "calibre-2.3.0"; src = fetchurl { url = "mirror://sourceforge/calibre/${name}.tar.xz"; - sha256 = "03qljbb3995cq25azwy9qh087dq7m6igia5301v89y98vxxg2lxm"; + sha256 = "13ny8d569hl7yv8m89216fmg0qdqqy6l9vgzf3cmbbb8i3l1lpxf"; }; inherit python; diff --git a/pkgs/applications/misc/fme/default.nix b/pkgs/applications/misc/fme/default.nix index 93abd13da0ca..685c0ecb4ede 100644 --- a/pkgs/applications/misc/fme/default.nix +++ b/pkgs/applications/misc/fme/default.nix @@ -1,6 +1,5 @@ { stdenv, fetchurl, pkgconfig, autoconf, automake, gettext -, fluxbox, bc, gtkmm, glibmm, libglademm, libsigcxx -}: +, fluxbox, bc, gtkmm, glibmm, libglademm, libsigcxx }: stdenv.mkDerivation rec{ @@ -18,7 +17,7 @@ stdenv.mkDerivation rec{ ./autogen.sh ''; - meta = { + meta = with stdenv.lib; { description = "Editor for Fluxbox menus"; longDescription = '' Fluxbox Menu Editor is a menu editor for the Window Manager Fluxbox written in C++ @@ -27,8 +26,8 @@ stdenv.mkDerivation rec{ a row, a submenu, etc very easily. ''; homepage = https://github.com/rdehouss/fme/; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.AndersonTorres ]; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl2; + maintainers = [ maintainers.AndersonTorres ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/galculator/default.nix b/pkgs/applications/misc/galculator/default.nix index 010f75a575e6..5dcee439ef91 100644 --- a/pkgs/applications/misc/galculator/default.nix +++ b/pkgs/applications/misc/galculator/default.nix @@ -1,6 +1,5 @@ { stdenv, fetchurl -, intltool, pkgconfig, gtk - }: +, intltool, pkgconfig, gtk }: stdenv.mkDerivation rec { @@ -14,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ intltool pkgconfig gtk ]; - meta = { + meta = with stdenv.lib; { description = "A GTK 2/3 algebraic and RPN calculator"; longDescription = '' galculator is a GTK 2 / GTK 3 based calculator. Its main features include: @@ -29,7 +28,8 @@ stdenv.mkDerivation rec { - Quad-precision floating point arithmetic, and 112-bit binary arithmetic ''; homepage = http://galculator.sourceforge.net/; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = [ stdenv.lib.maintainers.AndersonTorres ]; + license = licenses.gpl2Plus; + maintainers = [ maintainers.AndersonTorres ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/lilyterm/default.nix b/pkgs/applications/misc/lilyterm/default.nix index c87b6a8bc0a1..2fe07d8c5dd0 100644 --- a/pkgs/applications/misc/lilyterm/default.nix +++ b/pkgs/applications/misc/lilyterm/default.nix @@ -22,14 +22,14 @@ stdenv.mkDerivation rec { --enable-safe-mode ''; - meta = { + meta = with stdenv.lib; { description = "A fast, lightweight terminal emulator"; longDescription = '' - LilyTerm is a terminal emulator based off of libvte that aims to be fast and lightweight. + LilyTerm is a terminal emulator based off of libvte that aims to be fast and lightweight. ''; homepage = http://lilyterm.luna.com.tw/; - license = stdenv.lib.licenses.gpl3; - maintainers = [ stdenv.lib.maintainers.AndersonTorres ]; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl3; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/spacefm/default.nix b/pkgs/applications/misc/spacefm/default.nix index 7dbe723d9eb2..6f1ced9097e9 100644 --- a/pkgs/applications/misc/spacefm/default.nix +++ b/pkgs/applications/misc/spacefm/default.nix @@ -3,14 +3,14 @@ }: let - version = "0.9.4"; + version = "0.9.2"; in stdenv.mkDerivation rec { name = "spacefm-${version}"; src = fetchurl { url = "https://github.com/IgnorantGuru/spacefm/blob/pkg/${version}/${name}.tar.xz?raw=true"; - sha256 = "0marwa031jk24q8hy90dr7yw6rv5hn1shar404zpb1k57v4nr23m"; + sha256 = "3767137d74aa78597ffb42a6121784e91a4276efcd5d718b3793b9790f82268c"; }; buildInputs = [ gtk3 udev desktop_file_utils shared_mime_info intltool pkgconfig makeWrapper ]; diff --git a/pkgs/applications/misc/tilda/default.nix b/pkgs/applications/misc/tilda/default.nix index 50c4184c91e9..bfaca1731fc0 100644 --- a/pkgs/applications/misc/tilda/default.nix +++ b/pkgs/applications/misc/tilda/default.nix @@ -1,8 +1,7 @@ { stdenv, fetchurl, pkgconfig , autoreconfHook, gettext, expat , confuse, vte, gtk -, makeWrapper -}: +, makeWrapper }: stdenv.mkDerivation rec { diff --git a/pkgs/applications/misc/vym/default.nix b/pkgs/applications/misc/vym/default.nix index c2dc9aed44a8..f53d3012b1e6 100644 --- a/pkgs/applications/misc/vym/default.nix +++ b/pkgs/applications/misc/vym/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { qmake PREFIX="$out" ''; - meta = { + meta = with stdenv.lib; { description = "A mind-mapping software"; longDescription = '' VYM (View Your Mind) is a tool to generate and manipulate maps which show your thoughts. @@ -28,8 +28,8 @@ stdenv.mkDerivation rec { vym offers much more features to work with such maps. ''; homepage = http://www.insilmaril.de/vym/; - license = stdenv.lib.licenses.gpl2; - maintainer = [ stdenv.lib.maintainers.AndersonTorres ]; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl2; + maintainer = [ maintainers.AndersonTorres ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/xiphos/default.nix b/pkgs/applications/misc/xiphos/default.nix index b8cd2ff25840..8dcef600f959 100644 --- a/pkgs/applications/misc/xiphos/default.nix +++ b/pkgs/applications/misc/xiphos/default.nix @@ -7,8 +7,7 @@ , libgsf, gconf , gtkhtml, libgtkhtml, libglade, scrollkeeper , webkitgtk -, dbus_glib, enchant, isocodes, libuuid -}: +, dbus_glib, enchant, isocodes, libuuid }: stdenv.mkDerivation rec { name = "xiphos-${version}"; @@ -42,16 +41,17 @@ stdenv.mkDerivation rec { python waf install ''; - meta = { + meta = with stdenv.lib; { description = "A GTK Bible study tool"; longDescription = '' - Xiphos (formerly known as GnomeSword) is a Bible study tool written for Linux, UNIX, - and Windows using GTK, offering a rich and featureful environment for reading, study, - and research using modules from The SWORD Project and elsewhere. + Xiphos (formerly known as GnomeSword) is a Bible study tool + written for Linux, UNIX, and Windows using GTK, offering a rich + and featureful environment for reading, study, and research using + modules from The SWORD Project and elsewhere. ''; homepage = http://www.xiphos.org/; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = [ stdenv.lib.maintainers.AndersonTorres ]; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl2Plus; + maintainers = [ maintainers.AndersonTorres ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/networking/browsers/dillo/default.nix b/pkgs/applications/networking/browsers/dillo/default.nix index 0cf23f38b0f0..c6c862638889 100644 --- a/pkgs/applications/networking/browsers/dillo/default.nix +++ b/pkgs/applications/networking/browsers/dillo/default.nix @@ -3,8 +3,7 @@ , openssl , libjpeg, libpng , perl -, libXcursor, libXi, libXinerama -}: +, libXcursor, libXi, libXinerama }: stdenv.mkDerivation rec { version = "3.0.4"; @@ -22,10 +21,13 @@ stdenv.mkDerivation rec { configureFlags = "--enable-ssl"; - meta = { + meta = with stdenv.lib; { homepage = http://www.dillo.org/; description = "A fast graphical web browser with a small footprint"; - maintainers = [ stdenv.lib.maintainers.AndersonTorres ]; - platforms = stdenv.lib.platforms.linux; + longDescription = '' + Dillo is a small, fast web browser, tailored for older machines. + ''; + maintainers = [ maintainers.AndersonTorres ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/networking/instant-messengers/ekiga/default.nix b/pkgs/applications/networking/instant-messengers/ekiga/default.nix index e46956f3ccae..a00a68ff9f28 100644 --- a/pkgs/applications/networking/instant-messengers/ekiga/default.nix +++ b/pkgs/applications/networking/instant-messengers/ekiga/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cyrus_sasl, gettext, openldap, ptlib, opal, libXv, rarian, intltool +{ stdenv, glib, fetchurl, cyrus_sasl, gettext, openldap, ptlib, opal, libXv, rarian, intltool , perl, perlXMLParser, evolution_data_server, gnome_doc_utils, avahi, autoreconfHook , libsigcxx, gtk, dbus_glib, libnotify, libXext, xextproto, gnome3, boost, libsecret , pkgconfig, libxml2, videoproto, unixODBC, db, nspr, nss, zlib, hicolor_icon_theme @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ cyrus_sasl gettext openldap ptlib opal libXv rarian intltool perl perlXMLParser evolution_data_server gnome_doc_utils avahi libsigcxx gtk dbus_glib libnotify libXext xextproto sqlite - gnome3.libsoup + gnome3.libsoup glib gnome3.gnome_icon_theme_symbolic hicolor_icon_theme gnome3.gnome_icon_theme boost autoreconfHook pkgconfig libxml2 videoproto unixODBC db nspr nss zlib libsecret libXrandr randrproto which libxslt libtasn1 gmp nettle makeWrapper ]; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram "$out"/bin/ekiga \ - --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/linssid/default.nix b/pkgs/applications/networking/linssid/default.nix new file mode 100644 index 000000000000..2b4c5f564bec --- /dev/null +++ b/pkgs/applications/networking/linssid/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchurl, qt5, pkgconfig, boost, wirelesstools, iw }: + +stdenv.mkDerivation rec { + name = "linssid-${version}"; + version = "2.7"; + + src = fetchurl { + url = "mirror://sourceforge/project/linssid/LinSSID_${version}/linssid_${version}.orig.tar.gz"; + sha256 = "13d35rlcjncd8lx3khkgn9x8is2xjd5fp6ns5xsn3w6l4xj9b4gl"; + }; + + buildInputs = [ qt5 pkgconfig boost ]; + + postPatch = '' + sed -e "s|/usr/include/|/nonexistent/|g" -i linssid-app/*.pro + sed -e 's|^LIBS .*= .*libboost_regex.a|LIBS += -lboost_regex|' \ + -e "s|/usr|$out|g" \ + -i linssid-app/linssid-app.pro linssid-app/linssid.desktop + sed -e "s|\.\./\.\./\.\./\.\./usr|$out|g" -i linssid-app/*.ui + + sed -e "s|iwlist|${wirelesstools}/sbin/iwlist|g" -i linssid-app/Getter.cpp + sed -e "s|iw dev|${iw}/sbin/iw dev|g" -i linssid-app/MainForm.cpp + ''; + + configurePhase = "qmake linssid.pro"; + + meta = with stdenv.lib; { + description = "Graphical wireless scanning for Linux"; + homepage = http://sourceforge.net/projects/linssid/; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = [ maintainers.bjornfor ]; + }; +} diff --git a/pkgs/applications/networking/mailreaders/mailpile/default.nix b/pkgs/applications/networking/mailreaders/mailpile/default.nix index 1e68d2e90b8d..2b1e9fc4fb34 100644 --- a/pkgs/applications/networking/mailreaders/mailpile/default.nix +++ b/pkgs/applications/networking/mailreaders/mailpile/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = with pythonPackages; [ - pillow jinja2 spambayes pythonPackages."lxml-2.3.6" python.modules.readline or null]; + pillow jinja2 spambayes pythonPackages.lxml python.modules.readline or null]; meta = with stdenv.lib; { description = "A modern, fast web-mail client with user-friendly encryption and privacy features"; diff --git a/pkgs/applications/science/logic/coq/HEAD.nix b/pkgs/applications/science/logic/coq/HEAD.nix index ed922b3aedbe..1be95a17eede 100644 --- a/pkgs/applications/science/logic/coq/HEAD.nix +++ b/pkgs/applications/science/logic/coq/HEAD.nix @@ -3,7 +3,7 @@ {stdenv, fetchgit, pkgconfig, ocaml, findlib, camlp5, ncurses, lablgtk ? null}: let - version = "8.5pre-c70d5b2"; + version = "8.5pre-fbbb86b"; buildIde = lablgtk != null; ideFlags = if buildIde then "-lablgtkdir ${lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else ""; idePath = if buildIde then '' @@ -16,8 +16,8 @@ stdenv.mkDerivation { src = fetchgit { url = git://scm.gforge.inria.fr/coq/coq.git; - rev = "c70d5b27ad5872c74e20b6c997383fb4462a68dc"; - sha256 = "02wks2aivgjcf4h3ss9rn683vyawz8gl8rbysdq7awxh062316l2"; + rev = "f7c6b864a509a4cca11cac5fbd5d37efc"; + sha256 = "0v84pjxx361afkipgwkc4d2wmn7v1c5n2y8d264kc26i58cgrrf4"; }; buildInputs = [ pkgconfig ocaml findlib camlp5 ncurses lablgtk ]; diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index edba65146a66..7bdfa2026e15 100644 --- a/pkgs/applications/science/math/R/default.nix +++ b/pkgs/applications/science/math/R/default.nix @@ -6,11 +6,11 @@ }: stdenv.mkDerivation rec { - name = "R-3.1.0"; + name = "R-3.1.1"; src = fetchurl { url = "http://cran.r-project.org/src/base/R-3/${name}.tar.gz"; - sha256 = "1qjzbw341bvi1h4jwbvdkvq8j0z9l3m85mpgrlfw0n2cz2806s4a"; + sha256 = "06bs5jk2bgib2wvd76yq9kf1vyim2j344midxkqyhk216ig4sp6f"; }; buildInputs = [ blas bzip2 gfortran liblapack libX11 libXmu libXt diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix index 951ea29a7fca..145496cb49cb 100644 --- a/pkgs/applications/version-management/meld/default.nix +++ b/pkgs/applications/version-management/meld/default.nix @@ -28,6 +28,6 @@ stdenv.mkDerivation { description = "Visual diff and merge tool"; homepage = http://meld.sourceforge.net; license = stdenv.lib.licenses.gpl2Plus; - platforms = platforms.linux; + platforms = platforms.linux ++ stdenv.lib.platforms.darwin; }; } diff --git a/pkgs/applications/version-management/smartgithg/default.nix b/pkgs/applications/version-management/smartgithg/default.nix new file mode 100644 index 000000000000..a3d4783d20d1 --- /dev/null +++ b/pkgs/applications/version-management/smartgithg/default.nix @@ -0,0 +1,59 @@ +{ stdenv, fetchurl, lib, makeWrapper +, jdk +, gtk, glib +, libXtst +, git, mercurial, subversion +, which +}: + +let + the_version = "6_0_6"; + +in + +stdenv.mkDerivation rec { + name = "smartgithg-${the_version}"; + + src = fetchurl { + url = "http://www.syntevo.com/download/smartgithg/" + + "smartgithg-generic-${the_version}.tar.gz"; + sha256 = "13e41560138ef18395fbe0bf56d4d29e8614eee004d51d7dd03381080d8426e6"; + }; + + buildInputs = [ + makeWrapper + jdk + ]; + + buildCommand = let + pkg_path = "$out/${name}"; + bin_path = "$out/bin"; + runtime_paths = lib.makeSearchPath "bin" [ + jdk + git mercurial subversion + which + ]; + runtime_lib_paths = lib.makeLibraryPath [ + gtk glib + libXtst + ]; + in '' + tar xvzf $src + mkdir -pv $out + # unpacking should have produced a dir named ${name} + cp -a ${name} $out + mkdir -pv ${bin_path} + makeWrapper ${pkg_path}/bin/smartgithg.sh ${bin_path}/smartgithg \ + --prefix PATH : ${runtime_paths} \ + --prefix LD_LIBRARY_PATH : ${runtime_lib_paths} \ + --prefix JDK_HOME : ${jdk}/lib/openjdk + patchShebangs $out + ''; + + meta = with stdenv.lib; { + description = "GUI for Git, Mercurial, Subversion"; + homepage = http://www.syntevo.com/smartgithg/; + license = licenses.unfree; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/video/aegisub/default.nix b/pkgs/applications/video/aegisub/default.nix index c06aa0a036cd..a2089e04e70e 100644 --- a/pkgs/applications/video/aegisub/default.nix +++ b/pkgs/applications/video/aegisub/default.nix @@ -10,8 +10,7 @@ , openalSupport ? false, openal ? null , alsaSupport ? true, alsaLib ? null , pulseaudioSupport ? true, pulseaudio ? null -, portaudioSupport ? false, portaudio ? null -}: +, portaudioSupport ? false, portaudio ? null }: assert spellChecking -> (hunspell != null); assert automationSupport -> (lua != null); @@ -62,6 +61,5 @@ stdenv.mkDerivation rec { # - so the resulting program will be GPL maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.linux; - }; } diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index db1ced49166e..a9f9c78d332f 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -22,8 +22,7 @@ # for Youtube support , quviSupport ? false, libquvi ? null , cacaSupport ? false, libcaca ? null -, vaapiSupport ? false, libva ? null -}: +, vaapiSupport ? false, libva ? null }: assert x11Support -> (libX11 != null && libXext != null && mesa != null && libXxf86vm != null); assert xineramaSupport -> (libXinerama != null && x11Support); @@ -114,15 +113,17 @@ stdenv.mkDerivation rec { ln -s ${freefont_ttf}/share/fonts/truetype/FreeSans.ttf $out/share/mpv/subfont.ttf ''; - meta = { + meta = with stdenv.lib;{ description = "A movie player that supports many video formats (MPlayer and mplayer2 fork)"; longDescription = '' - mpv is a free and open-source general-purpose video player, based on the MPlayer and mplayer2 projects, with great improvements above both. + mpv is a free and open-source general-purpose video player, + based on the MPlayer and mplayer2 projects, with great + improvements above both. ''; - homepage = "http://mpv.io"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = [ stdenv.lib.maintainers.AndersonTorres ]; - platforms = stdenv.lib.platforms.linux; + homepage = http://mpv.io; + license = licenses.gpl2Plus; + maintainers = [ maintainers.AndersonTorres ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/video/wxcam/default.nix b/pkgs/applications/video/wxcam/default.nix index 1f66d9a589b0..561ab1516821 100644 --- a/pkgs/applications/video/wxcam/default.nix +++ b/pkgs/applications/video/wxcam/default.nix @@ -9,8 +9,7 @@ , mjpegtools , alsaLib , libv4l -, cimg -}: +, cimg }: stdenv.mkDerivation rec { @@ -35,7 +34,7 @@ stdenv.mkDerivation rec { make install prefix="$out" wxcamdocdir="$out/share/doc/wxcam" ''; - meta = { + meta = with stdenv.lib; { description = "An open-source, wxGTK-based webcam app for Linux"; longDescription = '' wxCam is a webcam application for linux. It supports video recording @@ -45,8 +44,8 @@ stdenv.mkDerivation rec { so it should work on a very large number of devices. ''; homepage = http://wxcam.sourceforge.net/; - license = stdenv.lib.licenses.gpl3Plus; - maintainers = [ stdenv.lib.maintainers.AndersonTorres ]; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl3Plus; + maintainers = [ maintainers.AndersonTorres ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/virtualization/8086tiny/default.nix b/pkgs/applications/virtualization/8086tiny/default.nix index a16f052f622f..15d98dc9be50 100644 --- a/pkgs/applications/virtualization/8086tiny/default.nix +++ b/pkgs/applications/virtualization/8086tiny/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchurl , localBios ? true, nasm ? null -, sdlSupport ? true, SDL ? null -}: +, sdlSupport ? true, SDL ? null }: assert sdlSupport -> (SDL != null); diff --git a/pkgs/applications/virtualization/bochs/default.nix b/pkgs/applications/virtualization/bochs/default.nix index 74ce7bdfcaa6..95db0dd67a1c 100644 --- a/pkgs/applications/virtualization/bochs/default.nix +++ b/pkgs/applications/virtualization/bochs/default.nix @@ -5,8 +5,7 @@ , termSupport ? true , ncurses ? null, readline ? null , wxSupport ? false, wxGTK ? null , wgetSupport ? false, wget ? null -, curlSupport ? false, curl ? null -}: +, curlSupport ? false, curl ? null }: assert sdlSupport -> (SDL != null); assert termSupport -> (ncurses != null&& readline != null); @@ -52,15 +51,19 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE="-I${gtk}/include/gtk-2.0/"; - meta = { + meta = with stdenv.lib; { description = "An open-source IA-32 (x86) PC emulator"; longDescription = '' - Bochs is an open-source (LGPL), highly portable IA-32 PC emulator, written in C++, that runs on most popular platforms. It includes emulation of the Intel x86 CPU, common I/O devices, and a custom BIOS. + Bochs is an open-source (LGPL), highly portable IA-32 PC emulator, + written in C++, that runs on most popular platforms. It includes + emulation of the Intel x86 CPU, common I/O devices, and a custom + BIOS. ''; homepage = http://bochs.sourceforge.net/; - license = stdenv.lib.licenses.lgpl2Plus; - maintainers = [ stdenv.lib.maintainers.AndersonTorres ]; - platforms = stdenv.lib.platforms.linux; + license = licenses.lgpl2Plus; + maintainers = [ maintainers.AndersonTorres ]; + platforms = platforms.linux; }; } + # TODO: study config.bochs.* implementation (like config.ffmpeg.* options) diff --git a/pkgs/applications/window-managers/fluxbox/default.nix b/pkgs/applications/window-managers/fluxbox/default.nix index af6545b61515..b46864b9c2e4 100644 --- a/pkgs/applications/window-managers/fluxbox/default.nix +++ b/pkgs/applications/window-managers/fluxbox/default.nix @@ -2,8 +2,7 @@ , freetype, fribidi , libXext, libXft, libXpm, libXrandr, libXrender, xextproto , libXinerama -, imlib2 -}: +, imlib2 }: stdenv.mkDerivation rec { @@ -17,17 +16,19 @@ stdenv.mkDerivation rec { sha256 = "164dd7bf59791d09a1e729a4fcd5e7347a1004ba675629860a5cf1a271c32983"; }; - meta = { + meta = with stdenv.lib; { description = "Full-featured, light-resource X window manager"; longDescription = '' - Fluxbox is a X window manager based on Blackbox 0.61.1 window manager sources. - It is very light on resources and easy to handle but yet full of features to make an easy, - and extremely fast, desktop experience. It is written in C++ and licensed under MIT license. + Fluxbox is a X window manager based on Blackbox 0.61.1 window + manager sources. It is very light on resources and easy to + handle but yet full of features to make an easy, and extremely + fast, desktop experience. It is written in C++ and licensed + under MIT license. ''; homepage = http://fluxbox.org/; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.AndersonTorres ]; - platforms = stdenv.lib.platforms.linux; + license = licenses.mit; + maintainers = [ maintainers.AndersonTorres ]; + platforms = platforms.linux; }; } # Many thanks Jack Ryan from Nix-dev mailing list! diff --git a/pkgs/applications/window-managers/jwm/default.nix b/pkgs/applications/window-managers/jwm/default.nix index 73c5e5df81af..f019ba9751b9 100644 --- a/pkgs/applications/window-managers/jwm/default.nix +++ b/pkgs/applications/window-managers/jwm/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "jwm-2.2.2"; src = fetchurl { - url = "http://www.joewing.net/programs/jwm/releases/${name}.tar.xz"; + url = "http://www.joewing.net/projects/jwm/releases/${name}.tar.xz"; sha256 = "0nhyy78c6imk85d47bakk460x0cfhkyghqq82zghmb00dhwiryln"; }; |