colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

nixpkgs: 0-unstable-2025-01-19 -> 0-unstable-2025-01-20

Browse Source 
this includes a kernel update from 6.12.x -> 6.13.0
This commit is contained in:
Colin
2025-01-21 01:58:42 +00:00
parent ac9a44cb48
commit 73c7dbb27a
5 changed files with 33 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/by-name/nixpkgs-bootstrap/master.nix
View File

@@ -8,8 +8,8 @@
mkNixpkgs ? import ./mkNixpkgs.nix {} mkNixpkgs ? import ./mkNixpkgs.nix {}
}: }:
mkNixpkgs { mkNixpkgs {
rev = "edc63aabe4605bc459eabb95ff567b73e518ecd0"; rev = "77c9ec1f655bf0fa92bf19d93ca24425a25830c6";
sha256 = "sha256-M7xydS3m3a7KWlcptBjeymwB9S3M/FRIXgBT7Xbnf5c="; sha256 = "sha256-Gr9/B9nuNjaxLFmITlRH0Ua+G/Y/Kn8uKMmDiI5etrg=";
version = "0-unstable-2025-01-19"; version = "0-unstable-2025-01-20";
branch = "master"; branch = "master";
} }

6
pkgs/by-name/nixpkgs-bootstrap/staging-next.nix
View File

@@ -2,8 +2,8 @@
mkNixpkgs ? import ./mkNixpkgs.nix {} mkNixpkgs ? import ./mkNixpkgs.nix {}
}: }:
mkNixpkgs { mkNixpkgs {
rev = "0a5e75bb2ec4444475449ef0b4f1fa6a5ea64b58"; rev = "cfed72e3bbb241d3824d9c58a85515a5714962cf";
sha256 = "sha256-ZoU0fJrLIG5rgLrx3qRIgyv67SJ3r2nNRIBkYwKY28w="; sha256 = "sha256-FD4yHpv2BO9dPpzZLcNzyrqWC+3UbA8kb4p3EuLYAnQ=";
version = "0-unstable-2025-01-18"; version = "0-unstable-2025-01-20";
branch = "staging-next"; branch = "staging-next";
} }

6
pkgs/by-name/nixpkgs-bootstrap/staging.nix
View File

@@ -2,8 +2,8 @@
mkNixpkgs ? import ./mkNixpkgs.nix {} mkNixpkgs ? import ./mkNixpkgs.nix {}
}: }:
mkNixpkgs { mkNixpkgs {
rev = "cb92d2dad2f0881c58c05197a55299e6cc11d427"; rev = "5ff390289e135e883d93ba6c5e03ef159fe1db2c";
sha256 = "sha256-T6hdIUwmJ2ND5pEEETOwSvWqQG+kesCbn27i9HOWX6I="; sha256 = "sha256-CLsyTton1Z8hFRe3QPFKBIx+fwaLOzsQezFMcuBpkxg=";
version = "0-unstable-2025-01-19"; version = "0-unstable-2025-01-20";
branch = "staging"; branch = "staging";
} }

9
pkgs/linux-packages/imx258/package.nix
View File

@@ -20,7 +20,8 @@ stdenv.mkDerivation {
makeFlags = [ makeFlags = [
# "KERNELRELEASE=${kernel.modDirVersion}" # "KERNELRELEASE=${kernel.modDirVersion}"
"KERNEL_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" # "KERNEL_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
"KERNEL_DIR=$(buildRoot)"
"INSTALL_MOD_PATH=$(out)/lib/modules/${kernel.modDirVersion}/kernel" "INSTALL_MOD_PATH=$(out)/lib/modules/${kernel.modDirVersion}/kernel"
# from <repo:nixos/nixpkgs:pkgs/os-specific/linux/kernel/manual-config.nix> # from <repo:nixos/nixpkgs:pkgs/os-specific/linux/kernel/manual-config.nix>
"O=$(buildRoot)" "O=$(buildRoot)"
@@ -32,6 +33,12 @@ stdenv.mkDerivation {
"CROSS_COMPILE=${stdenv.cc.targetPrefix}" "CROSS_COMPILE=${stdenv.cc.targetPrefix}"
]; ];
preConfigure = ''
# starting with linux 6.13.0 it wants to write to `KERNEL_DIR`, so we copy that here to make it writable
cp -R ${kernel.dev}/lib/modules/${kernel.modDirVersion}/build .
export buildRoot=$(pwd)/build
'';
# the modules shipped in-tree are .xz, so if i want to replace those i need to also xz this module: # the modules shipped in-tree are .xz, so if i want to replace those i need to also xz this module:
postInstall = '' postInstall = ''
find $out -name '*.ko' -exec xz {} \; find $out -name '*.ko' -exec xz {} \;

17
pkgs/linux-packages/rk818-charger/package.nix
View File

@@ -30,7 +30,8 @@ stdenv.mkDerivation {
makeFlags = [ makeFlags = [
# "KERNELRELEASE=${kernel.modDirVersion}" # "KERNELRELEASE=${kernel.modDirVersion}"
"KERNEL_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" # "KERNEL_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
"KERNEL_DIR=$(buildRoot)"
"INSTALL_MOD_PATH=$(out)/lib/modules/${kernel.modDirVersion}/kernel" "INSTALL_MOD_PATH=$(out)/lib/modules/${kernel.modDirVersion}/kernel"
# from <repo:nixos/nixpkgs:pkgs/os-specific/linux/kernel/manual-config.nix> # from <repo:nixos/nixpkgs:pkgs/os-specific/linux/kernel/manual-config.nix>
"O=$(buildRoot)" "O=$(buildRoot)"
@@ -38,10 +39,24 @@ stdenv.mkDerivation {
"HOSTCC=${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}cc" "HOSTCC=${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}cc"
"HOSTLD=${buildPackages.stdenv.cc.bintools}/bin/${buildPackages.stdenv.cc.targetPrefix}ld" "HOSTLD=${buildPackages.stdenv.cc.bintools}/bin/${buildPackages.stdenv.cc.targetPrefix}ld"
"ARCH=${stdenv.hostPlatform.linuxArch}" "ARCH=${stdenv.hostPlatform.linuxArch}"
# other kernel flags:
# M
# KBUILD_EXTMOD
# KBUILD_OUTPUT
] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
"CROSS_COMPILE=${stdenv.cc.targetPrefix}" "CROSS_COMPILE=${stdenv.cc.targetPrefix}"
]; ];
preConfigure = ''
# starting with linux 6.13.0 it wants to write to `KERNEL_DIR`, so we copy that here to make it writable
cp -R ${kernel.dev}/lib/modules/${kernel.modDirVersion}/build .
export buildRoot=$(pwd)/build
chmod u+w -R build
# remove symbols associated with in-tree rk818 module to prevent `modpost` errors: we're intentionally overriding them
sed -i '/rk8xx_/d' ./build/Module.symvers
'';
# the modules shipped in-tree are .xz, so if i want to replace those i need to also xz this module: # the modules shipped in-tree are .xz, so if i want to replace those i need to also xz this module:
postInstall = '' postInstall = ''
find $out -name '*.ko' -exec xz {} \; find $out -name '*.ko' -exec xz {} \;