diff options
| author | Bjørn Forsman <bjorn.forsman@gmail.com> | 2015-02-20 21:45:03 +0100 |
|---|---|---|
| committer | Bjørn Forsman <bjorn.forsman@gmail.com> | 2015-02-20 22:30:51 +0100 |
| commit | c22435e70d90fd81ca4ac0aa0ae3e2d92267bf7c (patch) | |
| tree | 44ae59e13968c4cbddb191f95ac8b2e17ee8ec51 /pkgs | |
| parent | 97875ac1757ceb10177b78b4479776fba64e47b2 (diff) | |
| download | nixpkgs-c22435e70d90fd81ca4ac0aa0ae3e2d92267bf7c.tar nixpkgs-c22435e70d90fd81ca4ac0aa0ae3e2d92267bf7c.tar.gz nixpkgs-c22435e70d90fd81ca4ac0aa0ae3e2d92267bf7c.tar.bz2 nixpkgs-c22435e70d90fd81ca4ac0aa0ae3e2d92267bf7c.tar.lz nixpkgs-c22435e70d90fd81ca4ac0aa0ae3e2d92267bf7c.tar.xz nixpkgs-c22435e70d90fd81ca4ac0aa0ae3e2d92267bf7c.tar.zst nixpkgs-c22435e70d90fd81ca4ac0aa0ae3e2d92267bf7c.zip | |
clang-analyzer: align attrname with pkgname
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/build-support/release/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/build-support/release/nix-build.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/build-support/release/default.nix b/pkgs/build-support/release/default.nix index d36707dc60f..82919cf819f 100644 --- a/pkgs/build-support/release/default.nix +++ b/pkgs/build-support/release/default.nix @@ -32,7 +32,7 @@ rec { } // args); clangAnalysis = args: nixBuild ( - { inherit clangAnalyzer; + { inherit clang-analyzer; doClangAnalysis = true; } // args); diff --git a/pkgs/build-support/release/nix-build.nix b/pkgs/build-support/release/nix-build.nix index 6e0088adc3f..d42538c7e5d 100644 --- a/pkgs/build-support/release/nix-build.nix +++ b/pkgs/build-support/release/nix-build.nix @@ -137,7 +137,7 @@ stdenv.mkDerivation ( buildInputs = buildInputs ++ (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.xz); diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c18d3c014a8..cc4299883ba 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3181,7 +3181,7 @@ let clang_34 = wrapCC llvmPackages_34.clang; 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; llvmPackages = llvmPackages_34; }; @@ -13644,6 +13644,7 @@ let arduino_core = arduino-core; # added 2015-02-04 asciidocFull = asciidoc-full; # added 2014-06-22 bridge_utils = bridge-utils; # added 2015-02-20 + clangAnalyzer = clang-analyzer; # added 2015-02-20 lttngTools = lttng-tools; # added 2014-07-31 lttngUst = lttng-ust; # added 2014-07-31 jquery_ui = jquery-ui; # added 2014-09-07 |