3
0
Fork 0
forked from mirrors/nixpkgs

Turn more licenses into lib.licenses style

Should eval cleanly, as far as -A tarball tells me.

Relevant: issue , issue 
This commit is contained in:
Mateusz Kowalczyk 2014-11-06 00:44:33 +00:00
parent d91986c24f
commit 007f80c1d0
187 changed files with 835 additions and 791 deletions
lib
pkgs
applications
audio
editors
elvis
emacs-modes/proofgeneral
mg
nvi
graphics
cinepaint
gimp
paraview
misc
networking
browsers
cluster/rq
remote/freerdp
science
version-management/git-and-tools/fast-export
video
window-managers/larswm
data
fonts
aurulent-sans
opensans-ttf
redhat-liberation-fonts
source-code-pro
ubuntu-font-family
misc
mobile-broadband-provider-info
poppler-data
development

View file

@ -14,6 +14,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
* add it to this list. The URL mentioned above is a good source for inspiration. * add it to this list. The URL mentioned above is a good source for inspiration.
*/ */
afl21 = spdx {
spdxId = "AFL-2.1";
fullName = "Academic Free License";
};
agpl3 = spdx { agpl3 = spdx {
spdxId = "AGPL-3.0"; spdxId = "AGPL-3.0";
fullName = "GNU Affero General Public License v3.0"; fullName = "GNU Affero General Public License v3.0";
@ -40,6 +45,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
fullName = "Apple Public Source License 2.0"; fullName = "Apple Public Source License 2.0";
}; };
artistic1 = spdx {
spdxId = "Artistic-1.0";
fullName = "Artistic License 1.0";
};
artistic2 = spdx { artistic2 = spdx {
spdxId = "Artistic-2.0"; spdxId = "Artistic-2.0";
fullName = "Artistic License 2.0"; fullName = "Artistic License 2.0";
@ -72,7 +82,7 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
cc0 = spdx { cc0 = spdx {
spdxId = "CC0-1.0"; spdxId = "CC0-1.0";
fullName = ''Creative Commons Zero v1.0 Universal''; fullName = "Creative Commons Zero v1.0 Universal";
}; };
cc-by-30 = spdx { cc-by-30 = spdx {
@ -124,11 +134,21 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
fullName = "Unspecified free software license"; fullName = "Unspecified free software license";
}; };
gpl1Plus = spdx {
spdxId = "GPL-1.0+";
fullName = "GNU General Public License v1.0 or later";
};
gpl2 = spdx { gpl2 = spdx {
spdxId = "GPL-2.0"; spdxId = "GPL-2.0";
fullName = "GNU General Public License v2.0 only"; fullName = "GNU General Public License v2.0 only";
}; };
gpl2ClasspathPlus = {
fullName = "GNU General Public License v2.0 or later (with Classpath exception)";
url = https://fedoraproject.org/wiki/Licensing/GPL_Classpath_Exception;
};
gpl2Oss = { gpl2Oss = {
fullName = "GNU General Public License version 2 only (with OSI approved licenses linking exception)"; fullName = "GNU General Public License version 2 only (with OSI approved licenses linking exception)";
url = http://www.mysql.com/about/legal/licensing/foss-exception; url = http://www.mysql.com/about/legal/licensing/foss-exception;
@ -154,6 +174,12 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
url = https://fedoraproject.org/wiki/Licensing/GPL_Classpath_Exception; url = https://fedoraproject.org/wiki/Licensing/GPL_Classpath_Exception;
}; };
# Intel's license, seems free
iasl = {
fullName = "iASL";
url = http://www.calculate-linux.org/packages/licenses/iASL;
};
inria = { inria = {
fullName = "INRIA Non-Commercial License Agreement"; fullName = "INRIA Non-Commercial License Agreement";
url = "http://compcert.inria.fr/doc/LICENSE"; url = "http://compcert.inria.fr/doc/LICENSE";
@ -219,6 +245,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
url = http://opensource.franz.com/preamble.html; url = http://opensource.franz.com/preamble.html;
}; };
lppl12 = spdx {
spdxId = "LPPL-1.2";
fullName = "LaTeX Project Public License v1.2";
};
lpl-102 = spdx { lpl-102 = spdx {
spdxId = "LPL-1.02"; spdxId = "LPL-1.02";
fullName = "Lucent Public License v1.02"; fullName = "Lucent Public License v1.02";
@ -261,6 +292,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
fullName = "OpenSSL License"; fullName = "OpenSSL License";
}; };
php301 = spdx {
spdxId = "PHP-3.01";
fullName = "PHP License v3.01";
};
postgresql = spdx { postgresql = spdx {
spdxId = "PostgreSQL"; spdxId = "PostgreSQL";
fullName = "PostgreSQL License"; fullName = "PostgreSQL License";
@ -276,6 +312,26 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
fullName = "Public Domain"; fullName = "Public Domain";
}; };
qpl = spdx {
spdxId = "QPL-1.0";
fullName = "Q Public License 1.0";
};
qwt = {
fullName = "Qwt License, Version 1.0";
url = http://qwt.sourceforge.net/qwtlicense.html;
};
ruby = spdx {
spdxId = "Ruby";
fullName = "Ruby License";
};
sgi-b-20 = spdx {
spdxId = "SGI-B-2.0";
fullName = "SGI Free Software License B v2.0";
};
sleepycat = spdx { sleepycat = spdx {
spdxId = "Sleepycat"; spdxId = "Sleepycat";
fullName = "Sleepycat License"; fullName = "Sleepycat License";
@ -307,11 +363,26 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
fullName = "The Unlicense"; fullName = "The Unlicense";
}; };
vsl10 = spdx {
spdxId = "VSL-1.0";
fullName = "Vovida Software License v1.0";
};
w3c = spdx {
spdxId = "W3C";
fullName = "W3C Software Notice and License";
};
wadalab = { wadalab = {
fullName = "Wadalab Font License"; fullName = "Wadalab Font License";
url = https://fedoraproject.org/wiki/Licensing:Wadalab?rd=Licensing/Wadalab; url = https://fedoraproject.org/wiki/Licensing:Wadalab?rd=Licensing/Wadalab;
}; };
wtfpl = spdx {
spdxId = "WTFPL";
fullName = "Do What The F*ck You Want To Public License";
};
zlib = spdx { zlib = spdx {
spdxId = "Zlib"; spdxId = "Zlib";
fullName = "zlib License"; fullName = "zlib License";

View file

@ -66,7 +66,7 @@ in buildPythonPackage rec {
for you. Listen directly on your computer or on your mobile devices. for you. Listen directly on your computer or on your mobile devices.
''; '';
homepage = "http://gpodder.org/"; homepage = "http://gpodder.org/";
license = "GPLv3"; license = stdenv.lib.licenses.gpl3;
platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
maintainers = [ stdenv.lib.maintainers.skeidel ]; maintainers = [ stdenv.lib.maintainers.skeidel ];
}; };

View file

@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
meta = { meta = {
description = "utility to split mp3, ogg vorbis and FLAC files without decoding"; description = "utility to split mp3, ogg vorbis and FLAC files without decoding";
homepage = http://sourceforge.net/projects/mp3splt/; homepage = http://sourceforge.net/projects/mp3splt/;
license = "GPLv2"; license = stdenv.lib.licenses.gpl2;
maintainers = [ stdenv.lib.maintainers.bosu ]; maintainers = [ stdenv.lib.maintainers.bosu ];
platforms = stdenv.lib.platforms.unix; platforms = stdenv.lib.platforms.unix;
}; };

View file

@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
meta = { meta = {
description = "A vi/vim inspired client for the Music Player Daemon (mpd)."; description = "A vi/vim inspired client for the Music Player Daemon (mpd).";
homepage = https://github.com/boysetsfrog/vimpc; homepage = https://github.com/boysetsfrog/vimpc;
license = "GPL3"; license = stdenv.lib.licenses.gpl3;
platforms = stdenv.lib.platforms.linux; platforms = stdenv.lib.platforms.linux;
}; };
} }

View file

@ -35,6 +35,6 @@ stdenv.mkDerivation rec {
meta = { meta = {
homepage = http://elvis.vi-editor.org/; homepage = http://elvis.vi-editor.org/;
description = "A vi clone for Unix and other operating systems"; description = "A vi clone for Unix and other operating systems";
license = "free"; license = stdenv.lib.licenses.free;
}; };
} }

View file

@ -47,7 +47,7 @@ stdenv.mkDerivation (rec {
interactive theorem provers), based on the customizable text editor Emacs. interactive theorem provers), based on the customizable text editor Emacs.
''; '';
homepage = http://proofgeneral.inf.ed.ac.uk; homepage = http://proofgeneral.inf.ed.ac.uk;
license = "GPLv2+"; license = stdenv.lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.unix; # arbitrary choice platforms = stdenv.lib.platforms.unix; # arbitrary choice
}; };
}) })

View file

@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
meta = { meta = {
homepage = http://homepage.boetes.org/software/mg/; homepage = http://homepage.boetes.org/software/mg/;
description = "Micro GNU/emacs, a portable version of the mg maintained by the OpenBSD team"; description = "Micro GNU/emacs, a portable version of the mg maintained by the OpenBSD team";
license = "public domain"; license = stdenv.lib.licenses.publicDomain;
platforms = stdenv.lib.platforms.all; platforms = stdenv.lib.platforms.all;
}; };
} }

