alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #1998 from AndersonTorres/master

Browse source 
Maintainer and license modifications for some packages
This commit is contained in:
Peter Simons 2014-03-22 09:01:07 +01:00
parent 584d696943 f7498e5a7e
commit 57db4ba855
5 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lib/maintainers.nix
View file

@ -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>";

7
pkgs/applications/video/aegisub/default.nix
View file

@ -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;
};
}

3
pkgs/applications/video/mpv/default.nix
View file

@ -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;
};
}

3
pkgs/applications/virtualization/8086tiny/default.nix
View file

@ -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;
};
}

3
pkgs/applications/virtualization/bochs/default.nix
View file

@ -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;
};
}