Turn more licenses into lib.licenses style

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

Relevant: issue #2999, issue #739
This commit is contained in:
Mateusz Kowalczyk
2014-11-06 00:48:16 +00:00
parent d91986c24f
commit 007f80c1d0
187 changed files with 835 additions and 791 deletions
+7 -8
View File
@@ -2,9 +2,9 @@ x@{builderDefsPackage
, jre, unzip
, ...}:
builderDefsPackage
(a :
let
helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
(a :
let
helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
[];
buildInputs = map (n: builtins.getAttr n x)
@@ -32,11 +32,11 @@ rec {
doDeploy = a.fullDepEntry ''
mkdir -p "$out"/{share/vue,bin}
cp ${src} "$out/share/vue/vue.jar"
echo '#!${a.stdenv.shell}' >> "$out/bin/vue"
echo '${a.jre}/bin/java -jar "'"$out/share/vue/vue.jar"'" "$@"' >> "$out/bin/vue"
echo '#!${a.stdenv.shell}' >> "$out/bin/vue"
echo '${a.jre}/bin/java -jar "'"$out/share/vue/vue.jar"'" "$@"' >> "$out/bin/vue"
chmod a+x "$out/bin/vue"
'' ["addInputs" "defEnsureDir"];
meta = {
description = "Visual Understanding Environment - mind mapping software";
maintainers = with a.lib.maintainers;
@@ -45,7 +45,6 @@ rec {
];
platforms = with a.lib.platforms;
linux;
license = "free-noncopyleft"; # Apache License fork, actually
license = a.lib.licenses.free; # Apache License fork, actually
};
}) x