evlli/website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Disable ormolu for hakyll DSL-y code; only bring in a stylesheet if we have one

Browse source
This commit is contained in:
Robert Pearce 2020-11-02 12:28:23 -05:00
parent 9244c2e20f
commit 8cec937b86
No known key found for this signature in database
GPG key ID: 07A0E482E5616C9B
9 changed files with 70 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

15
generator/hpkgs.nix
View file

@ -1,7 +1,6 @@
{ compiler ? "ghc884"
, pkgs
}:
let
inherit (pkgs.lib.trivial) flip pipe;
inherit (pkgs.haskell.lib) appendPatch appendConfigureFlags dontCheck;
@ -18,13 +17,15 @@ let
(flip appendConfigureFlags hakyllFlags)
];
my-site = hpNew.callCabal2nix "my-site" ./. {};
hakyll-nix-template = hpNew.callCabal2nix "hakyll-nix-template" ./. { };
# because hakyll is marked as broken in nixpkgs
hslua = dontCheck (hpNew.callHackage "hslua" "1.0.3.2" {});
jira-wiki-markup = dontCheck (hpNew.callHackage "jira-wiki-markup" "1.1.4" {});
pandoc = dontCheck (hpNew.callHackage "pandoc" "2.9.2.1" {});
pandoc-types = dontCheck (hpNew.callHackage "pandoc-types" "1.20" {});
# when hakyll is marked as broken in nixpkgs
# because of version issues, fix them here:
hslua = dontCheck (hpNew.callHackage "hslua" "1.0.3.2" { });
jira-wiki-markup = dontCheck (hpNew.callHackage "jira-wiki-markup" "1.1.4" { });
pandoc = dontCheck (hpNew.callHackage "pandoc" "2.9.2.1" { });
pandoc-types = dontCheck (hpNew.callHackage "pandoc-types" "1.20" { });
};
};
in