diff options
20 files changed, 59 insertions, 33 deletions
diff --git a/pkgs/applications/audio/qmmp/default.nix b/pkgs/applications/audio/qmmp/default.nix index b865bc788c69..3462a822b389 100644 --- a/pkgs/applications/audio/qmmp/default.nix +++ b/pkgs/applications/audio/qmmp/default.nix @@ -49,9 +49,11 @@ stdenv.mkDerivation rec { libsamplerate ]; - meta = { + meta = with stdenv.lib; { description = "Qt-based audio player that looks like Winamp"; homepage = http://qmmp.ylsoftware.com/; - license = stdenv.lib.licenses.gpl2; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = maintainers.bjornfor; }; } diff --git a/pkgs/applications/graphics/openscad/default.nix b/pkgs/applications/graphics/openscad/default.nix index 64cbdb0ca9a0..cf4e7e635d09 100644 --- a/pkgs/applications/graphics/openscad/default.nix +++ b/pkgs/applications/graphics/openscad/default.nix @@ -38,6 +38,6 @@ stdenv.mkDerivation rec { platforms = with stdenv.lib.platforms; linux; maintainers = with stdenv.lib.maintainers; - [raskin]; + [raskin bjornfor]; }; } diff --git a/pkgs/applications/misc/evtest/default.nix b/pkgs/applications/misc/evtest/default.nix index 9d7b6fa7a281..c91c9fe20c3f 100644 --- a/pkgs/applications/misc/evtest/default.nix +++ b/pkgs/applications/misc/evtest/default.nix @@ -12,8 +12,10 @@ stdenv.mkDerivation rec { rev = "1a50f2479c4775e047f234a24d95dda82441bfbd"; }; - meta = { + meta = with stdenv.lib; { description = "Simple tool for input event debugging"; license = "GPLv2"; + platforms = platforms.linux; + maintainers = maintainers.bjornfor; }; } diff --git a/pkgs/applications/misc/pitz/default.nix b/pkgs/applications/misc/pitz/default.nix index 495583d95d4b..de475aecfdd4 100644 --- a/pkgs/applications/misc/pitz/default.nix +++ b/pkgs/applications/misc/pitz/default.nix @@ -23,9 +23,11 @@ buildPythonPackage rec { # runtime. If we use buildInputs it would just build, not run. propagatedBuildInputs = [ tempita jinja2 pyyaml clepy mock nose decorator docutils ]; - meta = { + meta = with stdenv.lib; { description = "Distributed bugtracker"; - license = stdenv.lib.licenses.bsd3; + license = licenses.bsd3; homepage = http://pitz.tplus1.com/; + platforms = platforms.linux; + maintainers = maintainers.bjornfor; }; } diff --git a/pkgs/applications/science/spyder/default.nix b/pkgs/applications/science/spyder/default.nix index 6c0125e4b850..268484c07353 100644 --- a/pkgs/applications/science/spyder/default.nix +++ b/pkgs/applications/science/spyder/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { cp spyderlib/images/spyder.svg $out/share/icons/ ''; - meta = { + meta = with stdenv.lib; { description = "Scientific PYthon Development EnviRonment (SPYDER)"; longDescription = '' Spyder (previously known as Pydee) is a powerful interactive development @@ -50,6 +50,8 @@ buildPythonPackage rec { testing, debugging and introspection features. ''; homepage = https://code.google.com/p/spyderlib/; - license = stdenv.lib.licenses.mit; + license = licenses.mit; + platforms = platforms.linux; + maintainers = maintainers.bjornfor; }; } diff --git a/pkgs/applications/version-management/git-and-tools/tig/default.nix b/pkgs/applications/version-management/git-and-tools/tig/default.nix index ea9ce97be161..20644d09dd70 100644 --- a/pkgs/applications/version-management/git-and-tools/tig/default.nix +++ b/pkgs/applications/version-management/git-and-tools/tig/default.nix @@ -13,10 +13,10 @@ stdenv.mkDerivation rec { mkdir -p $out/etc/bash_completion.d/ cp contrib/tig-completion.bash $out/etc/bash_completion.d/ ''; - meta = { + meta = with stdenv.lib; { homepage = "http://jonas.nitro.dk/tig/"; description = "Tig is a git repository browser that additionally can act as a pager for output from various git commands"; - maintainers = [ stdenv.lib.maintainers.garbas ]; - license = stdenv.lib.licenses.gpl2; + maintainers = [ maintainers.garbas maintainers.bjornfor ]; + license = licenses.gpl2; }; } diff --git a/pkgs/data/misc/freepats/default.nix b/pkgs/data/misc/freepats/default.nix index 356041bf761f..a2f77c936f15 100644 --- a/pkgs/data/misc/freepats/default.nix +++ b/pkgs/data/misc/freepats/default.nix @@ -10,13 +10,15 @@ stdenv.mkDerivation rec { installPhase = ''mkdir "$out"; cp -r . "$out"''; - meta = { + meta = with stdenv.lib; { description = "Instrument patches, for MIDI synthesizers"; longDescription = '' Freepats is a project to create a free and open set of instrument patches, in any format, that can be used with softsynths. ''; homepage = http://freepats.zenvoid.org/; - license = stdenv.lib.licenses.gpl2; + license = licenses.gpl2; + platforms = platforms.all; + maintainers = maintainers.bjornfor; }; } diff --git a/pkgs/development/compilers/sdcc/default.nix b/pkgs/development/compilers/sdcc/default.nix index ebc052764f2d..2794faf13f71 100644 --- a/pkgs/development/compilers/sdcc/default.nix +++ b/pkgs/development/compilers/sdcc/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ${if gputils == null then "--disable-pic14-port --disable-pic16-port" else ""} ''; - meta = { + meta = with stdenv.lib; { description = "Small Device C Compiler"; longDescription = '' SDCC is a retargettable, optimizing ANSI - C compiler suite that targets @@ -27,6 +27,8 @@ stdenv.mkDerivation rec { PIC18 targets. It can be retargeted for other microprocessors. ''; homepage = http://sdcc.sourceforge.net/; - license = stdenv.lib.licenses.gpl2; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = maintainers.bjornfor; }; } diff --git a/pkgs/development/libraries/wildmidi/default.nix b/pkgs/development/libraries/wildmidi/default.nix index 0c51bd2d38b5..f7df6a021955 100644 --- a/pkgs/development/libraries/wildmidi/default.nix +++ b/pkgs/development/libraries/wildmidi/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { echo "source ${freepats}/freepats.cfg" >> "$out"/etc/wildmidi.cfg ''; - meta = { + meta = with stdenv.lib; { description = "Software MIDI player and library"; longDescription = '' WildMIDI is a simple software midi player which has a core softsynth @@ -31,6 +31,8 @@ stdenv.mkDerivation rec { ''; homepage = http://wildmidi.sourceforge.net/; # The library is LGPLv3, the wildmidi executable is GPLv3 - license = stdenv.lib.licenses.lgpl3; + license = licenses.lgpl3; + platforms = platforms.linux; + maintainers = maintainers.bjornfor; }; } diff --git a/pkgs/development/tools/build-managers/buildbot-slave/default.nix b/pkgs/development/tools/build-managers/buildbot-slave/default.nix index da38bc0a1338..b28c4d9296fa 100644 --- a/pkgs/development/tools/build-managers/buildbot-slave/default.nix +++ b/pkgs/development/tools/build-managers/buildbot-slave/default.nix @@ -31,7 +31,7 @@ buildPythonPackage (rec { cp docs/buildslave.1 "$out/share/man/man1" ''; - meta = { + meta = with stdenv.lib; { homepage = http://buildbot.net/; license = "GPLv2+"; @@ -60,5 +60,7 @@ buildPythonPackage (rec { encouraging them to be more careful about testing before checking in code. ''; + maintainers = with maintainers; [ bjornfor ]; + platforms = platforms.all; }; }) diff --git a/pkgs/development/tools/build-managers/buildbot/default.nix b/pkgs/development/tools/build-managers/buildbot/default.nix index 239a20510348..8058c8dbd96f 100644 --- a/pkgs/development/tools/build-managers/buildbot/default.nix +++ b/pkgs/development/tools/build-managers/buildbot/default.nix @@ -49,7 +49,7 @@ buildPythonPackage (rec { cp docs/buildbot.1 "$out/share/man/man1" ''; - meta = { + meta = with stdenv.lib; { homepage = http://buildbot.net/; license = "GPLv2+"; @@ -80,7 +80,7 @@ buildPythonPackage (rec { in code. ''; - maintainers = [ stdenv.lib.maintainers.ludo ]; - platforms = stdenv.lib.platforms.all; + maintainers = with maintainers; [ ludo bjornfor ]; + platforms = platforms.all; }; }) diff --git a/pkgs/development/tools/build-managers/ninja/default.nix b/pkgs/development/tools/build-managers/ninja/default.nix index 168bd10718e2..425ec9dfd860 100644 --- a/pkgs/development/tools/build-managers/ninja/default.nix +++ b/pkgs/development/tools/build-managers/ninja/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { cp doc/manual.html $out/share/doc/ninja/ ''; - meta = { + meta = with stdenv.lib; { description = "Small build system with a focus on speed"; longDescription = '' Ninja is a small build system with a focus on speed. It differs from @@ -35,6 +35,8 @@ stdenv.mkDerivation rec { to run builds as fast as possible. ''; homepage = http://martine.github.io/ninja/; - license = stdenv.lib.licenses.asl20; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = maintainers.bjornfor; }; } diff --git a/pkgs/development/tools/misc/openocd/default.nix b/pkgs/development/tools/misc/openocd/default.nix index 0f0c74627768..c87bd9d55354 100644 --- a/pkgs/development/tools/misc/openocd/default.nix +++ b/pkgs/development/tools/misc/openocd/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ''; license = "GPLv2+"; - maintainers = with stdenv.lib.maintainers; [viric]; + maintainers = with stdenv.lib.maintainers; [ viric bjornfor ]; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/development/tools/misc/premake/default.nix b/pkgs/development/tools/misc/premake/default.nix index 07896dd100f6..9fc8ad924c07 100644 --- a/pkgs/development/tools/misc/premake/default.nix +++ b/pkgs/development/tools/misc/premake/default.nix @@ -22,9 +22,11 @@ stdenv.mkDerivation { install -Dm755 bin/release/premake4 $out/bin/premake4 ''; - meta = { + meta = with stdenv.lib; { homepage = http://industriousone.com/premake; description = "A simple build configuration and project generation tool using lua"; license = stdenv.lib.licenses.bsd3; + platforms = platforms.linux; + maintainers = maintainers.bjornfor; }; } diff --git a/pkgs/development/tools/misc/stlink/default.nix b/pkgs/development/tools/misc/stlink/default.nix index fe7b0ba31503..52c3ec67b1f2 100644 --- a/pkgs/development/tools/misc/stlink/default.nix +++ b/pkgs/development/tools/misc/stlink/default.nix @@ -18,8 +18,10 @@ stdenv.mkDerivation { buildInputs = [ autoconf automake libtool pkgconfig libusb1 ]; preConfigure = "./autogen.sh"; - meta = { + meta = with stdenv.lib; { description = "In-circuit debug and programming for ST-Link devices"; - license = stdenv.lib.licenses.bsd3; + license = licenses.bsd3; + platforms = platforms.linux; + maintainers = maintainers.bjornfor; }; } diff --git a/pkgs/development/tools/misc/tcptrack/default.nix b/pkgs/development/tools/misc/tcptrack/default.nix index 65a67dfc6efc..0715c5e085f3 100644 --- a/pkgs/development/tools/misc/tcptrack/default.nix +++ b/pkgs/development/tools/misc/tcptrack/default.nix @@ -12,9 +12,11 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses libpcap ]; - meta = { + meta = with stdenv.lib; { description = "libpcap based program for live TCP connection monitoring"; homepage = http://www.rhythm.cx/~steve/devel/tcptrack/; # dead link - license = stdenv.lib.licenses.lgpl21; + license = licenses.lgpl21; + platforms = platforms.linux; + maintainers = maintainers.bjornfor; }; } diff --git a/pkgs/servers/http/lighttpd/default.nix b/pkgs/servers/http/lighttpd/default.nix index 463840fcf4ca..680b161117c5 100644 --- a/pkgs/servers/http/lighttpd/default.nix +++ b/pkgs/servers/http/lighttpd/default.nix @@ -16,9 +16,11 @@ stdenv.mkDerivation { sed -i "s:/usr/bin/file:${file}/bin/file:g" configure ''; - meta = { + meta = with stdenv.lib; { description = "Lightweight high-performance web server"; homepage = http://www.lighttpd.net/; license = "BSD"; + platforms = platforms.linux; + maintainers = maintainers.bjornfor; }; } diff --git a/pkgs/servers/monitoring/munin/default.nix b/pkgs/servers/monitoring/munin/default.nix index bbb6d60ec6af..8329a9a05c95 100644 --- a/pkgs/servers/monitoring/munin/default.nix +++ b/pkgs/servers/monitoring/munin/default.nix @@ -92,7 +92,7 @@ stdenv.mkDerivation rec { ''; homepage = http://munin-monitoring.org/; license = licenses.gpl2; - maintainers = [ maintainers.iElectric ]; + maintainers = [ maintainers.iElectric maintainers.bjornfor ]; platforms = platforms.linux; }; } diff --git a/pkgs/shells/ipython/default.nix b/pkgs/shells/ipython/default.nix index 82ca13185b3c..4548e2dbfc43 100644 --- a/pkgs/shells/ipython/default.nix +++ b/pkgs/shells/ipython/default.nix @@ -46,12 +46,12 @@ buildPythonPackage rec { homepage = http://ipython.scipy.org/; description = "An interactive computing environment for Python"; license = "BSD"; - longDescription = '' The goal of IPython is to create a comprehensive environment for interactive and exploratory computing. It consists of an enhanced interactive Python shell and an architecture for interactive parallel computing. ''; + maintainers = stdenv.lib.maintainers.bjornfor; }; } diff --git a/pkgs/tools/graphics/graphviz/default.nix b/pkgs/tools/graphics/graphviz/default.nix index a5d2d20968a8..370ce4fc1a17 100644 --- a/pkgs/tools/graphics/graphviz/default.nix +++ b/pkgs/tools/graphics/graphviz/default.nix @@ -52,6 +52,6 @@ stdenv.mkDerivation rec { ''; platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.simons ]; + maintainers = with stdenv.lib.maintainers; [ simons bjornfor ]; }; } |