Commit e6751897 authored by Artturin's avatar Artturin
Browse files

llvmPackages: Dedupe monorepoSrc

parent 5ac86a99

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

+1 −15
Original line number Diff line number Diff line
@@ -54,24 +54,10 @@ in 
let

  monorepoSrc' = monorepoSrc;

in let

  monorepoSrc = if monorepoSrc' != null then

    monorepoSrc'

  else let

    sha256 = releaseInfo.original.sha256;

    rev = if gitRelease != null then

      gitRelease.rev

    else

      "llvmorg-${releaseInfo.version}";

  in fetchFromGitHub {

    owner = "llvm";

    repo = "llvm-project";

    inherit rev sha256;

  };



  # Import releaseInfo separately to avoid infinite recursion

  inherit (import ../common/common-let.nix { inherit lib gitRelease officialRelease; }) releaseInfo;

  inherit (releaseInfo) release_version version;

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

  inherit (import ../common/common-let.nix { inherit lib fetchFromGitHub release_version gitRelease officialRelease monorepoSrc'; }) llvm_meta monorepoSrc;



  tools = lib.makeExtensible (tools: let

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

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

+1 −15
Original line number Diff line number Diff line
@@ -54,24 +54,10 @@ in 
let

  monorepoSrc' = monorepoSrc;

in let

  monorepoSrc = if monorepoSrc' != null then

    monorepoSrc'

  else let

    sha256 = releaseInfo.original.sha256;

    rev = if gitRelease != null then

      gitRelease.rev

    else

      "llvmorg-${releaseInfo.version}";

  in fetchFromGitHub {

    owner = "llvm";

    repo = "llvm-project";

    inherit rev sha256;

  };



  # Import releaseInfo separately to avoid infinite recursion

  inherit (import ../common/common-let.nix { inherit lib gitRelease officialRelease; }) releaseInfo;

  inherit (releaseInfo) release_version version;

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

  inherit (import ../common/common-let.nix { inherit lib fetchFromGitHub release_version gitRelease officialRelease monorepoSrc'; }) llvm_meta monorepoSrc;



  tools = lib.makeExtensible (tools: let

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

pkgs/development/compilers/llvm/common/common-let.nix

+21 −1
Original line number Diff line number Diff line 
{ lib

, fetchFromGitHub ? null

, release_version ? null

, gitRelease ? null

, officialRelease ? null

, monorepoSrc' ? null

}:



{

rec {

  llvm_meta = {

    license = lib.licenses.ncsa;

    maintainers = lib.teams.llvm.members;
@@ -37,4 +39,22 @@ 
          release_version;

    };



  monorepoSrc =

    if monorepoSrc' != null then

      monorepoSrc'

    else

      let

        sha256 = releaseInfo.original.sha256;

        rev =

          if gitRelease != null then

            gitRelease.rev

          else

            "llvmorg-${releaseInfo.version}";

      in

      fetchFromGitHub {

        owner = "llvm";

        repo = "llvm-project";

        inherit rev sha256;

      };



}

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

+1 −16
Original line number Diff line number Diff line
@@ -53,25 +53,10 @@ in 
let

  monorepoSrc' = monorepoSrc;

in let

  monorepoSrc = if monorepoSrc' != null then

    monorepoSrc'

  else let

    sha256 = releaseInfo.original.sha256;

    rev = if gitRelease != null then

      gitRelease.rev

    else

      "llvmorg-${releaseInfo.version}";

  in fetchFromGitHub {

    owner = "llvm";

    repo = "llvm-project";

    inherit rev sha256;

  };





  # Import releaseInfo separately to avoid infinite recursion

  inherit (import ../common/common-let.nix { inherit lib gitRelease officialRelease; }) releaseInfo;

  inherit (releaseInfo) release_version version;

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

  inherit (import ../common/common-let.nix { inherit lib fetchFromGitHub release_version gitRelease officialRelease monorepoSrc'; }) llvm_meta monorepoSrc;



  tools = lib.makeExtensible (tools: let

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