View file

@ -49,6 +49,6 @@ stdenv.mkDerivation rec {
meta = { meta = {
homepage = http://www.bostic.com/vi/; homepage = http://www.bostic.com/vi/;
description = "The Berkeley Vi Editor"; description = "The Berkeley Vi Editor";
license = "free"; license = stdenv.lib.licenses.free;
}; };
} }

View file

@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
meta = { meta = {
homepage = http://www.cinepaint.org/; homepage = http://www.cinepaint.org/;
license = "free"; license = stdenv.lib.licenses.free;
description = "Image editor which supports images over 8bpp and ICC profiles"; description = "Image editor which supports images over 8bpp and ICC profiles";
maintainers = with stdenv.lib.maintainers; [viric]; maintainers = with stdenv.lib.maintainers; [viric];
platforms = stdenv.lib.platforms.linux; platforms = stdenv.lib.platforms.linux;

View file

@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
meta = { meta = {
description = "The GNU Image Manipulation Program"; description = "The GNU Image Manipulation Program";
homepage = http://www.gimp.org/; homepage = http://www.gimp.org/;
license = "GPL"; license = stdenv.lib.licenses.gpl3Plus;
platforms = stdenv.lib.platforms.linux; platforms = stdenv.lib.platforms.linux;
}; };
} }

View file

