UUpdate flake

This commit is contained in:
maralorn 2023-03-19 10:11:40 +01:00
parent c81f8ec268
commit fd3edb61a8
2 changed files with 3 additions and 25 deletions

View File

@ -39,22 +39,6 @@
"type": "github"
}
},
"flake-compat_2": {
"flake": false,
"locked": {
"lastModified": 1627913399,
"narHash": "sha256-hY8g6H2KFL8ownSiFeMOjwPC8P0ueXpCVEbxgda3pko=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "12c64ca55c1014cdc1b16ed5a804aa8576601ff2",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-utils": {
"locked": {
"lastModified": 1618217525,
@ -200,7 +184,6 @@
"root": {
"inputs": {
"ema": "ema",
"flake-compat": "flake-compat_2",
"flake-utils": "flake-utils_3",
"nixpkgs": [
"ema",

View File

@ -10,10 +10,6 @@
url = "github:srid/windicss-nix";
flake = false;
};
flake-compat = {
url = "github:edolstra/flake-compat";
flake = false;
};
};
outputs = inputs@{ self, flake-utils, ... }:
flake-utils.lib.eachSystem [ "x86_64-linux" ] (
@ -30,9 +26,8 @@
in
rec
{
defaultPackage = packages.page;
defaultApp = apps.watch;
packages = {
default = packages.page;
generator = haskellPackages.callCabal2nix "maralorn-de" ./generator { };
pageWithoutResources = pkgs.runCommand "maralorn.de-without-resources"
{
@ -58,6 +53,7 @@
'';
};
apps = {
default = packages.watch;
watch = flake-utils.lib.mkApp {
drv = pkgs.writeShellScriptBin "watch" ''
mkdir -p content/static/font content/static/css
@ -72,12 +68,11 @@
src = ./.;
hooks = {
hlint.enable = true;
nixpkgs-fmt.enable = true;
fourmolu.enable = true;
};
};
};
devShell = haskellPackages.shellFor {
devShells.default = haskellPackages.shellFor {
packages = p: [ packages.generator ];
buildInputs = [ windicss pkgs.cabal-install ];
withHoogle = true;