Fix broken license references.

This commit is contained in:
Peter Simons 2014-07-28 11:43:20 +02:00
parent ad934ccc22
commit d0ca8c237e
38 changed files with 80 additions and 77 deletions

View File

@ -20,6 +20,6 @@ clangStdenv.mkDerivation {
meta = { meta = {
homepage = "https://github.com/Golevka/emacs-clang-complete-async"; homepage = "https://github.com/Golevka/emacs-clang-complete-async";
description = "An emacs plugin to complete C and C++ code using libclang"; description = "An emacs plugin to complete C and C++ code using libclang";
license = stdenv.lib.licenses.gpl3Plus; license = clangStdenv.lib.licenses.gpl3Plus;
}; };
} }

View File

@ -1,10 +1,10 @@
a : a :
let let
fetchurl = a.fetchurl; fetchurl = a.fetchurl;
version = a.lib.attrByPath ["version"] "3.6" a; version = a.lib.attrByPath ["version"] "3.6" a;
buildInputs = with a; [ buildInputs = with a; [
aalib gsl libpng libX11 xproto libXext xextproto aalib gsl libpng libX11 xproto libXext xextproto
libXt zlib gettext intltool perl libXt zlib gettext intltool perl
]; ];
in in
@ -24,11 +24,11 @@ rec {
sed -e s@/usr/@"$out/"@g -i configure $(find . -name 'Makefile*') sed -e s@/usr/@"$out/"@g -i configure $(find . -name 'Makefile*')
mkdir -p $out/share/locale mkdir -p $out/share/locale
'') ["doUnpack" "minInit" "defEnsureDir"]; '') ["doUnpack" "minInit" "defEnsureDir"];
name = "xaos-" + version; name = "xaos-" + version;
meta = { meta = {
homepage = http://xaos.sourceforge.net/; homepage = http://xaos.sourceforge.net/;
description = "XaoS - fractal viewer"; description = "XaoS - fractal viewer";
license = stdenv.lib.licenses.gpl2Plus; license = a.stdenv.lib.licenses.gpl2Plus;
}; };
} }

View File

