gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging-nixos merge for 2026-05-07 (#517555)

Browse Source
This commit is contained in:
zowoq
2026-05-07 06:21:17 +00:00
committed by GitHub
parent 1d9b308f01 ec2ff542ce
commit 7199af8e1e
3 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/modules/config/sysctl.nix
+2 -2
View File
@@ -81,8 +81,8 @@ in
fi
echo "vm.mmap_rnd_bits=$mmap_rnd_bits_max" >> $out
''
# HAVE_ARCH_MMAP_RND_COMPAT_BITS is not defined for LoongArch64
+ lib.optionalString (!pkgs.stdenv.hostPlatform.isLoongArch64) ''
# HAVE_ARCH_MMAP_RND_COMPAT_BITS is not defined on 32-bit architectures or LoongArch64
+ lib.optionalString (with pkgs.stdenv.hostPlatform; (!is32bit && !isLoongArch64)) ''
mmap_rnd_compat_bits_max=$(grep "^CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=" $configfile | grep --only-matching "[0-9]*$")
if [[ -z "$mmap_rnd_compat_bits_max" ]]; then
echo "Unable to determine mmap_rnd_compat_bits_max. Check your kernel configfile is valid."
pkgs/os-specific/linux/kernel/common-config.nix
-2
View File
@@ -319,14 +319,12 @@ let
IPV6_MROUTE = yes;
IPV6_MROUTE_MULTIPLE_TABLES = yes;
IPV6_PIMSM_V2 = yes;
IPV6_FOU_TUNNEL = yes;
IPV6_SEG6_LWTUNNEL = yes;
IPV6_SEG6_HMAC = yes;
IPV6_SEG6_BPF = yes;
NET_CLS_ACT = yes;
NET_CLS_BPF = module;
NET_ACT_BPF = module;
NET_FOU = yes;
NET_SCHED = yes;
NET_SCH_BPF = whenAtLeast "6.16" (whenPlatformHasEBPFJit yes);
L2TP_V3 = yes;
pkgs/os-specific/linux/kernel/kernels-org.json
+6 -6
View File
@@ -25,18 +25,18 @@
"lts": true
},
"6.12": {
"version": "6.12.85",
"hash": "sha256:1v8a0z6znmr2m26l4744wndaimsh24zz6q4d7m4p8s0ayjcwjnp3",
"version": "6.12.86",
"hash": "sha256:0pdvdpr3nnvh4479j4z5k6i1qkrlzbzigmzqvffg7jy74yrj5vzd",
"lts": true
},
"6.18": {
"version": "6.18.26",
"hash": "sha256:1v5h0w3s8p5m22jxg992x1jfpwyi80ia70cdgiv47q3n6xfjyxsk",
"version": "6.18.27",
"hash": "sha256:1sp2bj3r3n9cn50wsp5nlmkr37d282bba40ryz5s42vgjj9pn095",
"lts": true
},
"7.0": {
"version": "7.0.3",
"hash": "sha256:074zjl0v901a9hafgpcxyyd395qs7y4kr4fcpgg3ssc8ayzsvv8b",
"version": "7.0.4",
"hash": "sha256:19spjbd4yc057xl9q79sv5fsvp75k4j082d7lqhxnnlj9kc8286r",
"lts": false
}
}