nix: update types

This commit is contained in:
Dhananjay Balan
2026-05-21 19:20:23 +02:00
parent e8192495da
commit a012a85134
3 changed files with 47 additions and 28 deletions

12
flake.lock generated
View File

@@ -5,11 +5,11 @@
"systems": "systems"
},
"locked": {
"lastModified": 1694529238,
"narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
"lastModified": 1731533236,
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github"
},
"original": {
@@ -20,11 +20,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1699562885,
"narHash": "sha256-fb7RDv0ePGzayhGvkBh9NrilU3pCecgfbbTNPHprRfg=",
"lastModified": 1779382422,
"narHash": "sha256-2IqhPb96JuOjxnZezkw+JZzXFpDnTlDqYk7D1nFOYKI=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "97b0ae26f7c8a1682b5437a64edcd73ab1798c9b",
"rev": "116d154ab4ec792dd6dfc1f5f5ff107fbed2eb65",
"type": "github"
},
"original": {

View File

@@ -10,20 +10,31 @@
flake-utils.url = "github:numtide/flake-utils";
};
outputs = { self, nixpkgs, flake-utils }:
flake-utils.lib.eachDefaultSystem (system:
outputs =
{
self,
nixpkgs,
flake-utils,
}:
flake-utils.lib.eachDefaultSystem (
system:
let
pkgs = nixpkgs.legacyPackages.${system};
haskellPackages = pkgs.haskellPackages;
jailbreakUnbreak = pkg:
pkgs.haskell.lib.doJailbreak (pkg.overrideAttrs (_: { meta = { }; }));
jailbreakUnbreak =
pkg:
pkgs.haskell.lib.doJailbreak (
pkg.overrideAttrs (_: {
meta = { };
})
);
# DON'T FORGET TO PUT YOUR PACKAGE NAME HERE, REMOVING `throw`
packageName = "quotes-api";
in {
packages.${packageName} = haskellPackages.callCabal2nix packageName self
rec {
in
{
packages.${packageName} = haskellPackages.callCabal2nix packageName self rec {
# Dependency overrides go here
};
@@ -31,11 +42,19 @@
defaultPackage = self.packages.${system}.default;
nixosModules = {
quotes-api = { config, lib, pkgs, ... }:
quotes-api =
{
config,
lib,
pkgs,
...
}:
with lib;
let cfg = config.services.quotes-api;
in {
let
cfg = config.services.quotes-api;
in
{
options.services.quotes-api = {
enable = mkEnableOption "Enables quotes api service";
@@ -47,7 +66,7 @@
};
dbpath = mkOption rec {
type = types.string;
type = types.str;
default = "/tmp/sqlite.db";
example = default;
description = "Path to sqlite database";
@@ -59,12 +78,12 @@
wantedBy = [ "multi-user.target" ];
serviceConfig =
let pkg = self.packages.${pkgs.system}.default;
in {
let
pkg = self.packages.${pkgs.system}.default;
in
{
Restart = "on-failure";
ExecStart = "${pkg}/bin/quotes-api --port ${
builtins.toString cfg.port
} --dbpath ${cfg.dbpath}";
ExecStart = "${pkg}/bin/quotes-api --port ${builtins.toString cfg.port} --dbpath ${cfg.dbpath}";
};
};
@@ -83,9 +102,9 @@
ghc
cabal-install
];
inputsFrom =
map (__getAttr "env") (__attrValues self.packages.${system});
inputsFrom = map (__getAttr "env") (__attrValues self.packages.${system});
};
devShell = self.devShells.${system}.default;
});
}
);
}

View File

@@ -17,7 +17,7 @@ import Data.Maybe (fromMaybe)
import Api.Types (Quote(..))
showT :: Show a => a -> Text
showT = pack . show
showT = pack . Prelude.show
newtype KoPage = KoPage Text
deriving (Eq, Generic)