clang-analyzer: align attrname with pkgname

This commit is contained in:
Bjørn Forsman 2015-02-20 21:45:03 +01:00
parent 97875ac175
commit c22435e70d
3 changed files with 4 additions and 3 deletions

View file

@ -32,7 +32,7 @@ rec {
} // args); } // args);
clangAnalysis = args: nixBuild ( clangAnalysis = args: nixBuild (
{ inherit clangAnalyzer; { inherit clang-analyzer;
doClangAnalysis = true; doClangAnalysis = true;
} // args); } // args);

View file

@ -137,7 +137,7 @@ stdenv.mkDerivation (
buildInputs = buildInputs =
buildInputs ++ buildInputs ++
(stdenv.lib.optional doCoverageAnalysis args.makeGCOVReport) ++ (stdenv.lib.optional doCoverageAnalysis args.makeGCOVReport) ++
(stdenv.lib.optional doClangAnalysis args.clangAnalyzer) ++ (stdenv.lib.optional doClangAnalysis args.clang-analyzer) ++
(stdenv.lib.optional doCoverityAnalysis args.cov-build) ++ (stdenv.lib.optional doCoverityAnalysis args.cov-build) ++
(stdenv.lib.optional doCoverityAnalysis args.xz); (stdenv.lib.optional doCoverityAnalysis args.xz);

View file

@ -3181,7 +3181,7 @@ let
clang_34 = wrapCC llvmPackages_34.clang; clang_34 = wrapCC llvmPackages_34.clang;
clang_33 = wrapCC (clangUnwrapped llvm_33 ../development/compilers/llvm/3.3/clang.nix); clang_33 = wrapCC (clangUnwrapped llvm_33 ../development/compilers/llvm/3.3/clang.nix);
clangAnalyzer = callPackage ../development/tools/analysis/clang-analyzer { clang-analyzer = callPackage ../development/tools/analysis/clang-analyzer {
clang = clang_34; clang = clang_34;
llvmPackages = llvmPackages_34; llvmPackages = llvmPackages_34;
}; };
@ -13644,6 +13644,7 @@ let
arduino_core = arduino-core; # added 2015-02-04 arduino_core = arduino-core; # added 2015-02-04
asciidocFull = asciidoc-full; # added 2014-06-22 asciidocFull = asciidoc-full; # added 2014-06-22
bridge_utils = bridge-utils; # added 2015-02-20 bridge_utils = bridge-utils; # added 2015-02-20
clangAnalyzer = clang-analyzer; # added 2015-02-20
lttngTools = lttng-tools; # added 2014-07-31 lttngTools = lttng-tools; # added 2014-07-31
lttngUst = lttng-ust; # added 2014-07-31 lttngUst = lttng-ust; # added 2014-07-31
jquery_ui = jquery-ui; # added 2014-09-07 jquery_ui = jquery-ui; # added 2014-09-07