@ -59,7 +59,7 @@ rec {
sed -e 's,^\(GIMP_PLUGIN_DIR=\).*,\1'"$out/${gimp.name}-plugins", \ sed -e 's,^\(GIMP_PLUGIN_DIR=\).*,\1'"$out/${gimp.name}-plugins", \
-e 's,^\(GIMP_DATA_DIR=\).*,\1'"$out/share/${gimp.name}", -i configure -e 's,^\(GIMP_DATA_DIR=\).*,\1'"$out/share/${gimp.name}", -i configure
''; '';
meta = { meta = {
description = "The GIMP Animation Package"; description = "The GIMP Animation Package";
homepage = http://www.gimp.org; homepage = http://www.gimp.org;
# The main code is given in GPLv3, but it has ffmpeg in it, and I think ffmpeg license # The main code is given in GPLv3, but it has ffmpeg in it, and I think ffmpeg license
@ -174,10 +174,10 @@ rec {
sourceRoot = "${name}/src"; sourceRoot = "${name}/src";
buildPhase = "make gimp"; buildPhase = "make gimp";
installPhase = "installPlugins gmic_gimp"; installPhase = "installPlugins gmic_gimp";
meta = { meta = {
description = "script language for image processing which comes with its open-source interpreter"; description = "script language for image processing which comes with its open-source interpreter";
homepage = http://gmic.sourceforge.net/repository.shtml; homepage = http://gmic.sourceforge.net/repository.shtml;
license = "CeCILL FREE SOFTWARE LICENSE AGREEMENT"; license = stdenv.lib.licenses.cecill20;
/* /*
The purpose of this Free Software license agreement is to grant users The purpose of this Free Software license agreement is to grant users
the right to modify and redistribute the software governed by this the right to modify and redistribute the software governed by this
@ -197,7 +197,7 @@ rec {
# --enable-dst-correction - enable DST correction for file timestamps. # --enable-dst-correction - enable DST correction for file timestamps.
# --enable-contrast - enable the contrast setting option. # --enable-contrast - enable the contrast setting option.
# --enable-interp-none: enable 'None' interpolation (mostly for debugging). # --enable-interp-none: enable 'None' interpolation (mostly for debugging).
# --with-lensfun: use the lensfun library - experimental feature, read this before using it. # --with-lensfun: use the lensfun library - experimental feature, read this before using it.
# --with-prefix=PREFIX - use also PREFIX as an input prefix for the build # --with-prefix=PREFIX - use also PREFIX as an input prefix for the build
# --with-dosprefix=PREFIX - PREFIX in the the prefix in dos format (needed only for ms-window # --with-dosprefix=PREFIX - PREFIX in the the prefix in dos format (needed only for ms-window
configureFlags = "--enable-extras --enable-dst-correction --enable-contrast"; configureFlags = "--enable-extras --enable-dst-correction --enable-contrast";

View file

@ -36,9 +36,8 @@ stdenv.mkDerivation rec {
meta = { meta = {
homepage = "http://www.paraview.org/"; homepage = "http://www.paraview.org/";
description = "3D Data analysis and visualization application"; description = "3D Data analysis and visualization application";
license = "free"; license = stdenv.lib.licenses.free;
maintainers = with stdenv.lib.maintainers; [viric guibert]; maintainers = with stdenv.lib.maintainers; [viric guibert];
platforms = with stdenv.lib.platforms; linux; platforms = with stdenv.lib.platforms; linux;
}; };
} }

View file

@ -2,7 +2,7 @@
stdenv.mkDerivation { stdenv.mkDerivation {
name = "d4x-2.5.7.1"; name = "d4x-2.5.7.1";
inherit boost; inherit boost;
src = fetchurl { src = fetchurl {
@ -12,9 +12,9 @@ stdenv.mkDerivation {
buildInputs = [ gtk glib pkgconfig openssl boost ]; buildInputs = [ gtk glib pkgconfig openssl boost ];
meta = { meta = {
description = "Graphical download manager"; description = "Graphical download manager";
homepage = http://www.krasu.ru/soft/chuchelo/; homepage = http://www.krasu.ru/soft/chuchelo/;
license = "perl"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
}; };
} }

View file

@ -2,9 +2,9 @@ x@{builderDefsPackage
, jre, unzip , jre, unzip
, ...}: , ...}:
builderDefsPackage builderDefsPackage
(a : (a :
let let
helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
[]; [];
buildInputs = map (n: builtins.getAttr n x) buildInputs = map (n: builtins.getAttr n x)
@ -32,11 +32,11 @@ rec {
doDeploy = a.fullDepEntry '' doDeploy = a.fullDepEntry ''
mkdir -p "$out"/{share/vue,bin} mkdir -p "$out"/{share/vue,bin}
cp ${src} "$out/share/vue/vue.jar" cp ${src} "$out/share/vue/vue.jar"
echo '#!${a.stdenv.shell}' >> "$out/bin/vue" echo '#!${a.stdenv.shell}' >> "$out/bin/vue"
echo '${a.jre}/bin/java -jar "'"$out/share/vue/vue.jar"'" "$@"' >> "$out/bin/vue" echo '${a.jre}/bin/java -jar "'"$out/share/vue/vue.jar"'" "$@"' >> "$out/bin/vue"
chmod a+x "$out/bin/vue" chmod a+x "$out/bin/vue"
'' ["addInputs" "defEnsureDir"]; '' ["addInputs" "defEnsureDir"];
meta = { meta = {
description = "Visual Understanding Environment - mind mapping software"; description = "Visual Understanding Environment - mind mapping software";
maintainers = with a.lib.maintainers; maintainers = with a.lib.maintainers;
@ -45,7 +45,6 @@ rec {
]; ];
platforms = with a.lib.platforms; platforms = with a.lib.platforms;
linux; linux;
license = "free-noncopyleft"; # Apache License fork, actually license = a.lib.licenses.free; # Apache License fork, actually
}; };
}) x }) x

View file

@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
meta = { meta = {
homepage = http://www.x.org/; homepage = http://www.x.org/;
description = "Allows testing the fonts available in an X server"; description = "Allows testing the fonts available in an X server";
license = "free"; license = stdenv.lib.licenses.free;
maintainers = with stdenv.lib.maintainers; [viric]; maintainers = with stdenv.lib.maintainers; [viric];
platforms = with stdenv.lib.platforms; linux ++ darwin; platforms = with stdenv.lib.platforms; linux ++ darwin;
}; };

View file

@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
meta = { meta = {
homepage = http://www.x.org/; homepage = http://www.x.org/;
description = "Lists the fonts available in the X server"; description = "Lists the fonts available in the X server";
license = "free"; license = stdenv.lib.licenses.free;
maintainers = with stdenv.lib.maintainers; [viric]; maintainers = with stdenv.lib.maintainers; [viric];
platforms = with stdenv.lib.platforms; linux ++ darwin; platforms = with stdenv.lib.platforms; linux ++ darwin;
}; };

View file

@ -15,10 +15,10 @@ stdenv.mkDerivation {
installPhase = "make PREFIX=$out install"; installPhase = "make PREFIX=$out install";
meta = { meta = {
description = "cross platform, open source library for generating PDF files"; description = "cross platform, open source library for generating PDF files";
homepage = http://libharu.org/wiki/Main_Page; homepage = http://libharu.org/wiki/Main_Page;
license = "ZLIB/LIBPNG"; # see README. license = with stdenv.lib.licenses; [ libpng zlib ];
maintainers = [args.lib.maintainers.marcweber]; maintainers = [args.lib.maintainers.marcweber];
platforms = args.lib.platforms.linux; platforms = args.lib.platforms.linux;
broken = true; broken = true;

View file

@ -82,6 +82,6 @@ stdenv.mkDerivation rec {
meta = { meta = {
homepage = http://www.opera.com; homepage = http://www.opera.com;
description = "Web browser"; description = "Web browser";
license = "unfree"; license = stdenv.lib.licenses.unfree;
}; };
} }

View file

@ -25,7 +25,7 @@ stdenv.mkDerivation {
''; '';
meta = { meta = {
license = "Ruby"; license = stdenv.lib.licenses.ruby;
homepage = "http://www.codeforpeople.com/lib/ruby/rq/"; homepage = "http://www.codeforpeople.com/lib/ruby/rq/";
description = "Simple cluster queue runner"; description = "Simple cluster queue runner";
longDescription = "rq creates instant linux clusters by managing priority work queues, even on a multi-core single machine. This cluster runner is easy to install and easy to manage, contrasting with the common complicated solutions."; longDescription = "rq creates instant linux clusters by managing priority work queues, even on a multi-core single machine. This cluster runner is easy to install and easy to manage, contrasting with the common complicated solutions.";

View file

@ -60,6 +60,6 @@ stdenv.mkDerivation rec {
homepage = http://www.freerdp.com/; homepage = http://www.freerdp.com/;
license = "free-non-copyleft"; license = stdenv.lib.licenses.free;
}; };
} }

View file

@ -2,9 +2,9 @@ x@{builderDefsPackage
, flex, bison, gmp, perl , flex, bison, gmp, perl
, ...}: , ...}:
builderDefsPackage builderDefsPackage
(a : (a :
let let
helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
["gmp"]; ["gmp"];
buildInputs = (map (n: builtins.getAttr n x) buildInputs = (map (n: builtins.getAttr n x)
@ -33,7 +33,7 @@ rec {
sed -e "s@ /bin/bash@bash@g" -i Makefile.std sed -e "s@ /bin/bash@bash@g" -i Makefile.std
find . -exec sed -e "s@/usr/bin/perl@${perl}/bin/perl@g" -i '{}' ';' find . -exec sed -e "s@/usr/bin/perl@${perl}/bin/perl@g" -i '{}' ';'
'') ["minInit" "doUnpack"]; '') ["minInit" "doUnpack"];
meta = { meta = {
description = "A prover for satisfiability modulo theory (SMT)"; description = "A prover for satisfiability modulo theory (SMT)";
maintainers = with a.lib.maintainers; maintainers = with a.lib.maintainers;
@ -42,7 +42,7 @@ rec {
]; ];
platforms = with a.lib.platforms; platforms = with a.lib.platforms;
linux; linux;
license = "free-noncopyleft"; license = a.lib.licenses.free;
homepage = "http://www.cs.nyu.edu/acsys/cvc3/index.html"; homepage = "http://www.cs.nyu.edu/acsys/cvc3/index.html";
}; };
passthru = { passthru = {
@ -51,4 +51,3 @@ rec {
}; };
}; };
}) x }) x

View file

@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
target-system terms. target-system terms.
''; '';
homepage = http://www.cl.cam.ac.uk/~pes20/ott; homepage = http://www.cl.cam.ac.uk/~pes20/ott;
license = "BSD3"; license = stdenv.lib.licenses.bsd3;
maintainers = with stdenv.lib.maintainers; [ jwiegley ]; maintainers = with stdenv.lib.maintainers; [ jwiegley ];
platforms = stdenv.lib.platforms.unix; platforms = stdenv.lib.platforms.unix;
}; };

View file

@ -2,9 +2,9 @@ x@{builderDefsPackage
, sbcl, zlib , sbcl, zlib
, ...}: , ...}:
builderDefsPackage builderDefsPackage
(a : (a :
let let
helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
[]; [];
buildInputs = map (n: builtins.getAttr n x) buildInputs = map (n: builtins.getAttr n x)
@ -47,11 +47,11 @@ rec {
sbcl --load make.lisp sbcl --load make.lisp
! ( ./test | grep ERROR ) ! ( ./test | grep ERROR )
mkdir -p "$out/bin" mkdir -p "$out/bin"
cp bin/satallax "$out/bin" cp bin/satallax "$out/bin"
'') ["defEnsureDir" "minInit" "addInputs" "doUnpack"]; '') ["defEnsureDir" "minInit" "addInputs" "doUnpack"];
meta = { meta = {
description = "A higher-order logic prover"; description = "A higher-order logic prover";
maintainers = with a.lib.maintainers; maintainers = with a.lib.maintainers;
@ -60,7 +60,7 @@ rec {
]; ];
platforms = with a.lib.platforms; platforms = with a.lib.platforms;
unix; unix;
license = "free-noncopyleft"; license = a.lib.licenses.free;
homepage = "http://www.ps.uni-saarland.de/~cebrown/satallax/"; homepage = "http://www.ps.uni-saarland.de/~cebrown/satallax/";
}; };
passthru = { passthru = {
@ -69,4 +69,3 @@ rec {
}; };
}; };
}) x }) x

View file

@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
Standard ML. Standard ML.
''; '';
homepage = http://twelf.org/wiki/Main_Page; homepage = http://twelf.org/wiki/Main_Page;
license = "MIT"; license = stdenv.lib.licenses.mit;
maintainers = with stdenv.lib.maintainers; [ jwiegley ]; maintainers = with stdenv.lib.maintainers; [ jwiegley ];
platforms = stdenv.lib.platforms.unix; platforms = stdenv.lib.platforms.unix;
}; };

View file

@ -16,7 +16,7 @@ stdenv.mkDerivation {
meta = { meta = {
description = "Curve fitting and peak fitting software"; description = "Curve fitting and peak fitting software";
license = "GPL2"; license = stdenv.lib.licenses.gpl2;
homepage = http://fityk.nieto.pl/; homepage = http://fityk.nieto.pl/;
platforms = stdenv.lib.platforms.linux; platforms = stdenv.lib.platforms.linux;
}; };

View file

@ -40,7 +40,7 @@ stdenv.mkDerivation {
homepage = http://vite.gforge.inria.fr/; homepage = http://vite.gforge.inria.fr/;
license = "CeCILL-A"; license = stdenv.lib.licenses.cecill20;
maintainers = [ stdenv.lib.maintainers.ludo ]; maintainers = [ stdenv.lib.maintainers.ludo ];
platforms = stdenv.lib.platforms.gnu; # arbitrary choice platforms = stdenv.lib.platforms.gnu; # arbitrary choice

View file

@ -30,10 +30,10 @@ stdenv.mkDerivation {
done done
''; '';
# usage: # usage:
meta = { meta = {
description = "import svn, mercurial into git"; description = "import svn, mercurial into git";
homepage = "http://repo.or.cz/w/fast-export.git"; homepage = "http://repo.or.cz/w/fast-export.git";
license = "?"; # the .py file is GPLv2 license = stdenv.lib.licenses.gpl2;
}; };
} }

View file

@ -11,12 +11,11 @@ stdenv.mkDerivation rec {
buildInputs = [ pkgconfig lua5 curl quvi_scripts libproxy libgcrypt ]; buildInputs = [ pkgconfig lua5 curl quvi_scripts libproxy libgcrypt ];
meta = { meta = {
description = "Web video downloader"; description = "Web video downloader";
homepage = http://quvi.sf.net; homepage = http://quvi.sf.net;
license = "LGPLv2.1+"; license = stdenv.lib.licenses.lgpl21Plus;
platforms = stdenv.lib.platforms.linux; platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.mornfall ]; maintainers = [ stdenv.lib.maintainers.mornfall ];
}; };
} }

View file

@ -11,12 +11,11 @@ stdenv.mkDerivation rec {
buildInputs = [ pkgconfig ]; buildInputs = [ pkgconfig ];
meta = { meta = {
description = "Web video downloader"; description = "Web video downloader";
homepage = http://quvi.sf.net; homepage = http://quvi.sf.net;
license = "LGPLv2.1+"; license = stdenv.lib.licenses.lgpl21Plus;
platforms = stdenv.lib.platforms.linux; platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.mornfall ]; maintainers = [ stdenv.lib.maintainers.mornfall ];
}; };
} }

View file

@ -102,7 +102,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = http://xbmc.org/; homepage = http://xbmc.org/;
description = "Media center"; description = "Media center";
license = "GPLv2"; license = stdenv.lib.licenses.gpl2;
platforms = platforms.linux; platforms = platforms.linux;
maintainers = [ maintainers.iElectric maintainers.titanous ]; maintainers = [ maintainers.iElectric maintainers.titanous ];
}; };

View file

@ -19,6 +19,6 @@ stdenv.mkDerivation {
meta = { meta = {
homepage = http://larswm.fnurt.net/; homepage = http://larswm.fnurt.net/;
description = "9wm-like tiling window manager"; description = "9wm-like tiling window manager";
license = "free"; license = stdenv.lib.licenses.free;
}; };
} }

View file

@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
description = "Aurulent Sans"; description = "Aurulent Sans";
longDescription = "Aurulent Sans is a humanist sans serif intended to be used as an interface font."; longDescription = "Aurulent Sans is a humanist sans serif intended to be used as an interface font.";
homepage = http://delubrum.org/; homepage = http://delubrum.org/;
license = "SIL"; license = stdenv.lib.licenses.ofl;
platforms = stdenv.lib.platforms.all; platforms = stdenv.lib.platforms.all;
}; };
} }

View file

@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
''; '';
homepage = "http://en.wikipedia.org/wiki/Open_Sans"; homepage = "http://en.wikipedia.org/wiki/Open_Sans";
license = "Apache"; license = stdenv.lib.licenses.asl20;
platforms = stdenv.lib.platforms.all; platforms = stdenv.lib.platforms.all;
maintainers = [ ]; maintainers = [ ];

View file

@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
url = "https://fedorahosted.org/releases/l/i/liberation-fonts/liberation-fonts-ttf-${version}.tar.gz"; url = "https://fedorahosted.org/releases/l/i/liberation-fonts/liberation-fonts-ttf-${version}.tar.gz";
sha256 = "010m4zfqan4w04b6bs9pm3gapn9hsb18bmwwgp2p6y6idj52g43q"; sha256 = "010m4zfqan4w04b6bs9pm3gapn9hsb18bmwwgp2p6y6idj52g43q";
}; };
installPhase = '' installPhase = ''
mkdir -p $out/share/fonts/truetype mkdir -p $out/share/fonts/truetype
cp -v $( find . -name '*.ttf') $out/share/fonts/truetype cp -v $( find . -name '*.ttf') $out/share/fonts/truetype
@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
''; '';
# See `License.txt' for details. # See `License.txt' for details.
license = "GPLv2 + exception"; license = stdenv.lib.licenses.gpl2Oss;
homepage = https://fedorahosted.org/liberation-fonts/; homepage = https://fedorahosted.org/liberation-fonts/;

View file

@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
url = "https://fedorahosted.org/releases/l/i/liberation-fonts/${name}.tar.gz"; url = "https://fedorahosted.org/releases/l/i/liberation-fonts/${name}.tar.gz";
sha256 = "1ymryvd2nw4jmw4w5y1i3ll2dn48rpkqzlsgv7994lk6qc9cdjvs"; sha256 = "1ymryvd2nw4jmw4w5y1i3ll2dn48rpkqzlsgv7994lk6qc9cdjvs";
}; };
buildInputs = [fontforge python pythonPackages.fonttools]; buildInputs = [fontforge python pythonPackages.fonttools];
installPhase = '' installPhase = ''
@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
''; '';
# See `License.txt' for details. # See `License.txt' for details.
license = "GPLv2 + exception"; license = stdenv.lib.licenses.gpl2Oss;
homepage = https://fedorahosted.org/liberation-fonts/; homepage = https://fedorahosted.org/liberation-fonts/;

View file

@ -37,6 +37,6 @@ rec {
maintainers = with a.lib.maintainers; [ relrod ]; maintainers = with a.lib.maintainers; [ relrod ];
platforms = with a.lib.platforms; all; platforms = with a.lib.platforms; all;
homepage = "http://blog.typekit.com/2012/09/24/source-code-pro/"; homepage = "http://blog.typekit.com/2012/09/24/source-code-pro/";
license = "OFL"; license = a.lib.licenses.ofl;
}; };
}) x }) x

View file

@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
contemporary style and contains characteristics unique to contemporary style and contains characteristics unique to
the Ubuntu brand that convey a precise, reliable and free attitude."; the Ubuntu brand that convey a precise, reliable and free attitude.";
homepage = http://font.ubuntu.com/; homepage = http://font.ubuntu.com/;
license = "free"; license = stdenv.lib.licenses.free;
platforms = stdenv.lib.platforms.all; platforms = stdenv.lib.platforms.all;
maintainers = [ stdenv.lib.maintainers.antono ]; maintainers = [ stdenv.lib.maintainers.antono ];
}; };

View file

@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
description = "Mobile broadband service provider database"; description = "Mobile broadband service provider database";
homepage = http://live.gnome.org/NetworkManager/MobileBroadband/ServiceProviders; homepage = http://live.gnome.org/NetworkManager/MobileBroadband/ServiceProviders;
platforms = stdenv.lib.platforms.all; platforms = stdenv.lib.platforms.all;
license = "CC-PD"; license = stdenv.lib.licenses.publicDomain;
maintainers = [ stdenv.lib.maintainers.urkud ]; maintainers = [ stdenv.lib.maintainers.urkud ];
}; };
} }

View file

@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
homepage = http://poppler.freedesktop.org/; homepage = http://poppler.freedesktop.org/;
description = "Encoding files for Poppler, a PDF rendering library"; description = "Encoding files for Poppler, a PDF rendering library";
platforms = stdenv.lib.platforms.all; platforms = stdenv.lib.platforms.all;
license = "free"; # more free licenses combined license = stdenv.lib.licenses.free; # more free licenses combined
maintainers = [ stdenv.lib.maintainers.urkud ]; maintainers = [ stdenv.lib.maintainers.urkud ];
}; };
} }

View file

@ -35,7 +35,7 @@ stdenv.mkDerivation {
which runs on most major Unix platforms. It mainly conforms to the which runs on most major Unix platforms. It mainly conforms to the
ANSI Common Lisp standard. ANSI Common Lisp standard.
''; '';
license = "free"; # public domain license = stdenv.lib.licenses.free; # public domain
homepage = http://www.cons.org/cmucl/; homepage = http://www.cons.org/cmucl/;
}; };
} }

View file

@ -37,6 +37,6 @@ stdenv.mkDerivation rec {
homepage = https://github.com/kripken/emscripten-fastcomp; homepage = https://github.com/kripken/emscripten-fastcomp;
description = "emscripten llvm"; description = "emscripten llvm";
maintainers = with maintainers; [ bosu ]; maintainers = with maintainers; [ bosu ];
license = "University of Illinois/NCSA Open Source License"; license = stdenv.lib.licenses.ncsa;
}; };
} }

View file

@ -23,6 +23,6 @@ stdenv.mkDerivation {
meta = { meta = {
description = "Intel ACPI Compiler"; description = "Intel ACPI Compiler";
homepage = http://www.acpica.org/; homepage = http://www.acpica.org/;
license = "iasl"; # FIXME: is this a free software license? license = stdenv.lib.licenses.iasl;
}; };
} }

View file

@ -56,6 +56,6 @@ stdenv.mkDerivation rec {
description = "Cross platform, open source .NET development framework"; description = "Cross platform, open source .NET development framework";
platforms = with stdenv.lib.platforms; linux; platforms = with stdenv.lib.platforms; linux;
maintainers = with stdenv.lib.maintainers; [ viric thoughtpolice ]; maintainers = with stdenv.lib.maintainers; [ viric thoughtpolice ];
license = "free"; # Combination of LGPL/X11/GPL ? license = stdenv.lib.licenses.free; # Combination of LGPL/X11/GPL ?
}; };
} }

View file

@ -1,9 +1,9 @@
{ stdenv, fetchurl, x11, ncurses }: { stdenv, fetchurl, x11, ncurses }:
stdenv.mkDerivation (rec { stdenv.mkDerivation (rec {
name = "ocaml-3.10.0"; name = "ocaml-3.10.0";
src = fetchurl { src = fetchurl {
url = "http://caml.inria.fr/pub/distrib/ocaml-3.10/${name}.tar.bz2"; url = "http://caml.inria.fr/pub/distrib/ocaml-3.10/${name}.tar.bz2";
sha256 = "1ihmx1civ78s7k2hfc05z1s9vbyx2qw7fg8lnbxnfd6zxkk8878d"; sha256 = "1ihmx1civ78s7k2hfc05z1s9vbyx2qw7fg8lnbxnfd6zxkk8878d";
@ -13,7 +13,7 @@ stdenv.mkDerivation (rec {
configureFlags = ["-no-tk" "-x11lib" x11]; configureFlags = ["-no-tk" "-x11lib" x11];
buildFlags = "world bootstrap world.opt"; buildFlags = "world bootstrap world.opt";
buildInputs = [x11 ncurses]; buildInputs = [x11 ncurses];
installTargets = "install installopt"; installTargets = "install installopt";
patchPhase = '' patchPhase = ''
CAT=$(type -tp cat) CAT=$(type -tp cat)
sed -e "s@/bin/cat@$CAT@" -i config/auto-aux/sharpbang sed -e "s@/bin/cat@$CAT@" -i config/auto-aux/sharpbang
@ -25,7 +25,7 @@ stdenv.mkDerivation (rec {
meta = { meta = {
homepage = http://caml.inria.fr/ocaml; homepage = http://caml.inria.fr/ocaml;
license = "QPL, LGPL2 (library part)"; license = with stdenv.lib.licenses; [ qpl lgpl2 ];
description = "Most popular variant of the Caml language"; description = "Most popular variant of the Caml language";
}; };

View file

@ -1,9 +1,9 @@
{ stdenv, fetchurl, x11, ncurses }: { stdenv, fetchurl, x11, ncurses }:
stdenv.mkDerivation (rec { stdenv.mkDerivation (rec {
name = "metaocaml-3.09-alpha-30"; name = "metaocaml-3.09-alpha-30";
src = fetchurl { src = fetchurl {
url = "http://www.metaocaml.org/dist/old/MetaOCaml_309_alpha_030.tar.gz"; url = "http://www.metaocaml.org/dist/old/MetaOCaml_309_alpha_030.tar.gz";
sha256 = "0migbn0zwfb7yb24dy7qfqi19sv3drqcv4369xi7xzpds2cs35fd"; sha256 = "0migbn0zwfb7yb24dy7qfqi19sv3drqcv4369xi7xzpds2cs35fd";
@ -13,7 +13,7 @@ stdenv.mkDerivation (rec {
configureFlags = ["-no-tk" "-x11lib" x11]; configureFlags = ["-no-tk" "-x11lib" x11];
buildFlags = "world bootstrap world.opt"; buildFlags = "world bootstrap world.opt";
buildInputs = [x11 ncurses]; buildInputs = [x11 ncurses];
installTargets = "install installopt"; installTargets = "install installopt";
patchPhase = '' patchPhase = ''
CAT=$(type -tp cat) CAT=$(type -tp cat)
sed -e "s@/bin/cat@$CAT@" -i config/auto-aux/sharpbang sed -e "s@/bin/cat@$CAT@" -i config/auto-aux/sharpbang
@ -25,7 +25,7 @@ stdenv.mkDerivation (rec {
meta = { meta = {
homepage = http://www.metaocaml.org/; homepage = http://www.metaocaml.org/;
license = "QPL, LGPL2 (library part)"; license = with stdenv.lib.licenses; [ qpl lgpl2 ];
desctiption = "A compiled, type-safe, multi-stage programming language"; desctiption = "A compiled, type-safe, multi-stage programming language";
}; };

View file

@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
meta = { meta = {
homepage = "http://www.dcc.fc.up.pt/~vsc/Yap/"; homepage = "http://www.dcc.fc.up.pt/~vsc/Yap/";
description = "Yap Prolog System is a ISO-compatible high-performance Prolog compiler"; description = "Yap Prolog System is a ISO-compatible high-performance Prolog compiler";
license = "artistic"; license = stdenv.lib.licenses.artistic2;
maintainers = [ stdenv.lib.maintainers.simons ]; maintainers = [ stdenv.lib.maintainers.simons ];
platforms = stdenv.lib.platforms.linux; platforms = stdenv.lib.platforms.linux;

View file

@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
homepage = http://www.eclipse.org/jdt/core/index.php; homepage = http://www.eclipse.org/jdt/core/index.php;
# http://www.eclipse.org/legal/epl-v10.html (free software, copyleft) # http://www.eclipse.org/legal/epl-v10.html (free software, copyleft)
license = "EPLv1.0"; license = stdenv.lib.licenses.epl10;
platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
}; };

View file

@ -27,6 +27,6 @@ stdenv.mkDerivation rec {
meta = { meta = {
description = "Ruby interpreter written in Java"; description = "Ruby interpreter written in Java";
homepage = http://jruby.org/; homepage = http://jruby.org/;
license = "CPL-1.0 GPL-2 LGPL-2.1"; # one of those license = with stdenv.lib.licenses; [ cpl10 gpl2 lgpl21 ];
}; };
} }

View file

@ -2,9 +2,9 @@ x@{builderDefsPackage
, fetchgit , fetchgit
, ...}: , ...}:
builderDefsPackage builderDefsPackage
(a : (a :
let let
helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
["fetchgit"]; ["fetchgit"];
buildInputs = map (n: builtins.getAttr n x) buildInputs = map (n: builtins.getAttr n x)
@ -31,7 +31,7 @@ rec {
prepareOut = a.fullDepEntry '' prepareOut = a.fullDepEntry ''
mkdir -p "$out/bin" mkdir -p "$out/bin"
'' ["minInit" "defEnsureDir"]; '' ["minInit" "defEnsureDir"];
meta = { meta = {
description = "An interpreter of K, APL-like programming language"; description = "An interpreter of K, APL-like programming language";
maintainers = with a.lib.maintainers; maintainers = with a.lib.maintainers;
@ -40,7 +40,7 @@ rec {
]; ];
platforms = with a.lib.platforms; platforms = with a.lib.platforms;
linux; linux;
license = "free-noncopyleft"; license = a.lib.licenses.free;
}; };
passthru = { passthru = {
updateInfo = { updateInfo = {
@ -48,4 +48,3 @@ rec {
}; };
}; };
}) x }) x

View file

@ -185,12 +185,6 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
php is build within this derivation in order to add the xdebug lines to the php.ini. php is build within this derivation in order to add the xdebug lines to the php.ini.
So both Apache and command line php both use xdebug without having to configure anything. So both Apache and command line php both use xdebug without having to configure anything.
Xdebug could be put in its own derivation. Xdebug could be put in its own derivation.
* /
meta = {
description = "debugging support for PHP";
homepage = http://xdebug.org;
license = "based on the PHP license - as is";
};
*/ */
}; };
@ -255,7 +249,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
meta = { meta = {
description = "An HTML-embedded scripting language"; description = "An HTML-embedded scripting language";
homepage = http://www.php.net/; homepage = http://www.php.net/;
license = "PHP-3"; license = stdenv.lib.licenses.php301;
}; };
patches = [ ./fix-5.4.patch ]; patches = [ ./fix-5.4.patch ];

View file

@ -78,7 +78,7 @@ stdenv.mkDerivation rec {
''; '';
meta = { meta = {
license = "Ruby"; license = stdenv.lib.licenses.ruby;
homepage = "http://www.ruby-lang.org/en/"; homepage = "http://www.ruby-lang.org/en/";
description = "The Ruby language"; description = "The Ruby language";
}; };

View file

@ -86,7 +86,7 @@ stdenv.mkDerivation rec {
''; '';
meta = { meta = {
license = "Ruby"; license = stdenv.lib.licenses.ruby;
homepage = "http://www.ruby-lang.org/en/"; homepage = "http://www.ruby-lang.org/en/";
description = "The Ruby language"; description = "The Ruby language";
platforms = stdenv.lib.platforms.all; platforms = stdenv.lib.platforms.all;

View file

@ -101,7 +101,7 @@ stdenv.mkDerivation rec {
''; '';
meta = { meta = {
license = "Ruby"; license = stdenv.lib.licenses.ruby;
homepage = "http://www.ruby-lang.org/en/"; homepage = "http://www.ruby-lang.org/en/";
description = "The Ruby language"; description = "The Ruby language";
platforms = stdenv.lib.platforms.all; platforms = stdenv.lib.platforms.all;

View file

@ -100,7 +100,7 @@ stdenv.mkDerivation rec {
''; '';
meta = { meta = {
license = "Ruby"; license = stdenv.lib.licenses.ruby;
homepage = "http://www.ruby-lang.org/en/"; homepage = "http://www.ruby-lang.org/en/";
description = "The Ruby language"; description = "The Ruby language";
platforms = stdenv.lib.platforms.all; platforms = stdenv.lib.platforms.all;

View file

@ -99,7 +99,7 @@ stdenv.mkDerivation rec {
''; '';
meta = { meta = {
license = "Ruby"; license = stdenv.lib.licenses.ruby;
homepage = "http://www.ruby-lang.org/en/"; homepage = "http://www.ruby-lang.org/en/";
description = "The Ruby language"; description = "The Ruby language";
platforms = stdenv.lib.platforms.all; platforms = stdenv.lib.platforms.all;

View file

@ -97,7 +97,7 @@ stdenv.mkDerivation rec {
''; '';
meta = { meta = {
license = "Ruby"; license = stdenv.lib.licenses.ruby;
homepage = "http://www.ruby-lang.org/en/"; homepage = "http://www.ruby-lang.org/en/";
description = "The Ruby language"; description = "The Ruby language";
platforms = stdenv.lib.platforms.all; platforms = stdenv.lib.platforms.all;

View file

@ -45,7 +45,7 @@ rec {
meta = { meta = {
description = "A game programming library"; description = "A game programming library";
license = "free-noncopyleft"; # giftware license = a.lib.licenses.free; # giftware
maintainers = with a.lib.maintainers; maintainers = with a.lib.maintainers;
[ [
raskin raskin
@ -55,4 +55,3 @@ rec {
inherit version; inherit version;
}; };
}) x }) x

View file

@ -44,7 +44,7 @@ rec {
meta = { meta = {
description = "A game programming library"; description = "A game programming library";
license = "free-noncopyleft"; # giftware license = a.lib.licenses.free; # giftware
maintainers = with a.lib.maintainers; maintainers = with a.lib.maintainers;
[ [
raskin raskin
@ -54,4 +54,3 @@ rec {
inherit version; inherit version;
}; };
}) x }) x

View file

@ -43,7 +43,7 @@ rec {
meta = { meta = {
branch = "4"; branch = "4";
description = "A game programming library"; description = "A game programming library";
license = "free-noncopyleft"; # giftware license = a.lib.licenses.free; # giftware
maintainers = with a.lib.maintainers; maintainers = with a.lib.maintainers;
[ [
raskin raskin
@ -57,4 +57,3 @@ rec {
}; };
}; };
}) x }) x

View file

@ -2,7 +2,7 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "asio-1.10.4"; name = "asio-1.10.4";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/asio/${name}.tar.bz2"; url = "mirror://sourceforge/asio/${name}.tar.bz2";
sha256 = "0jminwr84wphwpph7j820cql7cbaqlj2zv4gfjk2imazpmlhsfri"; sha256 = "0jminwr84wphwpph7j820cql7cbaqlj2zv4gfjk2imazpmlhsfri";
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
meta = { meta = {
homepage = http://asio.sourceforge.net/; homepage = http://asio.sourceforge.net/;
description = "Cross-platform C++ library for network and low-level I/O programming"; description = "Cross-platform C++ library for network and low-level I/O programming";
license = "boost"; license = stdenv.lib.licenses.boost;
}; };
} }

View file

@ -110,7 +110,7 @@ stdenv.mkDerivation {
meta = { meta = {
homepage = "http://boost.org/"; homepage = "http://boost.org/";
description = "Collection of C++ libraries"; description = "Collection of C++ libraries";
license = "boost-license"; license = stdenv.lib.licenses.boost;
platforms = platforms.unix; platforms = platforms.unix;
maintainers = with maintainers; [ simons wkennington ]; maintainers = with maintainers; [ simons wkennington ];

View file

@ -36,7 +36,7 @@ rec {
]; ];
platforms = with a.lib.platforms; platforms = with a.lib.platforms;
linux; linux;
license = "free"; license = a.lib.licenses.free;
branch = "0.5.1"; branch = "0.5.1";
}; };
passthru = { passthru = {

View file

@ -1,9 +1,9 @@
x@{builderDefsPackage x@{builderDefsPackage
, ...}: , ...}:
builderDefsPackage builderDefsPackage
(a : (a :
let let
helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
[]; [];
buildInputs = map (n: builtins.getAttr n x) buildInputs = map (n: builtins.getAttr n x)
@ -27,7 +27,7 @@ rec {
/* doConfigure should be removed if not needed */ /* doConfigure should be removed if not needed */
phaseNames = ["doConfigure" "doMakeInstall"]; phaseNames = ["doConfigure" "doMakeInstall"];
meta = { meta = {
description = "CELT - low-delay audio codec"; description = "CELT - low-delay audio codec";
maintainers = with a.lib.maintainers; maintainers = with a.lib.maintainers;
@ -36,7 +36,7 @@ rec {
]; ];
platforms = with a.lib.platforms; platforms = with a.lib.platforms;
linux; linux;
license = "free"; license = a.lib.licenses.free;
branch = "0.7"; branch = "0.7";
}; };
passthru = { passthru = {
@ -45,4 +45,3 @@ rec {
}; };
}; };
}) x }) x

View file

@ -1,9 +1,9 @@
x@{builderDefsPackage x@{builderDefsPackage
, ...}: , ...}:
builderDefsPackage builderDefsPackage
(a : (a :
let let
helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
[]; [];
buildInputs = map (n: builtins.getAttr n x) buildInputs = map (n: builtins.getAttr n x)
@ -27,7 +27,7 @@ rec {
/* doConfigure should be removed if not needed */ /* doConfigure should be removed if not needed */
phaseNames = ["doConfigure" "doMakeInstall"]; phaseNames = ["doConfigure" "doMakeInstall"];
meta = { meta = {
description = "Low-delay audio codec"; description = "Low-delay audio codec";
maintainers = with a.lib.maintainers; maintainers = with a.lib.maintainers;
@ -36,7 +36,7 @@ rec {
]; ];
platforms = with a.lib.platforms; platforms = with a.lib.platforms;
linux; linux;
license = "free"; license = a.lib.licenses.free;
}; };
passthru = { passthru = {
updateInfo = { updateInfo = {
@ -44,4 +44,3 @@ rec {
}; };
}; };
}) x }) x

View file

@ -35,6 +35,6 @@ stdenv.mkDerivation rec {
meta = { meta = {
homepage = http://cpp-netlib.github.com/; homepage = http://cpp-netlib.github.com/;
description = "Provides application layer network support at boost style"; description = "Provides application layer network support at boost style";
license = "boost"; license = stdenv.lib.licenses.boost;
}; };
} }

View file

@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
meta = { meta = {
description = "Crypto++, a free C++ class library of cryptographic schemes"; description = "Crypto++, a free C++ class library of cryptographic schemes";
homepage = http://cryptopp.com/; homepage = http://cryptopp.com/;
license = "Boost 1.0"; license = stdenv.lib.licenses.boost;
maintainers = [ ]; maintainers = [ ];
}; };
} }

View file

@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
meta = { meta = {
homepage = http://dbus.freedesktop.org; homepage = http://dbus.freedesktop.org;
license = "AFL-2.1 or GPL-2"; license = with stdenv.lib.licenses; [ afl21 gpl2 ];
description = "Obsolete glib bindings for D-Bus lightweight IPC mechanism"; description = "Obsolete glib bindings for D-Bus lightweight IPC mechanism";
maintainers = [ stdenv.lib.maintainers.urkud ]; maintainers = [ stdenv.lib.maintainers.urkud ];
}; };

View file

@ -15,6 +15,6 @@ stdenv.mkDerivation rec {
homepage = http://www.audiocoding.com/faac.html; homepage = http://www.audiocoding.com/faac.html;
# Incompatible with GPL. Some changes to the base code, included in faac, # Incompatible with GPL. Some changes to the base code, included in faac,
# are under LGPL though. # are under LGPL though.
license = "unfree-redistributable"; license = stdenv.lib.licenses.unfreeRedistributable;
}; };
} }

View file

@ -17,8 +17,7 @@ stdenv.mkDerivation rec {
meta = { meta = {
description = "A small, fast run-time speech synthesis engine"; description = "A small, fast run-time speech synthesis engine";
homepage = http://www.festvox.org/flite/; homepage = http://www.festvox.org/flite/;
license = "free-non-copyleft"; license = stdenv.lib.licenses.free;
platforms = stdenv.lib.platforms.linux; platforms = stdenv.lib.platforms.linux;
}; };
} }

View file

@ -1,9 +1,9 @@
x@{builderDefsPackage x@{builderDefsPackage
, ...}: , ...}:
builderDefsPackage builderDefsPackage
(a : (a :
let let
helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
[]; [];
buildInputs = map (n: builtins.getAttr n x) buildInputs = map (n: builtins.getAttr n x)
@ -40,7 +40,7 @@ rec {
''INSTALL_ROOT="$out"'' ''INSTALL_ROOT="$out"''
''GSM_INSTALL_INC="$out/include/gsm"'' ''GSM_INSTALL_INC="$out/include/gsm"''
]; ];
meta = { meta = {
description = "A GSM codec library"; description = "A GSM codec library";
maintainers = with a.lib.maintainers; maintainers = with a.lib.maintainers;
@ -49,7 +49,7 @@ rec {
]; ];
platforms = with a.lib.platforms; platforms = with a.lib.platforms;
linux; linux;
license = "free-noncopyleft"; license = a.lib.licenses.free;
}; };
passthru = { passthru = {
updateInfo = { updateInfo = {
@ -57,4 +57,3 @@ rec {
}; };
}; };
}) x }) x

View file

@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
homepage = http://www.gnu.org/software/classpath/; homepage = http://www.gnu.org/software/classpath/;
# The exception makes it similar to LGPLv2+ AFAICS. # The exception makes it similar to LGPLv2+ AFAICS.
license = "GPLv2+ + exception"; license = stdenv.lib.licenses.gpl2ClasspathPlus;
maintainers = [ ]; maintainers = [ ];
}; };

View file

@ -14,6 +14,6 @@ stdenv.mkDerivation {
description = "Image processing and analysis library"; description = "Image processing and analysis library";
homepage = http://www.leptonica.org/; homepage = http://www.leptonica.org/;
# Its own license: http://www.leptonica.org/about-the-license.html # Its own license: http://www.leptonica.org/about-the-license.html
license = "free"; license = stdenv.lib.licenses.free;
}; };
} }

