Unverified Commit 41b14024 authored by Tristan Ross's avatar Tristan Ross
Browse files

pkgs/top-level/stage.nix: add pkgsLLVMLibc

parent f72b3415

lib/systems/default.nix

+1 −0
Original line number Diff line number Diff line
@@ -102,6 +102,7 @@ let 
        else if final.isMusl                  then "musl"

        else if final.isUClibc                then "uclibc"

        else if final.isAndroid               then "bionic"

        else if final.isLLVMLibc              then "llvm"

        else if final.isLinux  /* default */  then "glibc"

        else if final.isFreeBSD               then "fblibc"

        else if final.isOpenBSD               then "oblibc"

lib/systems/inspect.nix

+1 −0
Original line number Diff line number Diff line
@@ -113,6 +113,7 @@ rec { 
    isGnu          = with abis; map (a: { abi = a; }) [ gnuabi64 gnuabin32 gnu gnueabi gnueabihf gnuabielfv1 gnuabielfv2 ];

    isMusl         = with abis; map (a: { abi = a; }) [ musl musleabi musleabihf muslabin32 muslabi64 ];

    isUClibc       = with abis; map (a: { abi = a; }) [ uclibc uclibceabi uclibceabihf ];

    isLLVMLibc     = [ { abi = abis.llvm; } ];



    isEfi = [

      { cpu = { family = "arm"; version = "6"; }; }

lib/systems/parse.nix

+3 −0
Original line number Diff line number Diff line
@@ -416,6 +416,9 @@ rec { 
    uclibceabihf = { float = "hard"; };

    uclibc       = {};



    # LLVM libc

    llvm         = {};



    unknown = {};

  };

pkgs/top-level/release-attrpaths-superset.nix

+1 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ let 


    # cross packagesets

    pkgsLLVM = true;

    pkgsLLVMLibc = true;

    pkgsMusl = true;

    pkgsStatic = true;

    pkgsCross = true;

pkgs/top-level/release.nix

+1 −0
Original line number Diff line number Diff line
@@ -341,6 +341,7 @@ let 
      agdaPackages = packagePlatforms pkgs.agdaPackages;



      pkgsLLVM.stdenv = [ "x86_64-linux" "aarch64-linux" ];

      pkgsLLVMLibc.stdenv = [ "x86_64-linux" "aarch64-linux" ];

      pkgsArocc.stdenv = [ "x86_64-linux" "aarch64-linux" ];

      pkgsZig.stdenv = [ "x86_64-linux" "aarch64-linux" ];

      pkgsMusl.stdenv = [ "x86_64-linux" "aarch64-linux" ];