Commit 5ac86a99 authored by Artturin's avatar Artturin
Browse files

llvmPackages: Dedupe releaseInfo

parent 2902f99c

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

+3 −15
Original line number Diff line number Diff line
@@ -54,19 +54,6 @@ in 
let

  monorepoSrc' = monorepoSrc;

in let

  releaseInfo = if gitRelease != null then rec {

    original = gitRelease;

    release_version = original.version;

    version = gitRelease.rev-version;

  } else rec {

    original = officialRelease;

    release_version = original.version;

    version = if original ? candidate then

      "${release_version}-${original.candidate}"

    else

      release_version;

  };



  monorepoSrc = if monorepoSrc' != null then

    monorepoSrc'

  else let
@@ -81,9 +68,10 @@ in let 
    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; }) llvm_meta;

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



  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

+3 −15
Original line number Diff line number Diff line
@@ -54,19 +54,6 @@ in 
let

  monorepoSrc' = monorepoSrc;

in let

  releaseInfo = if gitRelease != null then rec {

    original = gitRelease;

    release_version = original.version;

    version = gitRelease.rev-version;

  } else rec {

    original = officialRelease;

    release_version = original.version;

    version = if original ? candidate then

      "${release_version}-${original.candidate}"

    else

      release_version;

  };



  monorepoSrc = if monorepoSrc' != null then

    monorepoSrc'

  else let
@@ -81,9 +68,10 @@ in let 
    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; }) llvm_meta;

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



  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

+20 −1
Original line number Diff line number Diff line 
{ lib, release_version }:

{ lib

, release_version ? null

, gitRelease ? null

, officialRelease ? null

}:



{

  llvm_meta = {
@@ -18,4 +22,19 @@ 
      lib.optionals (lib.versionAtLeast release_version "14") lib.platforms.m68k;

  };



  releaseInfo =

    if gitRelease != null then rec {

      original = gitRelease;

      release_version = original.version;

      version = gitRelease.rev-version;

    } else rec {

      original = officialRelease;

      release_version = original.version;

      version =

        if original ? candidate then

          "${release_version}-${original.candidate}"

        else

          release_version;

    };



}

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

+4 −15
Original line number Diff line number Diff line
@@ -53,19 +53,6 @@ in 
let

  monorepoSrc' = monorepoSrc;

in let

  releaseInfo = if gitRelease != null then rec {

    original = gitRelease;

    release_version = original.version;

    version = gitRelease.rev-version;

  } else rec {

    original = officialRelease;

    release_version = original.version;

    version = if original ? candidate then

      "${release_version}-${original.candidate}"

    else

      release_version;

  };



  monorepoSrc = if monorepoSrc' != null then

    monorepoSrc'

  else let
@@ -80,9 +67,11 @@ in let 
    inherit rev sha256;

  };



  inherit (releaseInfo) release_version version;



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

  # 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;



  tools = lib.makeExtensible (tools: let

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