From 7a459962331e095cabd0cf5d56106727648a1824 Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Thu, 19 Jun 2014 06:19:00 +0200 Subject: Turn some license strings into lib.licenses values --- pkgs/desktops/kde-4.12/kdegraphics/kcolorchooser.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/desktops/kde-4.12/kdegraphics/kcolorchooser.nix') diff --git a/pkgs/desktops/kde-4.12/kdegraphics/kcolorchooser.nix b/pkgs/desktops/kde-4.12/kdegraphics/kcolorchooser.nix index 58528cb186bb..3084d16faef2 100644 --- a/pkgs/desktops/kde-4.12/kdegraphics/kcolorchooser.nix +++ b/pkgs/desktops/kde-4.12/kdegraphics/kcolorchooser.nix @@ -5,6 +5,6 @@ kde { meta = { description = "A small utility to select a color"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } -- cgit 1.4.1 From d0ca8c237ec001ef176c82faf6b8104e83453ac9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 28 Jul 2014 11:43:20 +0200 Subject: Fix broken license references. --- .../emacs-clang-complete-async/default.nix | 2 +- pkgs/applications/graphics/xaos/default.nix | 12 ++++++------ pkgs/applications/science/logic/iprover/default.nix | 11 ++++++----- pkgs/applications/science/logic/minisat/default.nix | 10 +++++----- pkgs/applications/science/logic/opensmt/default.nix | 10 +++++----- pkgs/applications/science/math/gap/default.nix | 19 ++++++++++--------- pkgs/applications/science/math/singular/default.nix | 10 +++++----- pkgs/applications/science/misc/golly/default.nix | 13 +++++++------ pkgs/desktops/kde-4.12/applications/kate.nix | 2 +- pkgs/desktops/kde-4.12/applications/konsole.nix | 2 +- pkgs/desktops/kde-4.12/kde-baseapps/kde-baseapps.nix | 2 +- pkgs/desktops/kde-4.12/kde-workspace.nix | 4 ++-- pkgs/desktops/kde-4.12/kdebindings/smokegen.nix | 2 +- pkgs/desktops/kde-4.12/kdebindings/smokeqt.nix | 2 +- pkgs/desktops/kde-4.12/kdegraphics/gwenview.nix | 2 +- pkgs/desktops/kde-4.12/kdegraphics/kamera.nix | 2 +- pkgs/desktops/kde-4.12/kdegraphics/kcolorchooser.nix | 2 +- .../kde-4.12/kdegraphics/kdegraphics-mobipocket.nix | 2 +- .../kdegraphics/kdegraphics-strigi-analyzer.nix | 2 +- .../kde-4.12/kdegraphics/kdegraphics-thumbnailers.nix | 2 +- pkgs/desktops/kde-4.12/kdegraphics/kgamma.nix | 2 +- pkgs/desktops/kde-4.12/kdegraphics/kolourpaint.nix | 2 +- pkgs/desktops/kde-4.12/kdegraphics/kruler.nix | 2 +- pkgs/desktops/kde-4.12/kdegraphics/ksaneplugin.nix | 2 +- pkgs/desktops/kde-4.12/kdegraphics/ksnapshot.nix | 2 +- pkgs/desktops/kde-4.12/kdegraphics/libkdcraw.nix | 2 +- pkgs/desktops/kde-4.12/kdegraphics/libkexiv2.nix | 2 +- pkgs/desktops/kde-4.12/kdegraphics/libkipi.nix | 2 +- pkgs/desktops/kde-4.12/kdegraphics/libksane.nix | 2 +- pkgs/desktops/kde-4.12/kdegraphics/okular.nix | 2 +- pkgs/desktops/kde-4.12/kdegraphics/svgpart.nix | 2 +- pkgs/desktops/kde-4.12/kdelibs/nepomuk-core.nix | 2 +- pkgs/desktops/kde-4.12/kdelibs/nepomuk-widgets.nix | 2 +- pkgs/development/libraries/haskell/hflags/default.nix | 2 +- pkgs/development/tools/parsing/ragel/default.nix | 2 +- pkgs/games/the-butterfly-effect/default.nix | 8 ++++---- pkgs/os-specific/linux/radeontools/default.nix | 4 ++-- pkgs/tools/typesetting/lhs2tex/default.nix | 2 +- 38 files changed, 80 insertions(+), 77 deletions(-) (limited to 'pkgs/desktops/kde-4.12/kdegraphics/kcolorchooser.nix') diff --git a/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/default.nix b/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/default.nix index 9a84fbb77483..af031a6e1a16 100644 --- a/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/default.nix +++ b/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/default.nix @@ -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; }; } diff --git a/pkgs/applications/graphics/xaos/default.nix b/pkgs/applications/graphics/xaos/default.nix index 88c189d9bbbe..8387b3486d4d 100644 --- a/pkgs/applications/graphics/xaos/default.nix +++ b/pkgs/applications/graphics/xaos/default.nix @@ -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; }; } diff --git a/pkgs/applications/science/logic/iprover/default.nix b/pkgs/applications/science/logic/iprover/default.nix index b1f48fdf04b9..e03b33fa43cc 100644 --- a/pkgs/applications/science/logic/iprover/default.nix +++ b/pkgs/applications/science/logic/iprover/default.nix @@ -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 = { diff --git a/pkgs/applications/science/logic/minisat/default.nix b/pkgs/applications/science/logic/minisat/default.nix index f8b4fc73100f..e91ff67fc9cc 100644 --- a/pkgs/applications/science/logic/minisat/default.nix +++ b/pkgs/applications/science/logic/minisat/default.nix @@ -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 = { diff --git a/pkgs/applications/science/logic/opensmt/default.nix b/pkgs/applications/science/logic/opensmt/default.nix index 065d1dd9e02c..2dc4b9934296 100644 --- a/pkgs/applications/science/logic/opensmt/default.nix +++ b/pkgs/applications/science/logic/opensmt/default.nix @@ -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 = { diff --git a/pkgs/applications/science/math/gap/default.nix b/pkgs/applications/science/math/gap/default.nix index 49a46e0c8b27..74fff2390a39 100644 --- a/pkgs/applications/science/math/gap/default.nix +++ b/pkgs/applications/science/math/gap/default.nix @@ -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 diff --git a/pkgs/applications/science/math/singular/default.nix b/pkgs/applications/science/math/singular/default.nix index 8a9f4e1d723a..1afb510e9948 100644 --- a/pkgs/applications/science/math/singular/default.nix +++ b/pkgs/applications/science/math/singular/default.nix @@ -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 = { diff --git a/pkgs/applications/science/misc/golly/default.nix b/pkgs/applications/science/misc/golly/default.nix index c0b7936edea7..9d198cd5c7f8 100644 --- a/pkgs/applications/science/misc/golly/default.nix +++ b/pkgs/applications/science/misc/golly/default.nix @@ -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 diff --git a/pkgs/desktops/kde-4.12/applications/kate.nix b/pkgs/desktops/kde-4.12/applications/kate.nix index f5b74af1a8dd..e7a6476dd6df 100644 --- a/pkgs/desktops/kde-4.12/applications/kate.nix +++ b/pkgs/desktops/kde-4.12/applications/kate.nix @@ -1,4 +1,4 @@ -{ kde, kdelibs, kactivities, qjson, pyqt4, sip, python, pykde4}: +{ stdenv, kde, kdelibs, kactivities, qjson, pyqt4, sip, python, pykde4}: kde { diff --git a/pkgs/desktops/kde-4.12/applications/konsole.nix b/pkgs/desktops/kde-4.12/applications/konsole.nix index 5fd745644468..bd4e9e58cd05 100644 --- a/pkgs/desktops/kde-4.12/applications/konsole.nix +++ b/pkgs/desktops/kde-4.12/applications/konsole.nix @@ -1,4 +1,4 @@ -{ kde, kdelibs, kde_baseapps }: +{ stdenv, kde, kdelibs, kde_baseapps }: kde { diff --git a/pkgs/desktops/kde-4.12/kde-baseapps/kde-baseapps.nix b/pkgs/desktops/kde-4.12/kde-baseapps/kde-baseapps.nix index 6d22fc425f5f..a65f33e13de1 100644 --- a/pkgs/desktops/kde-4.12/kde-baseapps/kde-baseapps.nix +++ b/pkgs/desktops/kde-4.12/kde-baseapps/kde-baseapps.nix @@ -1,4 +1,4 @@ -{ kde, kdelibs, htmlTidy, kactivities +{ stdenv, kde, kdelibs, htmlTidy, kactivities , nepomuk_core, nepomuk_widgets, libXt }: kde { diff --git a/pkgs/desktops/kde-4.12/kde-workspace.nix b/pkgs/desktops/kde-4.12/kde-workspace.nix index 9e4e8eaad051..537beaac6ae6 100644 --- a/pkgs/desktops/kde-4.12/kde-workspace.nix +++ b/pkgs/desktops/kde-4.12/kde-workspace.nix @@ -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 diff --git a/pkgs/desktops/kde-4.12/kdebindings/smokegen.nix b/pkgs/desktops/kde-4.12/kdebindings/smokegen.nix index 6646718ddc96..5708d0f96eb2 100644 --- a/pkgs/desktops/kde-4.12/kdebindings/smokegen.nix +++ b/pkgs/desktops/kde-4.12/kdebindings/smokegen.nix @@ -1,4 +1,4 @@ -{ kde, qt4, cmake }: +{ stdenv, kde, qt4, cmake }: kde { buildInputs = [ qt4 ]; diff --git a/pkgs/desktops/kde-4.12/kdebindings/smokeqt.nix b/pkgs/desktops/kde-4.12/kdebindings/smokeqt.nix index 06025a106185..494bc85e6465 100644 --- a/pkgs/desktops/kde-4.12/kdebindings/smokeqt.nix +++ b/pkgs/desktops/kde-4.12/kdebindings/smokeqt.nix @@ -1,4 +1,4 @@ -{ kde, qt4, cmake, phonon, qimageblitz, smokegen }: +{ stdenv, kde, qt4, cmake, phonon, qimageblitz, smokegen }: kde { diff --git a/pkgs/desktops/kde-4.12/kdegraphics/gwenview.nix b/pkgs/desktops/kde-4.12/kdegraphics/gwenview.nix index 6839a367aac6..3ce9b3dcc78a 100644 --- a/pkgs/desktops/kde-4.12/kdegraphics/gwenview.nix +++ b/pkgs/desktops/kde-4.12/kdegraphics/gwenview.nix @@ -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 { diff --git a/pkgs/desktops/kde-4.12/kdegraphics/kamera.nix b/pkgs/desktops/kde-4.12/kdegraphics/kamera.nix index 58edc86b4291..d9aa11c54afa 100644 --- a/pkgs/desktops/kde-4.12/kdegraphics/kamera.nix +++ b/pkgs/desktops/kde-4.12/kdegraphics/kamera.nix @@ -1,4 +1,4 @@ -{ kde, kdelibs, libgphoto2 }: +{ stdenv, kde, kdelibs, libgphoto2 }: kde { buildInputs = [ kdelibs libgphoto2 ]; diff --git a/pkgs/desktops/kde-4.12/kdegraphics/kcolorchooser.nix b/pkgs/desktops/kde-4.12/kdegraphics/kcolorchooser.nix index 3084d16faef2..e06c1b5d307c 100644 --- a/pkgs/desktops/kde-4.12/kdegraphics/kcolorchooser.nix +++ b/pkgs/desktops/kde-4.12/kdegraphics/kcolorchooser.nix @@ -1,4 +1,4 @@ -{ kde, kdelibs }: +{ stdenv, kde, kdelibs }: kde { buildInputs = [ kdelibs ]; diff --git a/pkgs/desktops/kde-4.12/kdegraphics/kdegraphics-mobipocket.nix b/pkgs/desktops/kde-4.12/kdegraphics/kdegraphics-mobipocket.nix index 3a5dca63e0fd..e834762feb52 100644 --- a/pkgs/desktops/kde-4.12/kdegraphics/kdegraphics-mobipocket.nix +++ b/pkgs/desktops/kde-4.12/kdegraphics/kdegraphics-mobipocket.nix @@ -1,4 +1,4 @@ -{ kde, kdelibs, okular }: +{ stdenv, kde, kdelibs, okular }: kde { buildInputs = [ kdelibs okular ]; diff --git a/pkgs/desktops/kde-4.12/kdegraphics/kdegraphics-strigi-analyzer.nix b/pkgs/desktops/kde-4.12/kdegraphics/kdegraphics-strigi-analyzer.nix index 85a52c7d3d53..d9d35808ac50 100644 --- a/pkgs/desktops/kde-4.12/kdegraphics/kdegraphics-strigi-analyzer.nix +++ b/pkgs/desktops/kde-4.12/kdegraphics/kdegraphics-strigi-analyzer.nix @@ -1,4 +1,4 @@ -{ kde, kdelibs, libtiff }: +{ stdenv, kde, kdelibs, libtiff }: kde { buildInputs = [ kdelibs libtiff ]; diff --git a/pkgs/desktops/kde-4.12/kdegraphics/kdegraphics-thumbnailers.nix b/pkgs/desktops/kde-4.12/kdegraphics/kdegraphics-thumbnailers.nix index 50bcc61bfbe3..d6207689512f 100644 --- a/pkgs/desktops/kde-4.12/kdegraphics/kdegraphics-thumbnailers.nix +++ b/pkgs/desktops/kde-4.12/kdegraphics/kdegraphics-thumbnailers.nix @@ -1,4 +1,4 @@ -{ kde, kdelibs, libkexiv2, libkdcraw, pkgconfig }: +{ stdenv, kde, kdelibs, libkexiv2, libkdcraw, pkgconfig }: kde { diff --git a/pkgs/desktops/kde-4.12/kdegraphics/kgamma.nix b/pkgs/desktops/kde-4.12/kdegraphics/kgamma.nix index 419bdc67eeba..016312c199e5 100644 --- a/pkgs/desktops/kde-4.12/kdegraphics/kgamma.nix +++ b/pkgs/desktops/kde-4.12/kdegraphics/kgamma.nix @@ -1,4 +1,4 @@ -{ kde, kdelibs, libXxf86vm }: +{ stdenv, kde, kdelibs, libXxf86vm }: kde { buildInputs = [ kdelibs libXxf86vm ]; diff --git a/pkgs/desktops/kde-4.12/kdegraphics/kolourpaint.nix b/pkgs/desktops/kde-4.12/kdegraphics/kolourpaint.nix index 6a999b9b3db2..ecf34e5ae9e5 100644 --- a/pkgs/desktops/kde-4.12/kdegraphics/kolourpaint.nix +++ b/pkgs/desktops/kde-4.12/kdegraphics/kolourpaint.nix @@ -1,4 +1,4 @@ -{ kde, kdelibs, qimageblitz }: +{ stdenv, kde, kdelibs, qimageblitz }: kde { buildInputs = [ kdelibs qimageblitz ]; diff --git a/pkgs/desktops/kde-4.12/kdegraphics/kruler.nix b/pkgs/desktops/kde-4.12/kdegraphics/kruler.nix index 3ce749dd7d8f..209331d9e83d 100644 --- a/pkgs/desktops/kde-4.12/kdegraphics/kruler.nix +++ b/pkgs/desktops/kde-4.12/kdegraphics/kruler.nix @@ -1,4 +1,4 @@ -{ kde, kdelibs }: +{ stdenv, kde, kdelibs }: kde { buildInputs = [ kdelibs ]; diff --git a/pkgs/desktops/kde-4.12/kdegraphics/ksaneplugin.nix b/pkgs/desktops/kde-4.12/kdegraphics/ksaneplugin.nix index 6ff2466f4b61..f541c4bdb4df 100644 --- a/pkgs/desktops/kde-4.12/kdegraphics/ksaneplugin.nix +++ b/pkgs/desktops/kde-4.12/kdegraphics/ksaneplugin.nix @@ -1,4 +1,4 @@ -{ kde, kdelibs, libksane }: +{ stdenv, kde, kdelibs, libksane }: kde { buildInputs = [ kdelibs libksane ]; diff --git a/pkgs/desktops/kde-4.12/kdegraphics/ksnapshot.nix b/pkgs/desktops/kde-4.12/kdegraphics/ksnapshot.nix index 508ce2c10d18..a9897d270bb6 100644 --- a/pkgs/desktops/kde-4.12/kdegraphics/ksnapshot.nix +++ b/pkgs/desktops/kde-4.12/kdegraphics/ksnapshot.nix @@ -1,4 +1,4 @@ -{ kde, kdelibs, libkipi }: +{ stdenv, kde, kdelibs, libkipi }: kde { buildInputs = [ kdelibs libkipi ]; diff --git a/pkgs/desktops/kde-4.12/kdegraphics/libkdcraw.nix b/pkgs/desktops/kde-4.12/kdegraphics/libkdcraw.nix index ede5e6ff1ada..1d5c6e2fcb4a 100644 --- a/pkgs/desktops/kde-4.12/kdegraphics/libkdcraw.nix +++ b/pkgs/desktops/kde-4.12/kdegraphics/libkdcraw.nix @@ -1,4 +1,4 @@ -{ kde, kdelibs, pkgconfig, libraw, lcms2 }: +{ stdenv, kde, kdelibs, pkgconfig, libraw, lcms2 }: kde { diff --git a/pkgs/desktops/kde-4.12/kdegraphics/libkexiv2.nix b/pkgs/desktops/kde-4.12/kdegraphics/libkexiv2.nix index fca746e05f19..46ec45fad01a 100644 --- a/pkgs/desktops/kde-4.12/kdegraphics/libkexiv2.nix +++ b/pkgs/desktops/kde-4.12/kdegraphics/libkexiv2.nix @@ -1,4 +1,4 @@ -{ kde, kdelibs, exiv2 }: +{ stdenv, kde, kdelibs, exiv2 }: kde { buildInputs = [ kdelibs exiv2 ]; diff --git a/pkgs/desktops/kde-4.12/kdegraphics/libkipi.nix b/pkgs/desktops/kde-4.12/kdegraphics/libkipi.nix index 6734ab015d75..65e6c52bd44f 100644 --- a/pkgs/desktops/kde-4.12/kdegraphics/libkipi.nix +++ b/pkgs/desktops/kde-4.12/kdegraphics/libkipi.nix @@ -1,4 +1,4 @@ -{ kde, kdelibs }: +{ stdenv, kde, kdelibs }: kde { buildInputs = [ kdelibs ]; diff --git a/pkgs/desktops/kde-4.12/kdegraphics/libksane.nix b/pkgs/desktops/kde-4.12/kdegraphics/libksane.nix index 4d0bab676a26..6c3543eef370 100644 --- a/pkgs/desktops/kde-4.12/kdegraphics/libksane.nix +++ b/pkgs/desktops/kde-4.12/kdegraphics/libksane.nix @@ -1,4 +1,4 @@ -{ kde, kdelibs, saneBackends }: +{ stdenv, kde, kdelibs, saneBackends }: kde { buildInputs = [ kdelibs saneBackends ]; diff --git a/pkgs/desktops/kde-4.12/kdegraphics/okular.nix b/pkgs/desktops/kde-4.12/kdegraphics/okular.nix index 2b8d9231bfe8..092833388a78 100644 --- a/pkgs/desktops/kde-4.12/kdegraphics/okular.nix +++ b/pkgs/desktops/kde-4.12/kdegraphics/okular.nix @@ -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 { diff --git a/pkgs/desktops/kde-4.12/kdegraphics/svgpart.nix b/pkgs/desktops/kde-4.12/kdegraphics/svgpart.nix index 984665b2f4be..2fc0e373dbdf 100644 --- a/pkgs/desktops/kde-4.12/kdegraphics/svgpart.nix +++ b/pkgs/desktops/kde-4.12/kdegraphics/svgpart.nix @@ -1,4 +1,4 @@ -{ kde, kdelibs }: +{ stdenv, kde, kdelibs }: kde { buildInputs = [ kdelibs ]; diff --git a/pkgs/desktops/kde-4.12/kdelibs/nepomuk-core.nix b/pkgs/desktops/kde-4.12/kdelibs/nepomuk-core.nix index 2d1a174eda52..d90e1455ce99 100644 --- a/pkgs/desktops/kde-4.12/kdelibs/nepomuk-core.nix +++ b/pkgs/desktops/kde-4.12/kdelibs/nepomuk-core.nix @@ -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 }: diff --git a/pkgs/desktops/kde-4.12/kdelibs/nepomuk-widgets.nix b/pkgs/desktops/kde-4.12/kdelibs/nepomuk-widgets.nix index febbaf61b4d5..b0fc5ad8900d 100644 --- a/pkgs/desktops/kde-4.12/kdelibs/nepomuk-widgets.nix +++ b/pkgs/desktops/kde-4.12/kdelibs/nepomuk-widgets.nix @@ -1,4 +1,4 @@ -{ kde, kdelibs, nepomuk_core }: +{ stdenv, kde, kdelibs, nepomuk_core }: kde { diff --git a/pkgs/development/libraries/haskell/hflags/default.nix b/pkgs/development/libraries/haskell/hflags/default.nix index 6584c1ff9070..d2ac39f139c5 100644 --- a/pkgs/development/libraries/haskell/hflags/default.nix +++ b/pkgs/development/libraries/haskell/hflags/default.nix @@ -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; }; }) diff --git a/pkgs/development/tools/parsing/ragel/default.nix b/pkgs/development/tools/parsing/ragel/default.nix index 08980d5b1c4b..247daacf1617 100644 --- a/pkgs/development/tools/parsing/ragel/default.nix +++ b/pkgs/development/tools/parsing/ragel/default.nix @@ -1,4 +1,4 @@ -{composableDerivation, fetchurl, transfig, texLive}: +{stdenv, composableDerivation, fetchurl, transfig, texLive}: let version = "6.3"; diff --git a/pkgs/games/the-butterfly-effect/default.nix b/pkgs/games/the-butterfly-effect/default.nix index f7734c320e64..44d07cf3ffd5 100644 --- a/pkgs/games/the-butterfly-effect/default.nix +++ b/pkgs/games/the-butterfly-effect/default.nix @@ -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; diff --git a/pkgs/os-specific/linux/radeontools/default.nix b/pkgs/os-specific/linux/radeontools/default.nix index 3dd4588b0837..92e00ffad3fa 100644 --- a/pkgs/os-specific/linux/radeontools/default.nix +++ b/pkgs/os-specific/linux/radeontools/default.nix @@ -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; }; } diff --git a/pkgs/tools/typesetting/lhs2tex/default.nix b/pkgs/tools/typesetting/lhs2tex/default.nix index 0dcd82535eeb..35e609b440ab 100644 --- a/pkgs/tools/typesetting/lhs2tex/default.nix +++ b/pkgs/tools/typesetting/lhs2tex/default.nix @@ -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 ]; -- cgit 1.4.1