View file

@ -2,19 +2,19 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libcaca-0.99.beta19"; name = "libcaca-0.99.beta19";
src = fetchurl { src = fetchurl {
url = "http://caca.zoy.org/files/libcaca/${name}.tar.gz"; url = "http://caca.zoy.org/files/libcaca/${name}.tar.gz";
sha256 = "1x3j6yfyxl52adgnabycr0n38j9hx2j74la0hz0n8cnh9ry4d2qj"; sha256 = "1x3j6yfyxl52adgnabycr0n38j9hx2j74la0hz0n8cnh9ry4d2qj";
}; };
configureFlags = "--disable-x11 --disable-imlib2 --disable-doc"; configureFlags = "--disable-x11 --disable-imlib2 --disable-doc";
propagatedBuildInputs = [ncurses]; propagatedBuildInputs = [ncurses];
meta = { meta = {
homepage = http://libcaca.zoy.org/; homepage = http://libcaca.zoy.org/;
description = "A graphics library that outputs text instead of pixels"; description = "A graphics library that outputs text instead of pixels";
license = "WTFPL"; # http://sam.zoy.org/wtfpl/ license = stdenv.lib.licenses.wtfpl;
}; };
} }

View file

@ -21,7 +21,7 @@ stdenv.mkDerivation {
description = "USB CEC adapter communication library"; description = "USB CEC adapter communication library";
homepage = "http://libcec.pulse-eight.com"; homepage = "http://libcec.pulse-eight.com";
repositories.git = "https://github.com/Pulse-Eight/libcec.git"; repositories.git = "https://github.com/Pulse-Eight/libcec.git";
license = "GPLv2+"; license = stdenv.lib.licenses.gpl2Plus;
platforms = platforms.linux; platforms = platforms.linux;
maintainers = [ maintainers.titanous ]; maintainers = [ maintainers.titanous ];
}; };

