dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Fix broken license references.

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/default.nix
View File

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

12
pkgs/applications/graphics/xaos/default.nix
View File

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

11
pkgs/applications/science/logic/iprover/default.nix
View File

@ -2,9 +2,9 @@ x@{builderDefsPackage
, ocaml, eprover
, ...}:
builderDefsPackage
(a :
let
helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
(a :
let
helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
[];
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
chmod a+x "$out"/bin/iprover
'') ["defEnsureDir" "minInit" "doMake"];
meta = {
description = "An automated first-order logic theorem prover";
maintainers = with a.lib.maintainers;
@ -47,7 +47,8 @@ rec {
];
platforms = with a.lib.platforms;
linux;
license = stdenv.lib.licenses.gpl3;
license = with a.lib.licenses;
gpl3;
};
passthru = {
updateInfo = {

10
pkgs/applications/science/logic/minisat/default.nix
View File

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

10
pkgs/applications/science/logic/opensmt/default.nix
View File

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

19
pkgs/applications/science/math/gap/default.nix
View File

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

10
pkgs/applications/science/math/singular/default.nix
View File

@ -3,9 +3,9 @@ x@{builderDefsPackage
, coreutils
, ...}:
builderDefsPackage
(a :
let
helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
(a :
let
helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
[];
buildInputs = map (n: builtins.getAttr n x)
@ -40,7 +40,7 @@ rec {
mkdir -p "$out/bin"
ln -s "$out/"*/Singular "$out/bin"
'') ["minInit" "defEnsureDir"];
meta = {
description = "A CAS for polynomial computations";
maintainers = with a.lib.maintainers;
@ -49,7 +49,7 @@ rec {
];
platforms = with a.lib.platforms;
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";
};
passthru = {

13
pkgs/applications/science/misc/golly/default.nix
View File

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

2
pkgs/desktops/kde-4.12/applications/kate.nix
View File

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

2
pkgs/desktops/kde-4.12/applications/konsole.nix
View File

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

2
pkgs/desktops/kde-4.12/kde-baseapps/kde-baseapps.nix
View File

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

4
pkgs/desktops/kde-4.12/kde-workspace.nix
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
, xkeyboard_config, kdepimlibs, pam, boost, gpsd, prison
, libjpeg, pkgconfig, kactivities, qjson, udev, fetchurl
@ -15,7 +15,7 @@ kde {
#todo: wayland, xmms, libusb isn't found
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.libxkbfile xorg.libXcomposite xorg.libXtst
xorg.libXdamage

2
pkgs/desktops/kde-4.12/kdebindings/smokegen.nix
View File

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

2
pkgs/desktops/kde-4.12/kdebindings/smokeqt.nix
View File

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

2
pkgs/desktops/kde-4.12/kdegraphics/gwenview.nix
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 }:
kde {

2
pkgs/desktops/kde-4.12/kdegraphics/kamera.nix
View File

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

2
pkgs/desktops/kde-4.12/kdegraphics/kcolorchooser.nix
View File

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

2
pkgs/desktops/kde-4.12/kdegraphics/kdegraphics-mobipocket.nix
View File

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

2
pkgs/desktops/kde-4.12/kdegraphics/kdegraphics-strigi-analyzer.nix
View File

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

2
pkgs/desktops/kde-4.12/kdegraphics/kdegraphics-thumbnailers.nix
View File

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

2
pkgs/desktops/kde-4.12/kdegraphics/kgamma.nix
View File

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

2
pkgs/desktops/kde-4.12/kdegraphics/kolourpaint.nix
View File

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

2
pkgs/desktops/kde-4.12/kdegraphics/kruler.nix
View File

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

2
pkgs/desktops/kde-4.12/kdegraphics/ksaneplugin.nix
View File

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

2
pkgs/desktops/kde-4.12/kdegraphics/ksnapshot.nix
View File

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

2
pkgs/desktops/kde-4.12/kdegraphics/libkdcraw.nix
View File

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

2
pkgs/desktops/kde-4.12/kdegraphics/libkexiv2.nix
View File

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

2
pkgs/desktops/kde-4.12/kdegraphics/libkipi.nix
View File

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

2
pkgs/desktops/kde-4.12/kdegraphics/libksane.nix
View File

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

2
pkgs/desktops/kde-4.12/kdegraphics/okular.nix
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 }:
kde {

2
pkgs/desktops/kde-4.12/kdegraphics/svgpart.nix
View File

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

2
pkgs/desktops/kde-4.12/kdelibs/nepomuk-core.nix
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
}:

2
pkgs/desktops/kde-4.12/kdelibs/nepomuk-widgets.nix
View File

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

2
pkgs/development/libraries/haskell/hflags/default.nix
View File

@ -10,7 +10,7 @@ cabal.mkDerivation (self: {
meta = {
homepage = "http://github.com/errge/hflags";
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;
};
})

2
pkgs/development/tools/parsing/ragel/default.nix
View File

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

8
pkgs/games/the-butterfly-effect/default.nix
View File

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

4
pkgs/os-specific/linux/radeontools/default.nix
View File

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

2
pkgs/tools/typesetting/lhs2tex/default.nix
View File

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