@ -2,9 +2,9 @@ x@{builderDefsPackage
, ocaml, eprover , ocaml, eprover
, ...}: , ...}:
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)
@ -38,7 +38,7 @@ rec {
echo -e "#! /bin/sh\\n$out/bin/iproveropt --clausifier \"${eprover}/bin/eprover\" --clausifier_options \" --tstp-format --silent --cnf \" \"\$@\"" > "$out"/bin/iprover echo -e "#! /bin/sh\\n$out/bin/iproveropt --clausifier \"${eprover}/bin/eprover\" --clausifier_options \" --tstp-format --silent --cnf \" \"\$@\"" > "$out"/bin/iprover
chmod a+x "$out"/bin/iprover chmod a+x "$out"/bin/iprover
'') ["defEnsureDir" "minInit" "doMake"]; '') ["defEnsureDir" "minInit" "doMake"];
meta = { meta = {
description = "An automated first-order logic theorem prover"; description = "An automated first-order logic theorem prover";
maintainers = with a.lib.maintainers; maintainers = with a.lib.maintainers;
@ -47,7 +47,8 @@ rec {
]; ];
platforms = with a.lib.platforms; platforms = with a.lib.platforms;
linux; linux;
license = stdenv.lib.licenses.gpl3; license = with a.lib.licenses;
gpl3;
}; };
passthru = { passthru = {
updateInfo = { updateInfo = {

View File

@ -2,9 +2,9 @@ x@{builderDefsPackage
, zlib , 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)
@ -36,7 +36,7 @@ rec {
setVars = a.fullDepEntry ('' setVars = a.fullDepEntry (''
export MROOT=$PWD/../ export MROOT=$PWD/../
'') ["doUnpack"]; '') ["doUnpack"];
meta = { meta = {
description = "A compact and readable SAT-solver"; description = "A compact and readable SAT-solver";
maintainers = with a.lib.maintainers; maintainers = with a.lib.maintainers;
@ -45,7 +45,7 @@ rec {
]; ];
platforms = with a.lib.platforms; platforms = with a.lib.platforms;
linux; linux;
license = stdenv.lib.licenses.mit; license = a.stdenv.lib.licenses.mit;
homepage = "http://minisat.se/"; homepage = "http://minisat.se/";
}; };
passthru = { passthru = {

View File

@ -3,9 +3,9 @@ x@{builderDefsPackage
, gmpxx, flex, bison , gmpxx, flex, bison
, ...}: , ...}:
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)
@ -30,7 +30,7 @@ rec {
/* doConfigure should be removed if not needed */ /* doConfigure should be removed if not needed */
phaseNames = ["doAutotools" "doConfigure" "doMakeInstall"]; phaseNames = ["doAutotools" "doConfigure" "doMakeInstall"];
meta = { meta = {
description = "A satisfiability modulo theory (SMT) solver"; description = "A satisfiability modulo theory (SMT) solver";
maintainers = with a.lib.maintainers; maintainers = with a.lib.maintainers;
@ -39,7 +39,7 @@ rec {
]; ];
platforms = with a.lib.platforms; platforms = with a.lib.platforms;
linux; linux;
license = stdenv.lib.licenses.gpl3; license = a.stdenv.lib.licenses.gpl3;
homepage = "http://code.google.com/p/opensmt/"; homepage = "http://code.google.com/p/opensmt/";
}; };
passthru = { passthru = {

View File

@ -1,10 +1,10 @@
x@{builderDefsPackage x@{builderDefsPackage
, pari ? null , pari ? null
, ...}: , ...}:
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)
@ -44,14 +44,14 @@ rec {
tar xf "${pkgSrc}" -C "$out/share/gap/build-dir/pkg" tar xf "${pkgSrc}" -C "$out/share/gap/build-dir/pkg"
${if a.pari != null then ${if a.pari != null then
''sed -e '2iexport PATH=$PATH:${pari}/bin' -i "$out/share/gap/build-dir/bin/gap.sh" '' ''sed -e '2iexport PATH=$PATH:${pari}/bin' -i "$out/share/gap/build-dir/bin/gap.sh" ''
else ""} else ""}
sed -e "/GAP_DIR=/aGAP_DIR='$out/share/gap/build-dir/'" -i "$out/share/gap/build-dir/bin/gap.sh" sed -e "/GAP_DIR=/aGAP_DIR='$out/share/gap/build-dir/'" -i "$out/share/gap/build-dir/bin/gap.sh"
ln -s "$out/share/gap/build-dir/bin/gap.sh" "$out/bin" ln -s "$out/share/gap/build-dir/bin/gap.sh" "$out/bin"
'' ["doMake" "minInit" "defEnsureDir"]; '' ["doMake" "minInit" "defEnsureDir"];
meta = { meta = {
description = "Computational discrete algebra system"; description = "Computational discrete algebra system";
maintainers = with a.lib.maintainers; maintainers = with a.lib.maintainers;
@ -60,7 +60,8 @@ rec {
]; ];
platforms = with a.lib.platforms; platforms = with a.lib.platforms;
linux; linux;
license = stdenv.lib.licenses.gpl2; license = with a.lib.licenses;
gpl2;
homepage = "http://gap-system.org/"; homepage = "http://gap-system.org/";
}; };
}) x }) x

View File

@ -3,9 +3,9 @@ x@{builderDefsPackage
, coreutils , coreutils
, ...}: , ...}:
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 {
mkdir -p "$out/bin" mkdir -p "$out/bin"
ln -s "$out/"*/Singular "$out/bin" ln -s "$out/"*/Singular "$out/bin"
'') ["minInit" "defEnsureDir"]; '') ["minInit" "defEnsureDir"];
meta = { meta = {
description = "A CAS for polynomial computations"; description = "A CAS for polynomial computations";
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 = stdenv.lib.licenses.gpl3; # Or GPLv2 at your option - but not GPLv4 license = a.stdenv.lib.licenses.gpl3; # Or GPLv2 at your option - but not GPLv4
homepage = "http://www.singular.uni-kl.de/index.php"; homepage = "http://www.singular.uni-kl.de/index.php";
}; };
passthru = { passthru = {

View File

@ -1,11 +1,11 @@
x@{builderDefsPackage, x@{builderDefsPackage,
wxGTK, perl, python, zlib wxGTK, perl, python, zlib
, ...}: , ...}:
builderDefsPackage builderDefsPackage
(a : (a :
let let
s = import ./src-for-default.nix; s = import ./src-for-default.nix;
helperArgNames = ["builderDefsPackage"] ++ helperArgNames = ["builderDefsPackage"] ++
[]; [];
buildInputs = map (n: builtins.getAttr n x) buildInputs = map (n: builtins.getAttr n x)
(builtins.attrNames (builtins.removeAttrs x helperArgNames)); (builtins.attrNames (builtins.removeAttrs x helperArgNames));
@ -26,7 +26,7 @@ rec {
export NIX_LDFLAGS="$NIX_LDFLAGS -l$pythonLib" export NIX_LDFLAGS="$NIX_LDFLAGS -l$pythonLib"
echo "Flags: $NIX_LDFLAGS" echo "Flags: $NIX_LDFLAGS"
''; '';
meta = { meta = {
description = "Cellular automata simulation program"; description = "Cellular automata simulation program";
maintainers = with a.lib.maintainers; maintainers = with a.lib.maintainers;
@ -35,6 +35,7 @@ rec {
]; ];
platforms = with a.lib.platforms; platforms = with a.lib.platforms;
linux; linux;
license = stdenv.lib.licenses.gpl2; license = with a.lib.licenses;
gpl2;
}; };
}) x }) x