View file

@ -46,10 +46,9 @@ stdenv.mkDerivation rec {
homepage = http://sourceware.org/libffi/; homepage = http://sourceware.org/libffi/;
# See http://github.com/atgreen/libffi/blob/master/LICENSE . # See http://github.com/atgreen/libffi/blob/master/LICENSE .
license = "free, non-copyleft"; license = stdenv.lib.licenses.free;
maintainers = [ stdenv.lib.maintainers.ludo ]; maintainers = [ stdenv.lib.maintainers.ludo ];
platforms = stdenv.lib.platforms.all; platforms = stdenv.lib.platforms.all;
}; };
} }

View file

@ -35,7 +35,7 @@ stdenv.mkDerivation {
meta = { meta = {
description = "Cross platform, open source library for generating PDF files"; description = "Cross platform, open source library for generating PDF files";
homepage = http://libharu.org/wiki/Main_Page; homepage = http://libharu.org/wiki/Main_Page;
license = "ZLIB/LIBPNG"; # see README. license = stdenv.lib.licenses.zlib;
maintainers = [ stdenv.lib.maintainers.marcweber ]; maintainers = [ stdenv.lib.maintainers.marcweber ];
platforms = stdenv.lib.platforms.linux; platforms = stdenv.lib.platforms.linux;
}; };

View file

@ -21,6 +21,6 @@ stdenv.mkDerivation {
meta = { meta = {
homepage = http://libs.suckless.org/libixp; homepage = http://libs.suckless.org/libixp;
description = "stand-alone client/server 9P library"; description = "stand-alone client/server 9P library";
license = "MIT / LPL"; license = with stdenv.lib.licenses; [ mit lpl-102 ];
}; };
} }

