summary refs log tree commit diff
diff options
context:
space:
mode:
authorAndersonTorres <torres.anderson.85@gmail.com>2014-03-22 01:12:48 -0300
committerAndersonTorres <torres.anderson.85@gmail.com>2014-03-22 01:12:48 -0300
commitf7498e5a7ee46e8f8d17450397ef2dd129e2c9a5 (patch)
treeb80f8cfb2cd720f501528f733347afbe6589dffa
parent3c8f5c2471850089efed9d46f7451fc83e3fadce (diff)
downloadnixpkgs-f7498e5a7ee46e8f8d17450397ef2dd129e2c9a5.tar
nixpkgs-f7498e5a7ee46e8f8d17450397ef2dd129e2c9a5.tar.gz
nixpkgs-f7498e5a7ee46e8f8d17450397ef2dd129e2c9a5.tar.bz2
nixpkgs-f7498e5a7ee46e8f8d17450397ef2dd129e2c9a5.tar.lz
nixpkgs-f7498e5a7ee46e8f8d17450397ef2dd129e2c9a5.tar.xz
nixpkgs-f7498e5a7ee46e8f8d17450397ef2dd129e2c9a5.tar.zst
nixpkgs-f7498e5a7ee46e8f8d17450397ef2dd129e2c9a5.zip
Adding info about maintainer (myself - AndersonTorres) and modifying the meta.license field for some packages I have made.
-rw-r--r--lib/maintainers.nix1
-rw-r--r--pkgs/applications/video/aegisub/default.nix7
-rw-r--r--pkgs/applications/video/mpv/default.nix3
-rw-r--r--pkgs/applications/virtualization/8086tiny/default.nix3
-rw-r--r--pkgs/applications/virtualization/bochs/default.nix3
5 files changed, 13 insertions, 4 deletions
diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 8d6c613fd0f..07414a9ad3a 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -9,6 +9,7 @@
   all = "Nix Committers <nix-commits@lists.science.uu.nl>";
   amiddelk = "Arie Middelkoop <amiddelk@gmail.com>";
   amorsillo = "Andrew Morsillo <andrew.morsillo@gmail.com>";
+  AndersonTorres = "Anderson Torres <torres.anderson.85@gmail.com>";
   andres = "Andres Loeh <ksnixos@andres-loeh.de>";
   antono = "Antono Vasiljev <self@antono.info>";
   astsmtl = "Alexander Tsamutali <astsmtl@yandex.ru>";
diff --git a/pkgs/applications/video/aegisub/default.nix b/pkgs/applications/video/aegisub/default.nix
index cbbb23b04a0..fa17fb5ffd2 100644
--- a/pkgs/applications/video/aegisub/default.nix
+++ b/pkgs/applications/video/aegisub/default.nix
@@ -53,7 +53,12 @@ stdenv.mkDerivation rec {
       built-in real-time video preview.
     '';
     homepage = http://www.aegisub.org/;
-    license = "BSD"; # The Aegisub sources are itself BSD/ISC, but they are linked against GPL'd softwares
+    license = stdenv.lib.licenses.bsd3; 
+              # The Aegisub sources are itself BSD/ISC, 
+              # but they are linked against GPL'd softwares
+              # - so the resulting program will be GPL
+    maintainers = [ maintainers.AndersonTorres ];
     platforms = stdenv.lib.platforms.linux;
+
   };
 }
diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix
index a20dc0cf590..2ffefa35898 100644
--- a/pkgs/applications/video/mpv/default.nix
+++ b/pkgs/applications/video/mpv/default.nix
@@ -118,7 +118,8 @@ stdenv.mkDerivation rec {
     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 = "GPLv2+";
+    license = stdenv.lib.licenses.gpl2Plus;
+    maintainers = [ maintainers.AndersonTorres ];
     platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/applications/virtualization/8086tiny/default.nix b/pkgs/applications/virtualization/8086tiny/default.nix
index 0b4ff90e409..ca93a1bfd7c 100644
--- a/pkgs/applications/virtualization/8086tiny/default.nix
+++ b/pkgs/applications/virtualization/8086tiny/default.nix
@@ -31,7 +31,8 @@ stdenv.mkDerivation rec {
     8086tiny is based on an IOCCC 2013 winning entry. In fact that is the "unobfuscated" version :)
     '';
     homepage = http://www.megalith.co.uk/8086tiny/index.html;
-    license = "MIT";
+    license = stdenv.lib.licenses.mit;
+    maintainers = [ maintainers.AndersonTorres ];
     platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/applications/virtualization/bochs/default.nix b/pkgs/applications/virtualization/bochs/default.nix
index 6b8cf5dc035..7b49bb8220d 100644
--- a/pkgs/applications/virtualization/bochs/default.nix
+++ b/pkgs/applications/virtualization/bochs/default.nix
@@ -56,7 +56,8 @@ stdenv.mkDerivation rec {
     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 = "LGPL";
+    license = stdenv.lib.licenses.lgpl2Plus;
+    maintainers = [ maintainers.AndersonTorres ];
     platforms = stdenv.lib.platforms.linux;
   };
 }