reciproka/reciproka-web
1
0
Fork 0
Code Issues 5 Pull requests Packages Projects Releases Wiki Activity

hakyll: updated to v4.15

Browse source
This commit is contained in:
Fiscal Velvet Poet 2022-06-29 16:54:36 +10:00
parent 4b3f1fcd82
commit 2cbdc61ddf
Signed by: fiscalvelvetpoet
GPG key ID: D8EBFD58B023BD47
2 changed files with 13 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
jfdic-web.cabal
View file

@ -6,7 +6,7 @@ cabal-version: >= 1.10
executable site executable site
main-is: site.hs main-is: site.hs
build-depends: base == 4.* build-depends: base == 4.*
, hakyll == 4.14.* , hakyll == 4.15.*
, containers == 0.6.* , containers == 0.6.*
, filepath == 1.4.* , filepath == 1.4.*
, pandoc , pandoc

32
release.nix
View file

@ -1,9 +1,5 @@
let let sources = import ./nix/sources.nix;
sources = import ./nix/sources.nix; in { compiler ? "ghc8107", pkgs ? import sources.nixpkgs { } }:
in
{ compiler ? "ghc8104"
, pkgs ? import sources.nixpkgs { }
}:
let let
inherit (pkgs.lib.trivial) flip pipe; inherit (pkgs.lib.trivial) flip pipe;
@ -11,12 +7,10 @@ let
haskellPackages = pkgs.haskell.packages.${compiler}.override { haskellPackages = pkgs.haskell.packages.${compiler}.override {
overrides = hpNew: hpOld: { overrides = hpNew: hpOld: {
hakyll = hakyll = pipe hpOld.hakyll [
pipe (flip appendPatch ./hakyll.patch)
hpOld.hakyll (flip appendConfigureFlags [ "-f" "watchServer" "-f" "previewServer" ])
[ (flip appendPatch ./hakyll.patch) ];
(flip appendConfigureFlags [ "-f" "watchServer" "-f" "previewServer" ])
];
jfdic-web = hpNew.callCabal2nix "jfdic-web" ./. { }; jfdic-web = hpNew.callCabal2nix "jfdic-web" ./. { };
@ -25,18 +19,16 @@ let
}; };
project = haskellPackages.jfdic-web; project = haskellPackages.jfdic-web;
in in {
{
project = project; project = project;
shell = haskellPackages.shellFor { shell = haskellPackages.shellFor {
packages = p: with p; [ packages = p: with p; [ project ];
project
];
buildInputs = with haskellPackages; [ buildInputs = with haskellPackages; [
ghcid # GHCi based IDE ghcid # GHCi based IDE
hlint # or ormolu hlint # or ormolu
pkgs.niv # Nix dependency management pkgs.niv
zlib
]; ];
withHoogle = true; withHoogle = true;
}; };