View file

@ -16,6 +16,6 @@ stdenv.mkDerivation rec {
meta = { meta = {
homepage = http://libjpeg-turbo.virtualgl.org/; homepage = http://libjpeg-turbo.virtualgl.org/;
description = "A faster (using SIMD) libjpeg implementation"; description = "A faster (using SIMD) libjpeg implementation";
license = "free"; license = stdenv.lib.licenses.free;
}; };
} }

View file

@ -1,20 +1,20 @@
{ stdenv, fetchurl, static ? false }: { stdenv, fetchurl, static ? false }:
with stdenv.lib; with stdenv.lib;
stdenv.mkDerivation { stdenv.mkDerivation {
name = "libjpeg-8d"; name = "libjpeg-8d";
src = fetchurl { src = fetchurl {
url = http://www.ijg.org/files/jpegsrc.v8d.tar.gz; url = http://www.ijg.org/files/jpegsrc.v8d.tar.gz;
sha256 = "1cz0dy05mgxqdgjf52p54yxpyy95rgl30cnazdrfmw7hfca9n0h0"; sha256 = "1cz0dy05mgxqdgjf52p54yxpyy95rgl30cnazdrfmw7hfca9n0h0";
}; };
configureFlags = optional static "--enable-static --disable-shared"; configureFlags = optional static "--enable-static --disable-shared";
meta = { meta = {
homepage = http://www.ijg.org/; homepage = http://www.ijg.org/;
description = "A library that implements the JPEG image file format"; description = "A library that implements the JPEG image file format";
license = "free"; license = stdenv.lib.licenses.free;
}; };
} }

