From 0186a14db32210133e573b06ec8eb6252e6026e4 Mon Sep 17 00:00:00 2001 From: Dimitri Lozeve Date: Mon, 15 Aug 2022 16:24:04 +0200 Subject: [PATCH] Transition to Cabal To build the site executable: cabal build To run it and build the site: cabal run site build Idem for `site watch`, `site clean`, etc. --- .gitignore | 1 + newblog.cabal | 4 +-- stack.yaml | 67 ------------------------------------------------- stack.yaml.lock | 23 ----------------- 4 files changed, 3 insertions(+), 92 deletions(-) delete mode 100644 stack.yaml delete mode 100644 stack.yaml.lock diff --git a/.gitignore b/.gitignore index 1662d52..c9be2d3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ *~ +dist-newstyle/ .stack-work/ _cache/ bib/auto/ diff --git a/newblog.cabal b/newblog.cabal index 1375a46..455ad1a 100644 --- a/newblog.cabal +++ b/newblog.cabal @@ -1,7 +1,7 @@ +cabal-version: 2.4 name: newblog version: 0.1.0.0 -build-type: Simple -cabal-version: >= 1.10 +author: Dimitri Lozeve executable site main-is: site.hs diff --git a/stack.yaml b/stack.yaml deleted file mode 100644 index f0ffcbe..0000000 --- a/stack.yaml +++ /dev/null @@ -1,67 +0,0 @@ -# This file was automatically generated by 'stack init' -# -# Some commonly used options have been documented as comments in this file. -# For advanced use and comprehensive documentation of the format, please see: -# https://docs.haskellstack.org/en/stable/yaml_configuration/ - -# Resolver to choose a 'specific' stackage snapshot or a compiler version. -# A snapshot resolver dictates the compiler version and the set of packages -# to be used for project dependencies. For example: -# -# resolver: lts-3.5 -# resolver: nightly-2015-09-21 -# resolver: ghc-7.10.2 -# -# The location of a snapshot can be provided as a file or url. Stack assumes -# a snapshot provided as a file might change, whereas a url resource does not. -# -# resolver: ./custom-snapshot.yaml -# resolver: https://example.com/snapshots/2018-01-01.yaml -resolver: lts-19.0 - -# User packages to be built. -# Various formats can be used as shown in the example below. -# -# packages: -# - some-directory -# - https://example.com/foo/bar/baz-0.0.2.tar.gz -# - location: -# git: https://github.com/commercialhaskell/stack.git -# commit: e7b331f14bcffb8367cd58fbfc8b40ec7642100a -# - location: https://github.com/commercialhaskell/stack/commit/e7b331f14bcffb8367cd58fbfc8b40ec7642100a -# subdirs: -# - auto-update -# - wai -packages: -- . -# Dependency packages to be pulled from upstream that are not in the resolver -# using the same syntax as the packages field. -# (e.g., acme-missiles-0.3) -extra-deps: - - git: https://github.com/jez/pandoc-sidenote.git - commit: c9dfcadfcff475e6e26626af379b8b6d3f38d187 -# - monad-gen-0.3.0.1@sha256:a2569465cfbd468d3350ef25de56b3362580e77537224313aab1210f40804a3b,821 - -# Override default flag values for local packages and extra-deps -# flags: {} - -# Extra package databases containing global packages -# extra-package-dbs: [] - -# Control whether we use the GHC we find on the path -# system-ghc: true -# -# Require a specific version of stack, using version ranges -# require-stack-version: -any # Default -# require-stack-version: ">=1.9" -# -# Override the architecture used by stack, especially useful on Windows -# arch: i386 -# arch: x86_64 -# -# Extra directories used by stack for building -# extra-include-dirs: [/path/to/dir] -# extra-lib-dirs: [/path/to/dir] -# -# Allow a newer minor version of GHC than the snapshot specifies -# compiler-check: newer-minor diff --git a/stack.yaml.lock b/stack.yaml.lock deleted file mode 100644 index 9720aeb..0000000 --- a/stack.yaml.lock +++ /dev/null @@ -1,23 +0,0 @@ -# This file was autogenerated by Stack. -# You should not edit this file by hand. -# For more information, please see the documentation at: -# https://docs.haskellstack.org/en/stable/lock_files - -packages: -- completed: - name: pandoc-sidenote - version: 0.22.2.0 - git: https://github.com/jez/pandoc-sidenote.git - pantry-tree: - size: 575 - sha256: 45a4f6017904d000a25f0ddcd7a1b92c3ef9926dfb4b35630878908e10cf62fa - commit: c9dfcadfcff475e6e26626af379b8b6d3f38d187 - original: - git: https://github.com/jez/pandoc-sidenote.git - commit: c9dfcadfcff475e6e26626af379b8b6d3f38d187 -snapshots: -- completed: - size: 616897 - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/19/0.yaml - sha256: bbf2be02f17940bac1f87cb462d4fb0c3355de6dcfc53d84f4f9ad3ee2164f65 - original: lts-19.0