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: dc8a72ea6d30
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 53fd303d0eef
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Apr 2, 2021

  1. llvmPackages_12: Add recurseIntoAttrs 

    See #115288 (835a8f1). This was missing for LLVM 12 because both
changes where made in parallel.
    @primeos
    primeos committed Apr 2, 2021
    Copy the full SHA
    53fd303 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
@@ -10894,13 +10894,13 @@ in
stdenv = gcc7Stdenv;
}));

llvmPackages_12 = callPackage ../development/compilers/llvm/12 ({
llvmPackages_12 = recurseIntoAttrs (callPackage ../development/compilers/llvm/12 ({
inherit (stdenvAdapters) overrideCC;
buildLlvmTools = buildPackages.llvmPackages_12.tools;
targetLlvmLibraries = targetPackages.llvmPackages_12.libraries;
} // lib.optionalAttrs (stdenv.hostPlatform.isi686 && buildPackages.stdenv.cc.isGNU) {
stdenv = gcc7Stdenv;
});
}));

llvmPackages_latest = llvmPackages_11;