View file

@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
meta = { meta = {
description = "Reference library for reading, displaying, writing and examining Multiple-Image Network Graphics"; description = "Reference library for reading, displaying, writing and examining Multiple-Image Network Graphics";
homepage = http://www.libmng.com; homepage = http://www.libmng.com;
license = "zlib/libpng"; license = stdenv.lib.licenses.zlib;
maintainers = with stdenv.lib.maintainers; [ marcweber urkud ]; maintainers = with stdenv.lib.maintainers; [ marcweber urkud ];
hydraPlatforms = stdenv.lib.platforms.linux; hydraPlatforms = stdenv.lib.platforms.linux;
}; };

View file

@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
meta = { meta = {
homepage = http://www.dnielectronico.es/descargas/; homepage = http://www.dnielectronico.es/descargas/;
description = "Opensc plugin to access the Spanish national ID smartcard"; description = "Opensc plugin to access the Spanish national ID smartcard";
license = "nonfree"; license = stdenv.lib.licenses.unfree;
maintainers = with stdenv.lib.maintainers; [viric]; maintainers = with stdenv.lib.maintainers; [viric];
platforms = with stdenv.lib.platforms; linux; platforms = with stdenv.lib.platforms; linux;
broken = true; broken = true;

View file

@ -14,10 +14,10 @@ stdenv.mkDerivation rec {
sed -e '/curl\/types/d' -i src/*.c src/*.h sed -e '/curl\/types/d' -i src/*.c src/*.h
''; '';
meta = { meta = {
description = "The RDF Parser Toolkit"; description = "The RDF Parser Toolkit";
homepage = "http://librdf.org/raptor"; homepage = "http://librdf.org/raptor";
license = "LGPL-2.1 Apache-2.0"; license = with stdenv.lib.licenses; [ lgpl21 asl20 ];
maintainers = [ stdenv.lib.maintainers.marcweber ]; maintainers = [ stdenv.lib.maintainers.marcweber ];
platforms = stdenv.lib.platforms.linux; platforms = stdenv.lib.platforms.linux;
}; };

View file

@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
meta = { meta = {
description = "The RDF Parser Toolkit"; description = "The RDF Parser Toolkit";
homepage = "http://librdf.org/raptor"; homepage = "http://librdf.org/raptor";
license = "LGPL-2.1 Apache-2.0"; license = with stdenv.lib.licenses; [ lgpl21 asl20 ];
maintainers = with stdenv.lib.maintainers; [ marcweber urkud ]; maintainers = with stdenv.lib.maintainers; [ marcweber urkud ];
platforms = stdenv.lib.platforms.linux; platforms = stdenv.lib.platforms.linux;
}; };

View file

@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
meta = { meta = {
description = "Library that handles Resource Description Framework (RDF)"; description = "Library that handles Resource Description Framework (RDF)";
homepage = "http://librdf.org/rasqal"; homepage = "http://librdf.org/rasqal";
license = "LGPL-2.1 Apache-2.0"; license = with stdenv.lib.licenses; [ lgpl21 asl20 ];
maintainers = with stdenv.lib.maintainers; [ marcweber urkud ]; maintainers = with stdenv.lib.maintainers; [ marcweber urkud ];
platforms = stdenv.lib.platforms.linux; platforms = stdenv.lib.platforms.linux;
}; };

View file

@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
meta = { meta = {
description = "Version of NaCl with harwdare tests at runtime, not build time"; description = "Version of NaCl with harwdare tests at runtime, not build time";
license = "ISC"; license = stdenv.lib.licenses.isc;
maintainers = with stdenv.lib.maintainers; [ viric ]; maintainers = with stdenv.lib.maintainers; [ viric ];
platforms = stdenv.lib.platforms.all; platforms = stdenv.lib.platforms.all;
}; };

View file

@ -21,6 +21,6 @@ stdenv.mkDerivation rec {
description = "Tools and library for the WebP image format"; description = "Tools and library for the WebP image format";
/* It has its own licence, google-related, but that looks like BSD */ /* It has its own licence, google-related, but that looks like BSD */
license = "free"; license = stdenv.lib.licenses.free;
}; };
} }

View file

@ -14,6 +14,6 @@ stdenv.mkDerivation rec {
meta = { meta = {
description = "OpenGL utility library"; description = "OpenGL utility library";
homepage = http://cgit.freedesktop.org/mesa/glu/; homepage = http://cgit.freedesktop.org/mesa/glu/;
license = "bsd"; # SGI-B-2.0, which seems BSD-like license = stdenv.lib.licenses.sgi-b-20;
}; };
} }

View file

@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
meta = { meta = {
description = "A set of cuda-enabled texture tools and compressors"; description = "A set of cuda-enabled texture tools and compressors";
homepage = "http://developer.nvidia.com/object/texture_tools.html"; homepage = "http://developer.nvidia.com/object/texture_tools.html";
license = "MIT"; license = stdenv.lib.licenses.mit;
platforms = stdenv.lib.platforms.linux; platforms = stdenv.lib.platforms.linux;
}; };
} }

View file

@ -17,6 +17,6 @@ stdenv.mkDerivation rec {
meta = { meta = {
homepage = "http://icculus.org/physfs/"; homepage = "http://icculus.org/physfs/";
description = "Library to provide abstract access to various archives"; description = "Library to provide abstract access to various archives";
license = "free"; license = stdenv.lib.licenses.free;
}; };
} }

View file

@ -15,6 +15,6 @@ stdenv.mkDerivation rec {
meta = { meta = {
description = "Voice recognition library written in C"; description = "Voice recognition library written in C";
homepage = http://cmusphinx.sourceforge.net; homepage = http://cmusphinx.sourceforge.net;
license = "free-non-copyleft"; license = stdenv.lib.licenses.free;
}; };
} }

View file

@ -15,6 +15,6 @@ stdenv.mkDerivation rec {
meta = { meta = {
homepage = http://www.qhull.org/; homepage = http://www.qhull.org/;
description = "Computes the convex hull, Delaunay triangulation, Voronoi diagram and more"; description = "Computes the convex hull, Delaunay triangulation, Voronoi diagram and more";
license = "free"; license = stdenv.lib.licenses.free;
}; };
} }

View file

