dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2024-10-12 18:04:23 +00:00 committed by GitHub
commit 348295076a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/os-specific/linux/kernel/common-config.nix
View File

@ -11,6 +11,7 @@
# Configuration
{ lib, stdenv, version
, rustAvailable
, features ? {}
}:
@ -33,10 +34,8 @@ let
kernelSupportsRust = lib.versionAtLeast version "6.7";
# Currently only enabling Rust by default on kernel 6.12+,
# which actually has features that use Rust that we want,
# and only on x86_64, because of a nixpkgs rustc issue:
# https://github.com/NixOS/nixpkgs/pull/315121#issuecomment-2135805876
defaultRust = lib.versionAtLeast version "6.12" && stdenv.hostPlatform.isx86_64;
# which actually has features that use Rust that we want.
defaultRust = lib.versionAtLeast version "6.12" && rustAvailable;
withRust = (forceRust || defaultRust) && kernelSupportsRust;
options = {
@ -641,7 +640,10 @@ let
NFS_V4_1 = yes; # NFSv4.1 client support
NFS_V4_2 = yes;
NFS_V4_SECURITY_LABEL = yes;
NFS_LOCALIO = whenAtLeast "6.12" yes;
# Fails with
# `fs/nfs/localio.o: relocation R_AARCH64_ADR_PREL_PG_HI21 against symbol `nfs_to' which may bind externally can not be used when making a shared object; recompile with -fPIC`
NFS_LOCALIO = lib.mkIf (!stdenv.hostPlatform.isAarch64) (whenAtLeast "6.12" yes);
CIFS_XATTR = yes;
CIFS_POSIX = option yes;

5
pkgs/os-specific/linux/kernel/generic.nix
View File

@ -108,6 +108,11 @@ let
commonStructuredConfig = import ./common-config.nix {
inherit lib stdenv version;
rustAvailable =
lib.any (lib.meta.platformMatch stdenv.hostPlatform) rustc.targetPlatforms
&& lib.all (p: !lib.meta.platformMatch stdenv.hostPlatform p) rustc.badTargetPlatforms
# Known to be broken: https://lore.kernel.org/lkml/31885EDD-EF6D-4EF1-94CA-276BA7A340B7@kernel.org/T/
&& !(stdenv.hostPlatform.isRiscV && stdenv.cc.isGNU);
features = kernelFeatures; # Ensure we know of all extra patches, etc.
};