diff options
| author | sterni <sternenseemann@systemli.org> | 2021-08-18T18·34+0200 |
|---|---|---|
| committer | sterni <sternenseemann@systemli.org> | 2021-08-24T12·13+0000 |
| commit | 559ee9467bbbba0794891edee7aa5fcd2c4cbccc (patch) | |
| tree | d929ca92d6550d3d782a553de4948149174e2227 | |
| parent | 32de4cbd934894e7be3dcb2c695229f8056f28cf (diff) | |
chore(3p): bump NixOS channels to 2020-08-18 r/2754
Wanted to port my emacs config to depot, but missing a dependency from the channel. Adjustments: * Downgrade grfn's Kernel to 5.10: The ck1 patch is not yet available for 5.13 unfortunately and the 5.12 set has been removed upstream. Change-Id: Ifaf315427bda2af590549ca0abec02a79f19a3ec Reviewed-on: https://cl.tvl.fyi/c/depot/+/3375 Tested-by: BuildkiteCI Reviewed-by: tazjin <mail@tazj.in> Reviewed-by: grfn <grfn@gws.fyi>
| -rw-r--r-- | third_party/nixpkgs/default.nix | 12 | ||||
| -rw-r--r-- | users/grfn/system/system/modules/kernel.nix | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/third_party/nixpkgs/default.nix b/third_party/nixpkgs/default.nix index 43dfbeb97f24..55d069f1d379 100644 --- a/third_party/nixpkgs/default.nix +++ b/third_party/nixpkgs/default.nix @@ -13,16 +13,16 @@ let # nixos-unstable, and the current stable channel of the latest NixOS # release. - # Tracking nixos-unstable as of 2021-08-16. + # Tracking nixos-unstable as of 2021-08-19. unstableHashes = { - commit = "e41ba38114055832e5ba4a851e9c00149eef3e4a"; - sha256 = "01qh41a912vk6fsdh3w6wsl45ml0lbqlc9akpbw2hasjf6wwg3kn"; + commit = "253aecf69ed7595aaefabde779aa6449195bebb7"; + sha256 = "14szn1k345jfm47k6vcgbxprmw1v16n7mvyhcdl7jbjmcggjh4z7"; }; - # Tracking nixos-21.05 as of 2021-08-15. + # Tracking nixos-21.05 as of 2021-08-20. stableHashes = { - commit = "8ac785da9843aa110caeed6c912875e46a415a11"; - sha256 = "0niqmgw4p1xbanc51rxs760qb8dp9vycgp19vqfiprni1fyx73an"; + commit = "a1007637cea374bd1bafd754cfd5388894c49129"; + sha256 = "0qnnrn2ahlvxgamwybjafdafaj8mjs6dl91ml5b8bh1v9aj313vl"; }; # import the nixos-unstable package set, or optionally use the diff --git a/users/grfn/system/system/modules/kernel.nix b/users/grfn/system/system/modules/kernel.nix index a252b1d15e16..dd213fcca31c 100644 --- a/users/grfn/system/system/modules/kernel.nix +++ b/users/grfn/system/system/modules/kernel.nix @@ -11,7 +11,7 @@ let name = "linux-ck-patch-${mm}-ck1.xz"; # example: http://ck.kolivas.org/patches/5.0/5.4/5.4-ck1/patch-5.4-ck1.xz url = "http://ck.kolivas.org/patches/${mj}.0/${mm}/${mm}-ck1/patch-${mm}-ck1.xz"; - sha256 = "0z6x9vqks0b5sr47ip6zc4gva1j4g3swwdj7gjvgfwcqrakg44yw"; + sha256 = "1kka38rmjcqsv4j2anczrsni0bf6yfdx2vsxbna3ic84nh3rz434"; }; unpackPhase = '' @@ -24,7 +24,7 @@ let }; in { - boot.kernelPackages = pkgs.linuxPackages_5_12.extend (self: super: { + boot.kernelPackages = pkgs.linuxPackages_5_10.extend (self: super: { kernel = super.kernel.override { ignoreConfigErrors = true; kernelPatches = super.kernel.kernelPatches ++ [{ |