qbit/xin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

pkgs/openssh: tighten things down a bit

Browse Source
This commit is contained in:
Aaron Bieber 2024-04-01 15:32:43 -06:00
parent 531c219000
commit 09a33d39c2
No known key found for this signature in database
3 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
default.nix
View File

@ -16,7 +16,10 @@ let
command="/run/current-system/sw/bin/xin-status",no-port-forwarding,no-X11-forwarding,no-agent-forwarding,no-pty ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIE9PIhQ+yWfBM2tEG+W8W8HXJXqISXif8BcPZHakKvLM xin-status command="/run/current-system/sw/bin/xin-status",no-port-forwarding,no-X11-forwarding,no-agent-forwarding,no-pty ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIE9PIhQ+yWfBM2tEG+W8W8HXJXqISXif8BcPZHakKvLM xin-status
''; '';
gosignify = pkgs.callPackage ./pkgs/gosignify.nix { inherit isUnstable; }; gosignify = pkgs.callPackage ./pkgs/gosignify.nix { inherit isUnstable; };
myOpenSSH = pkgs.callPackage ./pkgs/openssh.nix { inherit config; }; myOpenSSH = pkgs.pkgsMusl.callPackage ./pkgs/openssh.nix {
inherit config;
inherit xinlib;
};
in in
{ {
imports = [ imports = [

12
overlays/default.nix
View File

@ -3,13 +3,21 @@
, ... , ...
}: }:
let let
inherit (xinlib) prIsOpen; inherit (xinlib) prIsOpen todo;
matrix-synapse-unwrapped = prIsOpen.overlay 0 (import ./matrix-synapse.nix); matrix-synapse-unwrapped = prIsOpen.overlay 0 (import ./matrix-synapse.nix);
heisenbridge = prIsOpen.overlay 0 (import ./heisenbridge.nix); heisenbridge = prIsOpen.overlay 0 (import ./heisenbridge.nix);
invidious = prIsOpen.overlay 300643 (import ./invidious.nix); invidious = prIsOpen.overlay 300643 (import ./invidious.nix);
in in
{ {
nixpkgs.overlays = [ heisenbridge matrix-synapse-unwrapped ] ++ nixpkgs.overlays = [
heisenbridge
matrix-synapse-unwrapped
(_: super: {
libressl = super.libressl.overrideAttrs (_: {
doCheck = todo "libressl tests disabled when building with musl" false;
});
})
] ++
(if isUnstable (if isUnstable
then [ then [
invidious invidious

6
pkgs/openssh.nix
View File

@ -13,12 +13,14 @@
, pkg-config , pkg-config
, stdenv , stdenv
, withFIDO ? stdenv.hostPlatform.isUnix && !stdenv.hostPlatform.isMusl , withFIDO ? stdenv.hostPlatform.isUnix && !stdenv.hostPlatform.isMusl
, withPAM ? stdenv.hostPlatform.isLinux , withPAM ? false
, zlib , zlib
, xinlib
, ... , ...
}: }:
let let
inherit (builtins) readFile fromJSON; inherit (builtins) readFile fromJSON;
inherit (xinlib) todo;
verStr = fromJSON (readFile ./openssh/version.json); verStr = fromJSON (readFile ./openssh/version.json);
hostStr = lib.strings.concatStrings [ hostStr = lib.strings.concatStrings [
"CI configured on '" "CI configured on '"
@ -151,7 +153,7 @@ stdenv.mkDerivation {
set -a; source ~/.ssh/environment.base; set +a set -a; source ~/.ssh/environment.base; set +a
''; '';
checkTarget = [ "t-exec" "unit" "file-tests" "interop-tests" ]; checkTarget = todo "t-exec test disabled in openssh" [ "unit" "file-tests" "interop-tests" ];
installTargets = [ "install-nokeys" ]; installTargets = [ "install-nokeys" ];
installFlags = [ installFlags = [