diff --git a/.envrc b/.envrc index ce34212a..b83dc681 100644 --- a/.envrc +++ b/.envrc @@ -1,3 +1,4 @@ +## wtf if [ -f .envrc.local ]; then source_env .envrc.local fi diff --git a/cabal.project b/cabal.project index 2ef29ffb..e23d8cda 100644 --- a/cabal.project +++ b/cabal.project @@ -3,7 +3,7 @@ packages: **/*.cabal allow-newer: all -constraints: pandoc ==3.1.11, scotty >= 0.22 +constraints: pandoc ==3.1.11 -- executable-static: True -- profiling: True diff --git a/flake.nix b/flake.nix index 476aafc9..97941fef 100644 --- a/flake.nix +++ b/flake.nix @@ -71,6 +71,7 @@ outputs = { self, nixpkgs, haskell-flake-utils, ... }@inputs: hpPreOverrides = {pkgs, ...}: final: prev: with pkgs; { saltine = prev.callCabal2nix "saltine" inputs.saltine { inherit (pkgs) libsodium; }; + scotty = final.callHackage "scotty" "0.21" { }; }; packagePostOverrides = { pkgs }: with pkgs; with haskell.lib; [ diff --git a/hbs2-git/hbs2-git.cabal b/hbs2-git/hbs2-git.cabal index 5d1c5f5b..968667b5 100644 --- a/hbs2-git/hbs2-git.cabal +++ b/hbs2-git/hbs2-git.cabal @@ -176,7 +176,7 @@ executable hbs2-git-dashboard , skylighting , skylighting-core , skylighting-lucid - , scotty + , scotty >= 0.21 hs-source-dirs: hbs2-git-dashboard