@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
description = "Qt widgets for technical applications"; description = "Qt widgets for technical applications";
homepage = http://qwt.sourceforge.net/; homepage = http://qwt.sourceforge.net/;
# LGPL 2.1 plus a few exceptions (more liberal) # LGPL 2.1 plus a few exceptions (more liberal)
license = "Qwt License, Version 1.0"; license = stdenv.lib.licenses.qwt;
platforms = platforms.linux; platforms = platforms.linux;
maintainers = [ maintainers.bjornfor ]; maintainers = [ maintainers.bjornfor ];
}; };

View file

@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
description = "Qt widgets for technical applications"; description = "Qt widgets for technical applications";
homepage = http://qwt.sourceforge.net/; homepage = http://qwt.sourceforge.net/;
# LGPL 2.1 plus a few exceptions (more liberal) # LGPL 2.1 plus a few exceptions (more liberal)
license = "Qwt License, Version 1.0"; license = stdenv.lib.licenses.qwt;
platforms = platforms.linux; platforms = platforms.linux;
maintainers = [ maintainers.bjornfor ]; maintainers = [ maintainers.bjornfor ];
}; };

View file

@ -46,7 +46,7 @@ stdenv.mkDerivation {
meta = { meta = {
description = "Basic Linear Algebra Subprograms"; description = "Basic Linear Algebra Subprograms";
license = "public domain"; license = stdenv.lib.licenses.publicDomain;
homepage = "http://www.netlib.org/blas/"; homepage = "http://www.netlib.org/blas/";
}; };
} }

View file

@ -4,7 +4,7 @@ assert stdenv ? gcc && stdenv.gcc.libc != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "scmccid-5.0.11"; name = "scmccid-5.0.11";
src = if stdenv.system == "i686-linux" then (fetchurl { src = if stdenv.system == "i686-linux" then (fetchurl {
url = "http://www.scmmicro.com/support/download/scmccid_5.0.11_linux.tar.gz"; url = "http://www.scmmicro.com/support/download/scmccid_5.0.11_linux.tar.gz";
sha256 = "1r5wkarhzl09ncgj55baizf573czw0nplh1pgddzx9xck66kh5bm"; sha256 = "1r5wkarhzl09ncgj55baizf573czw0nplh1pgddzx9xck66kh5bm";
@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
meta = { meta = {
homepage = http://www.scmmicro.com/support/pc-security-support/downloads.html; homepage = http://www.scmmicro.com/support/pc-security-support/downloads.html;
description = "PCSC drivers for linux, for the SCM SCR3310 v2.0 card and others"; description = "PCSC drivers for linux, for the SCM SCR3310 v2.0 card and others";
license = "nonfree"; license = stdenv.lib.licenses.unfree;
maintainers = with stdenv.lib.maintainers; [viric]; maintainers = with stdenv.lib.maintainers; [viric];
platforms = with stdenv.lib.platforms; linux; platforms = with stdenv.lib.platforms; linux;
}; };

View file

@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
''; '';
# Public domain + permissive (non-copyleft) licensing of some files. # Public domain + permissive (non-copyleft) licensing of some files.
license = "public domain"; license = stdenv.lib.licenses.publicDomain;
homepage = http://people.csail.mit.edu/jaffer/SLIB; homepage = http://people.csail.mit.edu/jaffer/SLIB;

View file

@ -2,9 +2,9 @@ x@{builderDefsPackage
, gawk, alsaLib, ncurses , gawk, alsaLib, ncurses
, ...}: , ...}:
builderDefsPackage builderDefsPackage
(a : (a :
let let
helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
[]; [];
buildInputs = map (n: builtins.getAttr n x) buildInputs = map (n: builtins.getAttr n x)
@ -28,7 +28,7 @@ rec {
/* doConfigure should be removed if not needed */ /* doConfigure should be removed if not needed */
phaseNames = ["doUnpack" "killUsrBin" "doConfigure" "doMakeInstall" "doDeploy" "fixPaths"]; phaseNames = ["doUnpack" "killUsrBin" "doConfigure" "doMakeInstall" "doDeploy" "fixPaths"];
killUsrBin = a.fullDepEntry '' killUsrBin = a.fullDepEntry ''
sed -e s@/usr/bin/@@g -i $( grep -rl '/usr/bin/' . ) sed -e s@/usr/bin/@@g -i $( grep -rl '/usr/bin/' . )
sed -re 's@/bin/(rm|printf|uname)@\1@g' -i $( grep -rl '/bin/' . ) sed -re 's@/bin/(rm|printf|uname)@\1@g' -i $( grep -rl '/bin/' . )
@ -55,7 +55,7 @@ rec {
]; ];
platforms = with a.lib.platforms; platforms = with a.lib.platforms;
linux; linux;
license = "free-noncopyleft"; license = a.lib.licenses.free;
}; };
passthru = { passthru = {
updateInfo = { updateInfo = {
@ -63,4 +63,3 @@ rec {
}; };
}; };
}) x }) x

View file

@ -20,6 +20,6 @@ stdenv.mkDerivation rec {
meta = { meta = {
description = "An implementation of the C++ Standard Library"; description = "An implementation of the C++ Standard Library";
homepage = http://sourceforge.net/projects/stlport/; homepage = http://sourceforge.net/projects/stlport/;
license = "free"; # seems BSD-like license = stdenv.lib.licenses.free; # seems BSD-like
}; };
} }

View file

@ -4,20 +4,20 @@ let
version = "2.6.2"; version = "2.6.2";
in stdenv.mkDerivation { in stdenv.mkDerivation {
name = "tinyxml-${version}"; name = "tinyxml-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/project/tinyxml/tinyxml/${version}/tinyxml_2_6_2.zip"; url = "mirror://sourceforge/project/tinyxml/tinyxml/${version}/tinyxml_2_6_2.zip";
sha256 = "04nmw6im2d1xp12yir8va93xns5iz816pwi25n9cql3g3i8bjsxc"; sha256 = "04nmw6im2d1xp12yir8va93xns5iz816pwi25n9cql3g3i8bjsxc";
}; };
patches = [ patches = [
# add pkgconfig file # add pkgconfig file
./2.6.2-add-pkgconfig.patch ./2.6.2-add-pkgconfig.patch
# http://sourceforge.net/tracker/index.php?func=detail&aid=3031828&group_id=13559&atid=313559 # http://sourceforge.net/tracker/index.php?func=detail&aid=3031828&group_id=13559&atid=313559
./2.6.2-entity.patch ./2.6.2-entity.patch
]; ];
buildInputs = [ unzip ]; buildInputs = [ unzip ];
buildPhase = '' buildPhase = ''
# use STL (xbmc requires it) # use STL (xbmc requires it)
@ -26,13 +26,13 @@ in stdenv.mkDerivation {
# build xmltest # build xmltest
make make
# build the lib as a shared library # build the lib as a shared library
g++ -Wall -O2 -shared -fpic tinyxml.cpp \ g++ -Wall -O2 -shared -fpic tinyxml.cpp \
tinyxmlerror.cpp tinyxmlparser.cpp \ tinyxmlerror.cpp tinyxmlparser.cpp \
tinystr.cpp -o libtinyxml.so tinystr.cpp -o libtinyxml.so
''; '';
doCheck = true; doCheck = true;
checkPhase = '' checkPhase = ''
./xmltest ./xmltest
@ -41,25 +41,25 @@ in stdenv.mkDerivation {
exit $result exit $result
fi fi
''; '';
installPhase = '' installPhase = ''
mkdir -pv $out/include/ mkdir -pv $out/include/
mkdir -pv $out/lib/pkgconfig/ mkdir -pv $out/lib/pkgconfig/
mkdir -pv $out/share/doc/tinyxml/ mkdir -pv $out/share/doc/tinyxml/
cp -v libtinyxml.so $out/lib/ cp -v libtinyxml.so $out/lib/
cp -v *.h $out/include/ cp -v *.h $out/include/
substituteInPlace tinyxml.pc --replace "@out@" "$out" substituteInPlace tinyxml.pc --replace "@out@" "$out"
substituteInPlace tinyxml.pc --replace "@version@" "${version}" substituteInPlace tinyxml.pc --replace "@version@" "${version}"
cp -v tinyxml.pc $out/lib/pkgconfig/ cp -v tinyxml.pc $out/lib/pkgconfig/
cp -v docs/* $out/share/doc/tinyxml/ cp -v docs/* $out/share/doc/tinyxml/
''; '';
meta = { meta = {
description = "Simple, small, C++ XML parser that can be easily integrating into other programs"; description = "Simple, small, C++ XML parser that can be easily integrating into other programs";
homepage = "http://www.grinninglizard.com/tinyxml/index.html"; homepage = "http://www.grinninglizard.com/tinyxml/index.html";
license = "free-non-copyleft"; license = stdenv.lib.licenses.free;
}; };
} }

View file

@ -26,7 +26,7 @@ stdenv.mkDerivation {
homepage = http://www.cs.unc.edu/Research/vrpn/; homepage = http://www.cs.unc.edu/Research/vrpn/;
license = "BSL1.0"; # Boost Software License, license = stdenv.lib.licenses.boost;
# see # <http://www.cs.unc.edu/Research/vrpn/obtaining_vrpn.html> # see # <http://www.cs.unc.edu/Research/vrpn/obtaining_vrpn.html>
}; };

Some files were not shown because too many files have changed in this diff Show more