M-Labs/it-infra
M-Labs/it-infra
8
0
Fork 6
Code Issues 11 Pull Requests 1 Releases Wiki Activity

nixops: work around openssl3 pam_p11 breakage

Browse Source
This commit is contained in:
Sebastien Bourdeauducq 2023-05-23 17:38:50 +08:00
parent 2f704a7534
commit ffb286ba05
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
nixops/desktop.nix
View File

@ -15,11 +15,13 @@ in
(./. + "/${host}-hardware-configuration.nix") (./. + "/${host}-hardware-configuration.nix")
]; ];
nixpkgs.config.packageOverrides = super: let self = super.pkgs; in { nixpkgs.config.packageOverrides = super: let self = super.pkgs; in {
libp11 = super.libp11.override({ openssl = super.openssl_1_1; });
pam_p11 = super.pam_p11.overrideAttrs(oa: { pam_p11 = super.pam_p11.overrideAttrs(oa: {
patchPhase = oa.patchPhase or "" + '' patches = [];
substituteInPlace src/match_openssh.c --replace \ postPatch = ''
'"%s/.ssh/authorized_keys", pw->pw_dir)' \ substituteInPlace src/match_openssh.c --replace \
'"/etc/ssh/authorized_keys.d/%s", pw->pw_name)' '"%s/.ssh/authorized_keys", pw->pw_dir)' \
'"/etc/ssh/authorized_keys.d/%s", pw->pw_name)'
''; '';
}); });
gnome = super.gnome // { gnome = super.gnome // {
@ -28,6 +30,9 @@ in
}); });
}; };
}; };
nixpkgs.config.permittedInsecurePackages = [
"openssl-1.1.1t"
];
networking.hostName = host; networking.hostName = host;
networking.firewall.allowedTCPPorts = [ 1883 ]; networking.firewall.allowedTCPPorts = [ 1883 ];