Unverified Commit de42a231 authored by Artturi's avatar Artturi Committed by GitHub
Browse files

Merge pull request #236203 from SharzyL/llvm_no_extend

parents efd23a1c 39cabe4c

pkgs/development/compilers/llvm/10/default.nix

+2 −1
Original line number Diff line number Diff line
@@ -279,5 +279,6 @@ let 
      inherit llvm_meta targetLlvm;

    };

  });

  noExtend = extensible: lib.attrsets.removeAttrs extensible [ "extend" ];



in { inherit tools libraries release_version; } // libraries // tools
 
in { inherit tools libraries release_version; } // (noExtend libraries) // (noExtend tools)

pkgs/development/compilers/llvm/11/default.nix

+2 −1
Original line number Diff line number Diff line
@@ -294,5 +294,6 @@ let 
      inherit llvm_meta targetLlvm;

    };

  });

  noExtend = extensible: lib.attrsets.removeAttrs extensible [ "extend" ];



in { inherit tools libraries release_version; } // libraries // tools
 
in { inherit tools libraries release_version; } // (noExtend libraries) // (noExtend tools)

pkgs/development/compilers/llvm/12/default.nix

+2 −1
Original line number Diff line number Diff line
@@ -294,5 +294,6 @@ let 
      inherit llvm_meta targetLlvm;

    };

  });

  noExtend = extensible: lib.attrsets.removeAttrs extensible [ "extend" ];



in { inherit tools libraries release_version; } // libraries // tools
 
in { inherit tools libraries release_version; } // (noExtend libraries) // (noExtend tools)

pkgs/development/compilers/llvm/13/default.nix

+2 −1
Original line number Diff line number Diff line
@@ -316,5 +316,6 @@ let 
      inherit llvm_meta targetLlvm;

    };

  });

  noExtend = extensible: lib.attrsets.removeAttrs extensible [ "extend" ];



in { inherit tools libraries release_version; } // libraries // tools
 
in { inherit tools libraries release_version; } // (noExtend libraries) // (noExtend tools)

pkgs/development/compilers/llvm/14/default.nix

+2 −1
Original line number Diff line number Diff line
@@ -314,5 +314,6 @@ let 
      inherit llvm_meta targetLlvm;

    };

  });

  noExtend = extensible: lib.attrsets.removeAttrs extensible [ "extend" ];



in { inherit tools libraries release_version; } // libraries // tools
 
in { inherit tools libraries release_version; } // (noExtend libraries) // (noExtend tools)