nixpkgs: 2023-09-22 -> 2023-09-25
``` • Updated input 'nixpkgs-unpatched': 'github:nixos/nixpkgs/e35dcc04a3853da485a396bdd332217d0ac9054f' (2023-09-22) → 'github:nixos/nixpkgs/6500b4580c2a1f3d0f980d32d285739d8e156d92' (2023-09-25) ```
This commit is contained in:
6
flake.lock
generated
6
flake.lock
generated
@@ -52,11 +52,11 @@
|
||||
},
|
||||
"nixpkgs-unpatched": {
|
||||
"locked": {
|
||||
"lastModified": 1695360818,
|
||||
"narHash": "sha256-JlkN3R/SSoMTa+CasbxS1gq+GpGxXQlNZRUh9+LIy/0=",
|
||||
"lastModified": 1695644571,
|
||||
"narHash": "sha256-asS9dCCdlt1lPq0DLwkVBbVoEKuEuz+Zi3DG7pR/RxA=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "e35dcc04a3853da485a396bdd332217d0ac9054f",
|
||||
"rev": "6500b4580c2a1f3d0f980d32d285739d8e156d92",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@@ -16,17 +16,6 @@
|
||||
# "systemd.log_level=debug"
|
||||
# "systemd.log_target=console"
|
||||
|
||||
# TODO: remove once it no longer applies
|
||||
# this fixes /mnt/servo-nfs mount failures
|
||||
# <https://github.com/NixOS/nixpkgs/issues/255803>
|
||||
boot.kernelPatches = [{
|
||||
name = "backport-nfs4-selinux-fix";
|
||||
patch = pkgs.fetchpatch {
|
||||
url = "https://patchwork.kernel.org/project/selinux/patch/20230911142358.883728-1-omosnace@redhat.com/raw/";
|
||||
hash = "sha256-m947t39xr4VqJBZ2mYTFq9Up/NWlwueH8aXFZRQwA7c=";
|
||||
};
|
||||
}];
|
||||
|
||||
# hack in the `boot.shell_on_fail` arg since that doesn't always seem to work.
|
||||
boot.initrd.preFailCommands = "allowShell=1";
|
||||
|
||||
|
@@ -19,13 +19,6 @@ let
|
||||
// (if title != null then { name = title; } else {})
|
||||
);
|
||||
in [
|
||||
(fetchpatch' {
|
||||
# merged 2023/09/21
|
||||
title = "resholve: fix oildev";
|
||||
prUrl = "https://github.com/NixOS/nixpkgs/pull/256612";
|
||||
hash = "sha256-LmDReZTOQ8nvjmDNlWa8mzD6Ycnq4/Zlr08Kd+xSpzg=";
|
||||
})
|
||||
|
||||
# (fetchpatch' {
|
||||
# # fixes /mnt/servo-nfs mount failures
|
||||
# # 2023/09/21: doesn't apply
|
||||
|
Reference in New Issue
Block a user