movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-09 19:13:26 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge staging-next into staging

Browse source
This commit is contained in:
nixpkgs-ci[bot] 2025-04-24 18:04:57 +00:00 • committed by GitHub
commit c376a565f9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
80 changed files with 912 additions and 4980 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/systems/default.nix
View file

@ -121,8 +121,6 @@ let
"uclibc"
else if final.isAndroid then
"bionic"
else if final.isLLVMLibc then
"llvm"
else if
final.isLinux # default
then
@ -248,7 +246,7 @@ let
# don't support dynamic linking, but don't get the `staticMarker`.
# `pkgsStatic` sets `isStatic=true`, so `pkgsStatic.hostPlatform` always
# has the `staticMarker`.
isStatic = final.isWasi || final.isRedox || final.isLLVMLibc;
isStatic = final.isWasi || final.isRedox;
# Just a guess, based on `system`
inherit

1
lib/systems/inspect.nix
View file

@ -386,7 +386,6 @@ rec {
uclibceabi
uclibceabihf
];
isLLVMLibc = [ { abi = abis.llvm; } ];
isEfi = [
{

3
lib/systems/parse.nix
View file

@ -740,9 +740,6 @@ rec {
};
uclibc = { };
# LLVM libc
llvm = { };
unknown = { };
};