Commit 32be3c65 authored by Alois Wohlschlager's avatar Alois Wohlschlager Committed by Yureka
Browse files

lixPackageSets: support splicing

parent 7b7a9a6a

pkgs/tools/package-management/lix/default.nix

+84 −71
Original line number Diff line number Diff line 
{

  lib,

  stdenv,

  makeScopeWithSplicing',

  generateSplicesForMkScope,

  aws-sdk-cpp,

  boehmgc,

  callPackage,

  fetchgit,

  fetchFromGitHub,

  rustPlatform,

  newScope,

  editline,

  ncurses,

  clangStdenv,
@@ -22,6 +23,7 @@ 
let

  makeLixScope =

    {

      attrName,

      lix-args,

      nix-eval-jobs-args,

    }:
@@ -29,7 +31,12 @@ let 
      # GCC 13.2 is known to miscompile Lix coroutines (introduced in 2.92).

      lixStdenv = if lib.versionAtLeast lix-args.version "2.92" then clangStdenv else stdenv;

    in

    lib.makeScope newScope (

    makeScopeWithSplicing' {

      otherSplices = generateSplicesForMkScope [

        "lixPackageSets"

        attrName

      ];

      f =

        self:

        lib.recurseIntoAttrs {

          inherit
@@ -99,13 +106,15 @@ let 
            nix = self.lix;

            inherit (self) nix-eval-jobs;

          };

      }

    );

        };

    };

in

lib.makeExtensible (self: {

  inherit makeLixScope;



  lix_2_90 = self.makeLixScope {

    attrName = "lix_2_90";



    lix-args = rec {

      version = "2.90.0";
@@ -136,6 +145,8 @@ lib.makeExtensible (self: { 
  };



  lix_2_91 = self.makeLixScope {

    attrName = "lix_2_91";



    lix-args = rec {

      version = "2.91.1";
@@ -166,6 +177,8 @@ lib.makeExtensible (self: { 
  };



  lix_2_92 = self.makeLixScope {

    attrName = "lix_2_92";



    lix-args = rec {

      version = "2.92.0";