From bc9e5b0ea863a17537987faa5a72b00efc7767d1 Mon Sep 17 00:00:00 2001 From: Ben Sima Date: Mon, 18 Jul 2022 22:09:58 -0400 Subject: Upgrade nixpkgs, ghc923 I ended up deleting miso, and consequently all files under Hero/ and Miso/, because I couldn't get miso to build with GHC 9.2. Other things: - Niv has been wrapped by Biz/Bild/Deps.hs, so I can extend it to my liking. - Apply-refact is gone because I couldn't get it to build. - Disabled python stuff. --- Hero/Service.nix | 88 -------------------------------------------------------- 1 file changed, 88 deletions(-) delete mode 100644 Hero/Service.nix (limited to 'Hero/Service.nix') diff --git a/Hero/Service.nix b/Hero/Service.nix deleted file mode 100644 index 906d98e..0000000 --- a/Hero/Service.nix +++ /dev/null @@ -1,88 +0,0 @@ -{ options -, lib -, config -, pkgs -, ... -}: - -let - cfg = config.services.herocomics; -in -{ - options.services.herocomics = { - enable = lib.mkEnableOption "Enable the herocomics service"; - port = lib.mkOption { - type = lib.types.int; - default = 3000; - description = '' - The port on which herocomics-server will listen for incoming HTTP traffic. - ''; - }; - keep = lib.mkOption { - type = lib.types.path; - default = "/var/lib/hero"; - description = "herocomics-server database directory"; - }; - host = lib.mkOption { - type = lib.types.package; - description = "herocomics-server package to use"; - }; - node = lib.mkOption { - type = lib.types.package; - description = "herocomics-client package to use"; - }; - skey = lib.mkOption { - type = lib.types.path; - default = "/run/hero/skey"; - description = "where to store the signing key"; - }; - domain = lib.mkOption { - type = lib.types.str; - default = "herocomics.app"; - description = '' - Domain on which to bind herocomics-server. This is passed - to services.nginx.virtualHosts. directly. - ''; - }; - }; - config = lib.mkIf cfg.enable { - systemd.services.herocomics = { - path = [ cfg.host ]; - wantedBy = [ "multi-user.target" ]; - script = '' - ${cfg.host}/bin/mmc - ''; - description = '' - Hero Comics app server - ''; - serviceConfig = { - KillSignal = "INT"; - Environment = [ - "HERO_NODE=${cfg.node}/static" - "HERO_PORT=${toString cfg.port}" - "HERO_KEEP=${cfg.keep}" - "HERO_SKEY=/run/hero/skey" - ]; - Type = "simple"; - Restart = "on-abort"; - RestartSec = "1"; - }; - }; - services.nginx = { - enable = cfg.enable; - recommendedGzipSettings = true; - recommendedOptimisation = true; - recommendedProxySettings = true; - recommendedTlsSettings = true; - virtualHosts = { - "${cfg.domain}" = { - forceSSL = true; - enableACME = true; - locations."/" = { - proxyPass = "http://localhost:${toString cfg.port}"; - }; - }; - }; - }; - }; -} -- cgit v1.2.3