Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: c53703a6b2a5
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0139c4ba2bb2
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Mar 13, 2019

  1. Use llvmPackages_7 explicitly for ccls 

    llvmPackages_latest picks too old LLVM for ccls on macOS. Which breaks
the build.
    Väinö Järvelä committed Mar 13, 2019
    Copy the full SHA
    4c53321 View commit details

  2. Merge pull request #57565 from Kaali/fix-darwin-ccls 

    Use llvmPackages_7 explicitly for ccls
    @Mic92
    Mic92 authored Mar 13, 2019
    Copy the full SHA
    0139c4b View commit details
Showing with 2 additions and 2 deletions.
  1. +2 −2 pkgs/top-level/all-packages.nix
4 changes: 2 additions & 2 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -8589,8 +8589,8 @@ in
};

ccls = callPackage ../development/tools/misc/ccls {
llvmPackages = llvmPackages_latest;
stdenv = llvmPackages_latest.stdenv;
llvmPackages = llvmPackages_7;
stdenv = llvmPackages_7.stdenv;
};

credstash = with python3Packages; toPythonApplication credstash;