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

Merge pull request #268812 from Artturin/llvmdedup3

parents 5be8fd9f f6749cdd

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

+2 −17
Original line number Diff line number Diff line 
{ lowPrio, newScope, pkgs, lib, stdenv, cmake

, gccForLibs, preLibcCrossHeaders

, preLibcCrossHeaders

, libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith, wrapBintoolsWith

, buildLlvmTools # tools, but from the previous stage, for cross

, targetLlvmLibraries # libraries, but from the next stage, for cross
@@ -20,7 +20,6 @@ 
let

  release_version = "10.0.1";

  version = release_version; # differentiating these (variables) is important for RCs

  targetConfig = stdenv.targetPlatform.config;



  fetch = name: sha256: fetchurl {

    url = "https://github.com/llvm/llvm-project/releases/download/llvmorg-${release_version}/${name}-${version}.src.tar.xz";
@@ -29,21 +28,7 @@ let 


  clang-tools-extra_src = fetch "clang-tools-extra" "06n1yp638rh24xdxv9v2df0qajxbjz4w59b7dd4ky36drwmpi4yh";



  llvm_meta = {

    license     = lib.licenses.ncsa;

    maintainers = lib.teams.llvm.members;



    # See llvm/cmake/config-ix.cmake.

    platforms   =

      lib.platforms.aarch64 ++

      lib.platforms.arm ++

      lib.platforms.mips ++

      lib.platforms.power ++

      lib.platforms.riscv ++

      lib.platforms.s390x ++

      lib.platforms.wasi ++

      lib.platforms.x86;

  };

  inherit (import ../common/common-let.nix { inherit lib release_version; }) llvm_meta;



  tools = lib.makeExtensible (tools: let

    callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch buildLlvmTools; });

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

+1 −2
Original line number Diff line number Diff line 
{ lib, stdenv, llvm_meta, version, fetch, cmake, fetchpatch

, enableShared ? !stdenv.hostPlatform.isStatic

{ lib, stdenv, llvm_meta, version, fetch, cmake, enableShared ? !stdenv.hostPlatform.isStatic

}:



stdenv.mkDerivation rec {

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

+1 −1
Original line number Diff line number Diff line 
{ lib, stdenv, llvm_meta, fetch, fetchpatch, substituteAll, cmake, libxml2, libllvm, version, clang-tools-extra_src, python3

{ lib, stdenv, llvm_meta, fetch, substituteAll, cmake, libxml2, libllvm, version, clang-tools-extra_src, python3

, buildLlvmTools

, fixDarwinDylibNames

, enableManpages ? false

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

+2 −17
Original line number Diff line number Diff line 
{ lowPrio, newScope, pkgs, lib, stdenv, cmake

, gccForLibs, preLibcCrossHeaders

, preLibcCrossHeaders

, libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith, wrapBintoolsWith

, buildLlvmTools # tools, but from the previous stage, for cross

, targetLlvmLibraries # libraries, but from the next stage, for cross
@@ -22,7 +22,6 @@ let 
  candidate = ""; # empty or "rcN"

  dash-candidate = lib.optionalString (candidate != "") "-${candidate}";

  version = "${release_version}${dash-candidate}"; # differentiating these (variables) is important for RCs

  targetConfig = stdenv.targetPlatform.config;



  fetch = name: sha256: fetchurl {

    url = "https://github.com/llvm/llvm-project/releases/download/llvmorg-${version}/${name}-${release_version}${candidate}.src.tar.xz";
@@ -31,21 +30,7 @@ let 


  clang-tools-extra_src = fetch "clang-tools-extra" "18n1w1hkv931xzq02b34wglbv6zd6sd0r5kb8piwvag7klj7qw3n";



  llvm_meta = {

    license     = lib.licenses.ncsa;

    maintainers = lib.teams.llvm.members;



    # See llvm/cmake/config-ix.cmake.

    platforms   =

      lib.platforms.aarch64 ++

      lib.platforms.arm ++

      lib.platforms.mips ++

      lib.platforms.power ++

      lib.platforms.riscv ++

      lib.platforms.s390x ++

      lib.platforms.wasi ++

      lib.platforms.x86;

  };

  inherit (import ../common/common-let.nix { inherit lib release_version; }) llvm_meta;



  tools = lib.makeExtensible (tools: let

    callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch buildLlvmTools; });

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

+1 −2
Original line number Diff line number Diff line 
{ lib, stdenv, llvm_meta, version, fetch, cmake, fetchpatch

, enableShared ? !stdenv.hostPlatform.isStatic

{ lib, stdenv, llvm_meta, version, fetch, cmake, enableShared ? !stdenv.hostPlatform.isStatic

}:



stdenv.mkDerivation rec {