fix build by updating cabal file and getting some nix things in line

This commit is contained in:
Robert W. Pearce 2024-01-30 10:52:21 -05:00
parent 19055142e1
commit 0d782ceb7e
No known key found for this signature in database
GPG key ID: 8EE70FB52D805C55
2 changed files with 22 additions and 9 deletions

View file

@ -24,6 +24,7 @@
hakyllProject = final.haskell-nix.project' {
src = ./ssg;
compiler-nix-name = "ghc948";
modules = [{ doHaddock = false; }];
shell.buildInputs = [
hakyll-site
];
@ -43,7 +44,9 @@
flake = pkgs.hakyllProject.flake {};
hakyll-site = flake.packages."ssg:exe:hakyll-site";
executable = "ssg:exe:hakyll-site";
hakyll-site = flake.packages.${executable};
website = pkgs.stdenv.mkDerivation {
name = "website";
@ -64,7 +67,7 @@
"${pkgs.glibcLocales}/lib/locale/locale-archive";
buildPhase = ''
${hakyll-site}/bin/hakyll-site build --verbose
${flake.packages.${executable}}/bin/hakyll-site build --verbose
'';
installPhase = ''

View file

@ -1,4 +1,4 @@
cabal-version: 2.4
cabal-version: 3.6
name: ssg
version: 0.1.0.0
@ -7,13 +7,23 @@ license: BSD-3-Clause
license-file: LICENSE
executable hakyll-site
default-language: Haskell2010
main-is: Main.hs
hs-source-dirs: src
build-depends: base >= 4.8
, hakyll >= 4.14
build-depends: base == 4.*
, hakyll == 4.15.*
, filepath >= 1.0
, pandoc >= 2.11
, slugger >= 0.1.0.1
, text >= 1.2 && < 1.3
ghc-options: -Wall -threaded
default-language: Haskell2010
, slugger >= 0.1.0.2
, text >= 1 && < 3
ghc-options: -Wall
-Wcompat
-Widentities
-Wincomplete-record-updates
-Wincomplete-uni-patterns
-Wpartial-fields
-Wredundant-constraints
-O2
-threaded
-rtsopts
-with-rtsopts=-N