View File

@ -1,4 +1,4 @@
{ kde, kdelibs, kactivities, qjson, pyqt4, sip, python, pykde4}: { stdenv, kde, kdelibs, kactivities, qjson, pyqt4, sip, python, pykde4}:
kde { kde {

View File

@ -1,4 +1,4 @@
{ kde, kdelibs, kde_baseapps }: { stdenv, kde, kdelibs, kde_baseapps }:
kde { kde {

View File

@ -1,4 +1,4 @@
{ kde, kdelibs, htmlTidy, kactivities { stdenv, kde, kdelibs, htmlTidy, kactivities
, nepomuk_core, nepomuk_widgets, libXt }: , nepomuk_core, nepomuk_widgets, libXt }:
kde { kde {

View File

@ -1,4 +1,4 @@
{ kde, kdelibs, qimageblitz, libdbusmenu_qt, xorg, lm_sensors { stdenv, kde, kdelibs, qimageblitz, libdbusmenu_qt, xorg, lm_sensors
, pciutils, libraw1394, libusb1, python, libqalculate, akonadi , pciutils, libraw1394, libusb1, python, libqalculate, akonadi
, xkeyboard_config, kdepimlibs, pam, boost, gpsd, prison , xkeyboard_config, kdepimlibs, pam, boost, gpsd, prison
, libjpeg, pkgconfig, kactivities, qjson, udev, fetchurl , libjpeg, pkgconfig, kactivities, qjson, udev, fetchurl
@ -15,7 +15,7 @@ kde {
#todo: wayland, xmms, libusb isn't found #todo: wayland, xmms, libusb isn't found
buildInputs = buildInputs =
[ kdelibs qimageblitz libdbusmenu_qt xorg.libxcb xorg.xcbutilimage libjpeg [ kdelibs qimageblitz libdbusmenu_qt xorg.libxcb xorg.xcbutilimage libjpeg
xorg.xcbutilrenderutil xorg.xcbutilkeysyms xorg.libpthreadstubs xorg.libXdmcp xorg.xcbutilrenderutil xorg.xcbutilkeysyms xorg.libpthreadstubs xorg.libXdmcp
xorg.libxkbfile xorg.libXcomposite xorg.libXtst xorg.libxkbfile xorg.libXcomposite xorg.libXtst
xorg.libXdamage xorg.libXdamage

View File

@ -1,4 +1,4 @@
{ kde, qt4, cmake }: { stdenv, kde, qt4, cmake }:
kde { kde {
buildInputs = [ qt4 ]; buildInputs = [ qt4 ];

View File

@ -1,4 +1,4 @@
{ kde, qt4, cmake, phonon, qimageblitz, smokegen }: { stdenv, kde, qt4, cmake, phonon, qimageblitz, smokegen }:
kde { kde {

View File

@ -1,4 +1,4 @@
{ kde, kdelibs, exiv2, kde_baseapps, libkipi, nepomuk_core { stdenv, kde, kdelibs, exiv2, kde_baseapps, libkipi, nepomuk_core
, libjpeg, pkgconfig, kactivities, lcms2 }: , libjpeg, pkgconfig, kactivities, lcms2 }:
kde { kde {

View File

@ -1,4 +1,4 @@
{ kde, kdelibs, libgphoto2 }: { stdenv, kde, kdelibs, libgphoto2 }:
kde { kde {
buildInputs = [ kdelibs libgphoto2 ]; buildInputs = [ kdelibs libgphoto2 ];

View File

@ -1,4 +1,4 @@
{ kde, kdelibs }: { stdenv, kde, kdelibs }:
kde { kde {
buildInputs = [ kdelibs ]; buildInputs = [ kdelibs ];

View File

@ -1,4 +1,4 @@
{ kde, kdelibs, okular }: { stdenv, kde, kdelibs, okular }:
kde { kde {
buildInputs = [ kdelibs okular ]; buildInputs = [ kdelibs okular ];

View File

@ -1,4 +1,4 @@
{ kde, kdelibs, libtiff }: { stdenv, kde, kdelibs, libtiff }:
kde { kde {
buildInputs = [ kdelibs libtiff ]; buildInputs = [ kdelibs libtiff ];

View File

@ -1,4 +1,4 @@
{ kde, kdelibs, libkexiv2, libkdcraw, pkgconfig }: { stdenv, kde, kdelibs, libkexiv2, libkdcraw, pkgconfig }:
kde { kde {

View File

@ -1,4 +1,4 @@
{ kde, kdelibs, libXxf86vm }: { stdenv, kde, kdelibs, libXxf86vm }:
kde { kde {
buildInputs = [ kdelibs libXxf86vm ]; buildInputs = [ kdelibs libXxf86vm ];

View File

@ -1,4 +1,4 @@
{ kde, kdelibs, qimageblitz }: { stdenv, kde, kdelibs, qimageblitz }:
kde { kde {
buildInputs = [ kdelibs qimageblitz ]; buildInputs = [ kdelibs qimageblitz ];

View File

@ -1,4 +1,4 @@
{ kde, kdelibs }: { stdenv, kde, kdelibs }:
kde { kde {
buildInputs = [ kdelibs ]; buildInputs = [ kdelibs ];

View File

@ -1,4 +1,4 @@
{ kde, kdelibs, libksane }: { stdenv, kde, kdelibs, libksane }:
kde { kde {
buildInputs = [ kdelibs libksane ]; buildInputs = [ kdelibs libksane ];

View File

@ -1,4 +1,4 @@
{ kde, kdelibs, libkipi }: { stdenv, kde, kdelibs, libkipi }:
kde { kde {
buildInputs = [ kdelibs libkipi ]; buildInputs = [ kdelibs libkipi ];

View File

@ -1,4 +1,4 @@
{ kde, kdelibs, pkgconfig, libraw, lcms2 }: { stdenv, kde, kdelibs, pkgconfig, libraw, lcms2 }:
kde { kde {

View File

@ -1,4 +1,4 @@
{ kde, kdelibs, exiv2 }: { stdenv, kde, kdelibs, exiv2 }:
kde { kde {
buildInputs = [ kdelibs exiv2 ]; buildInputs = [ kdelibs exiv2 ];

View File

@ -1,4 +1,4 @@
{ kde, kdelibs }: { stdenv, kde, kdelibs }:
kde { kde {
buildInputs = [ kdelibs ]; buildInputs = [ kdelibs ];

View File

@ -1,4 +1,4 @@
{ kde, kdelibs, saneBackends }: { stdenv, kde, kdelibs, saneBackends }:
kde { kde {
buildInputs = [ kdelibs saneBackends ]; buildInputs = [ kdelibs saneBackends ];

View File

@ -1,4 +1,4 @@
{ chmlib, djvulibre, ebook_tools, kde, kdelibs, libspectre, popplerQt4, qca2 { stdenv, chmlib, djvulibre, ebook_tools, kde, kdelibs, libspectre, popplerQt4, qca2
, qimageblitz, libtiff, kactivities, pkgconfig, libkexiv2 }: , qimageblitz, libtiff, kactivities, pkgconfig, libkexiv2 }:
kde { kde {

View File

@ -1,4 +1,4 @@
{ kde, kdelibs }: { stdenv, kde, kdelibs }:
kde { kde {
buildInputs = [ kdelibs ]; buildInputs = [ kdelibs ];

View File

@ -1,4 +1,4 @@
{ kde, kdelibs, soprano, shared_desktop_ontologies, exiv2, ffmpeg, taglib, popplerQt4 { stdenv, kde, kdelibs, soprano, shared_desktop_ontologies, exiv2, ffmpeg, taglib, popplerQt4
, pkgconfig, doxygen, ebook_tools , pkgconfig, doxygen, ebook_tools
}: }:

View File

@ -1,4 +1,4 @@
{ kde, kdelibs, nepomuk_core }: { stdenv, kde, kdelibs, nepomuk_core }:
kde { kde {

View File

@ -10,7 +10,7 @@ cabal.mkDerivation (self: {
meta = { meta = {
homepage = "http://github.com/errge/hflags"; homepage = "http://github.com/errge/hflags";
description = "Command line flag parser, very similar to Google's gflags"; description = "Command line flag parser, very similar to Google's gflags";
license = stdenv.lib.licenses.asl20; license = self.stdenv.lib.licenses.asl20;
platforms = self.ghc.meta.platforms; platforms = self.ghc.meta.platforms;
}; };
}) })

View File

@ -1,4 +1,4 @@
{composableDerivation, fetchurl, transfig, texLive}: {stdenv, composableDerivation, fetchurl, transfig, texLive}:
let let
version = "6.3"; version = "6.3";

View File

@ -3,9 +3,9 @@ x@{builderDefsPackage
,fetchsvn ,fetchsvn
, ...}: , ...}:
builderDefsPackage builderDefsPackage
(a : (a :
let let
helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
["fetchsvn"]; ["fetchsvn"];
buildInputs = map (n: builtins.getAttr n x) buildInputs = map (n: builtins.getAttr n x)
@ -54,7 +54,7 @@ rec {
]; ];
platforms = with a.lib.platforms; platforms = with a.lib.platforms;
linux; linux;
license = stdenv.lib.licenses.gpl2; license = a.stdenv.lib.licenses.gpl2;
}; };
passthru = { passthru = {
inherit srcDrv; inherit srcDrv;

View File

@ -24,9 +24,9 @@ stdenv.mkDerivation {
cp radeontool lightwatch.pl $out/bin cp radeontool lightwatch.pl $out/bin
''; '';
meta = { meta = {
description = "Control the backlight and external video output of ATI Radeon Mobility graphics cards"; description = "Control the backlight and external video output of ATI Radeon Mobility graphics cards";
homepage = http://fdd.com/software/radeon/; homepage = http://fdd.com/software/radeon/;
license = STDENV.LIB.LICENSES.ZLIB; license = stdenv.lib.licenses.zlib;
}; };
} }

View File

@ -18,7 +18,7 @@ cabal.mkDerivation (self: {
meta = { meta = {
homepage = "http://www.andres-loeh.de/lhs2tex/"; homepage = "http://www.andres-loeh.de/lhs2tex/";
description = "Preprocessor for typesetting Haskell sources with LaTeX"; description = "Preprocessor for typesetting Haskell sources with LaTeX";
license = stdenv.lib.licenses.gpl2; license = self.stdenv.lib.licenses.gpl2;
platforms = self.ghc.meta.platforms; platforms = self.ghc.meta.platforms;
hydraPlatforms = self.stdenv.lib.platforms.linux; hydraPlatforms = self.stdenv.lib.platforms.linux;
maintainers = [ self.stdenv.lib.maintainers.andres ]; maintainers = [ self.stdenv.lib.maintainers.andres ];