xinlib: add todo function, use todo to mark logrotate disabled for now.

- fmt
This commit is contained in:
Aaron Bieber 2023-06-13 07:19:13 -06:00
parent e5e409749b
commit 69c506afeb
No known key found for this signature in database
4 changed files with 16 additions and 21 deletions

View File

@ -16,17 +16,6 @@ let
path = [ ];
}
];
patchedNixServeNg = _: super: {
nix = super.nix-serve-ng.overrideAttrs (_: {
patches = [
(pkgs.fetchpatch {
name = "initStore.patch";
url ="https://patch-diff.githubusercontent.com/raw/aristanetworks/nix-serve-ng/pull/23.diff";
hash = "sha256-tLIOMbqEB6zw87taqxs5zGtqgIvE0F6gxxfs8C6ShX8=";
})
];
});
};
in with lib; {
options = {
xinCI = {
@ -91,9 +80,7 @@ in with lib; {
harmonia = {
enable = true;
signKeyPath = config.sops.secrets.bin_cache_priv_key.path;
settings = {
bind = "127.0.0.1:5000";
};
settings = { bind = "127.0.0.1:5000"; };
};
#nix-serve = {
# package = pkgs.nix-serve-ng;

View File

@ -1,6 +1,7 @@
{ config, lib, options, pkgs, isUnstable, ... }:
{ config, lib, options, pkgs, xinlib, isUnstable, ... }:
let
inherit (xinlib) todo;
caPubKeys = builtins.concatStringsSep "\n" [
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC5xMSYMwu6rjjLe2UYs1YGCIBVs35E9db2qAjNltCVPG5UoctxCDXxIz0PMOJrBbfqZzP/6qPU1WAhdGNTZ5eXq/ftnhI+2xFfMg1uzpXZ9vjy8lUCfXIObtoEdZ9h/7OUCN/BnL0ySqsamkcUo8SAj6wXoNCdwk6oncfyTmhPnoW5tCWCS9p7Q/LuWpYGsvW5nFDSxteP7re6SUe10eftIkFAPNhKA2lsrvzMgjxhnXqwIr1qJeY0otcuYA4V5V09FmElbnOWVuy4Pt8SqV4N9ykkAUXZN1Pi7Q4JnCUifRJVWpKHLoJe0mqwMDJbGtt2Akn3EwiGhyaVjq2FFgBKAb7w8UAE8gob8n4+DOx4TQAXlmWviYij2Xh6CvepbamxlJMvVdWgqk53+u4e+/oOQQ9QTmQvAuecg9dSO3m7+hNHEf+0TXjuTNlk9KHRg4s7ZAI+2Stfo1tBrvEeE2fAF//Mw7zaLPKmEbMiXdbDs816gvYtG6Y36fTGyzhowDQAMNm+zbg8YPz7xFukLdSCPt7RcpPnP1iJs/hGBnog5UaG/Cm4ftkm9zKvOaQKIoA/GQ3yQSyltczA+2h5fur6VQQGrQeVhAcXm9a6GaLPWxgvJX/og76CHps0rYzFM3QBlsiJ+Z0sstk5TtBex9nTjwRZ1U9+4DQes2TB4/uxnQ== SUAH CA"
];
@ -201,6 +202,9 @@ in {
environment.etc."ssh/ca.pub" = { text = caPubKeys; };
services.logrotate.enable =
todo "logrotate disabled: https://github.com/NixOS/nix/issues/8502" false;
services = {
openssh = {
enable = true;

View File

@ -214,9 +214,9 @@
};
packages = forAllSystems (system:
let
upkgs = unstablePkgsFor.${system};
spkgs = stablePkgsFor.${system};
let
upkgs = unstablePkgsFor.${system};
spkgs = stablePkgsFor.${system};
in {
ada_language_server =
@ -233,7 +233,8 @@
isUnstable = true;
};
femtolisp = upkgs.callPackage ./pkgs/femtolisp.nix { };
flake-warn = spkgs.callPackage ./pkgs/flake-warn.nix { inherit spkgs; };
flake-warn =
spkgs.callPackage ./pkgs/flake-warn.nix { inherit spkgs; };
kurinto = spkgs.callPackage ./pkgs/kurinto.nix { };
mcchunkie = spkgs.callPackage ./pkgs/mcchunkie.nix { inherit spkgs; };
yaegi = spkgs.callPackage ./pkgs/yaegi.nix { inherit spkgs; };
@ -261,7 +262,8 @@
golink = spkgs.callPackage ./pkgs/golink.nix { inherit spkgs; };
gokrazy = upkgs.callPackage ./pkgs/gokrazy.nix { inherit upkgs; };
gosignify = spkgs.callPackage ./pkgs/gosignify.nix { inherit spkgs; };
gotosocial = spkgs.callPackage ./pkgs/gotosocial.nix { inherit spkgs; };
gotosocial =
spkgs.callPackage ./pkgs/gotosocial.nix { inherit spkgs; };
govulncheck =
upkgs.callPackage ./pkgs/govulncheck.nix { inherit upkgs; };
zutty = upkgs.callPackage ./pkgs/zutty.nix {

View File

@ -26,6 +26,8 @@ let
} (${prStatus.title}) is complete, ignoring overlay..." (_: _: { });
};
todo = msg: lib.warn "TODO: ${msg}";
filterList = pkgList: filter (x: x != null) pkgList;
mkCronScript = name: src: ''
@ -85,7 +87,7 @@ let
xinlib = {
inherit buildVer mkCronScript jobToUserService jobToService buildShell
prIsOpen filterList;
prIsOpen filterList todo;
};
in xinlib