Compare commits
4 Commits
e0bb1b7c62
...
63cf19f839
Author | SHA1 | Date | |
---|---|---|---|
63cf19f839 | |||
806a1aa294 | |||
35a023f449 | |||
f0aec4416c |
@@ -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;
|
||||
|
@@ -14,12 +14,12 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "lpac";
|
||||
version = "2.2.1";
|
||||
version = "2.3.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "estkme-group";
|
||||
repo = "lpac";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-dxoYuX3dNj4piXQBqU4w1ICeyOGid35c+6ZITQiN6wA=";
|
||||
hash = "sha256-ALne5sHB6ff7cHAWe0rFwpP/Yz4EhZBiOrgdM2B8+OE=";
|
||||
};
|
||||
|
||||
# options:
|
||||
|
@@ -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";
|
||||
}
|
||||
|
@@ -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";
|
||||
}
|
||||
|
@@ -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";
|
||||
}
|
||||
|
@@ -7,8 +7,8 @@ let
|
||||
src = fetchFromGitHub {
|
||||
owner = "nix-community";
|
||||
repo = "nixpkgs-wayland";
|
||||
rev = "9c452b9ea8e584d5085629e2b76703c94df64b6f";
|
||||
hash = "sha256-THPRayZls0/4rZSw4R5B7evCbGVr5AN3SQQZSgYpIiA=";
|
||||
rev = "aca72b43779c0d565024ea6c198ce19c93fae966";
|
||||
hash = "sha256-p6my5VVzh8vEGTqHONKZnv5/j5rAjmCeNgRStawvZYc=";
|
||||
};
|
||||
flake = import "${src}/flake.nix";
|
||||
evaluated = flake.outputs {
|
||||
@@ -25,7 +25,7 @@ let
|
||||
in src.overrideAttrs (base: {
|
||||
# attributes required by update scripts
|
||||
pname = "nixpkgs-wayland";
|
||||
version = "0-unstable-2025-08-14";
|
||||
version = "0-unstable-2025-08-15";
|
||||
src = src;
|
||||
|
||||
# passthru only nixpkgs-wayland's own packages -- not the whole nixpkgs-with-nixpkgs-wayland-as-overlay:
|
||||
|
@@ -6,12 +6,12 @@
|
||||
}:
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "uassets";
|
||||
version = "0-unstable-2025-08-15";
|
||||
version = "0-unstable-2025-08-16";
|
||||
src = fetchFromGitHub {
|
||||
owner = "uBlockOrigin";
|
||||
repo = "uAssets";
|
||||
rev = "e1dd6d5aa73d9dc6d7a123ef585ba5d082bb6fa8";
|
||||
hash = "sha256-rGZWU2OXWjyweyWjST8CgpriEUB1Sa2wd3/FJ1cVMlw=";
|
||||
rev = "333fceefcebe3bb610573d90c274b83fb3c85f6d";
|
||||
hash = "sha256-KPkPnFwDuQGgJNIXyU31CoBvONkqX9sCCNNgQtJ3AAk=";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
Reference in New Issue
Block a user