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

ci: attempt to patch nix-serve-ng

Browse Source
This commit is contained in:
Aaron Bieber 2023-06-07 07:43:02 -06:00
parent 03b9274193
commit b1dcb744e3
No known key found for this signature in database
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
configs/ci.nix
View File

@ -16,6 +16,17 @@ let
path = [ ]; 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; { in with lib; {
options = { options = {
xinCI = { xinCI = {
@ -70,6 +81,10 @@ in with lib; {
systemd.services = lib.listToAttrs (builtins.map xinlib.jobToService jobs); systemd.services = lib.listToAttrs (builtins.map xinlib.jobToService jobs);
nixpkgs.overlays = [
patchedNixServeNg
];
services = { services = {
tsrevprox = { tsrevprox = {
enable = true; enable = true;
@ -77,11 +92,7 @@ in with lib; {
envFile = config.sops.secrets.ts_proxy_env.path; envFile = config.sops.secrets.ts_proxy_env.path;
}; };
nix-serve = { nix-serve = {
#package = pkgs.nix-serve; package = pkgs.nix-serve-ng;
package = pkgs.nix-serve-ng.override {
nix =
inputs.unstable.legacyPackages.x86_64-linux.nixVersions.nix_2_14;
};
enable = true; enable = true;
secretKeyFile = config.sops.secrets.bin_cache_priv_key.path; secretKeyFile = config.sops.secrets.bin_cache_priv_key.path;
bindAddress = "127.0.0.1"; bindAddress = "127.0.0.1";