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

nixpkgs: 2025-08-15 -> 2025-08-16

Browse Source
This commit is contained in:
Colin
2025-08-16 21:05:35 +00:00
parent 806a1aa294
commit 63cf19f839
4 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
hosts/modules/hal/pine64-pinephone-pro/default.nix
View File

@@ -209,9 +209,12 @@ in
# from <repo:nixos/nixpkgs:nixos/modules/system/boot/kernel.nix> AKA pkgs.aggregateModules
# but configured to **ignore collisions**
system.modulesTree = lib.mkForce [(
(pkgs.aggregateModules
( config.boot.extraModulePackages ++ [ config.boot.kernelPackages.kernel ])
).overrideAttrs {
(pkgs.aggregateModules (
config.boot.extraModulePackages ++ [
(lib.getOutput "modules" config.boot.kernelPackages.kernel)
]
)).overrideAttrs {
name = "kernel-modules-merged-sane";
# earlier items override the contents of later items
ignoreCollisions = true;
# checkCollisionContents = false;

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

@@ -14,8 +14,8 @@
mkNixpkgs ? import ./mkNixpkgs.nix {},
}:
mkNixpkgs {
rev = "6207745fb2fb83330b7193fed31337050b075f40";
sha256 = "sha256-NfKklCRVBW979loK3FIXjYYMO2oGfFx/ozfg37oWRcc=";
version = "unstable-2025-08-15";
rev = "853d8d0ec056779b80eccccdf80150458264bb9b";
sha256 = "sha256-ipN+OsqI2BsXxHS6AaUxpIjJKpoxmnWunj6pYsXPwNY=";
version = "unstable-2025-08-16";
branch = "master";
}

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

@@ -2,8 +2,8 @@
mkNixpkgs ? import ./mkNixpkgs.nix {},
}:
mkNixpkgs {
rev = "c0e9e1afcfdb5fcd0ae7466a20a9c1ced45ce8a1";
sha256 = "sha256-njAuNOzJKhK4lAuabibqWqsziLZVCMQJmDZRm5MYbbQ=";
version = "unstable-2025-08-15";
rev = "6f21e9a356f48eb9e44cac37c6ba45c33c41435f";
sha256 = "sha256-3BklZhjQlB0HY40QGBZXyhbrt572QFXxA5KhYb+Zrak=";
version = "unstable-2025-08-16";
branch = "staging-next";
}

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

@@ -2,8 +2,8 @@
mkNixpkgs ? import ./mkNixpkgs.nix {},
}:
mkNixpkgs {
rev = "664c1d7072fbafa4c806ac6b22f9a6eee221cfcf";
sha256 = "sha256-Y7DnNNQLKLdQwIwAEyGQPPcqDDLiCZcuJnQ9f/mWigM=";
version = "unstable-2025-08-15";
rev = "9553b76500280d08bacd1e6c780e6339bebfef85";
sha256 = "sha256-CFvZTbS2iUx5kphAmXsKkMrdLEama5Z2QRBm1uzCTHI=";
version = "unstable-2025-08-16";
branch = "staging";
}