Skip to content

Compatibility of yesod-static with crypton-1.1. #1916

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
leftaroundabout wants to merge 5 commits into
base: master
Choose a base branch
from
+10 −2
Open

Compatibility of yesod-static with crypton-1.1. #1916

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
28bc87f
Compatibility with crypton-1.1.
leftaroundabout Apr 20, 2026
58c9fb7
Relax `ram` dependency.
leftaroundabout Jun 22, 2026
b39b28a
Minor version bump.
leftaroundabout Jun 24, 2026
a92ab5c
Add `ram` to the Stack extra-deps.
leftaroundabout Jun 25, 2026
23f8d63
Ensure the `ram` package is also in scope when compiling the test suite.
leftaroundabout Jun 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions stack-lts-22.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ extra-deps:
- attoparsec-aeson-2.1.0.0
- crypton-1.0.0
- crypton-conduit-0.2.3
- ram-0.22.0
- encoding-0.10.2
# th-compat entered Stackage after lts-18; needed for the CI legs that
# reuse this file with --resolver lts-16 / lts-18
Expand Down
7 changes: 6 additions & 1 deletion yesod-static/Yesod/Static.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
{-# LANGUAGE RecordWildCards #-}
{-# LANGUAGE TemplateHaskell #-}
{-# LANGUAGE TypeFamilies #-}
{-# LANGUAGE PackageImports #-}
---------------------------------------------------------
--
-- | Serve static files from a Yesod app.
Expand Down Expand Up @@ -79,7 +80,11 @@ import Crypto.Hash.Conduit (hashFile, sinkHash)
import Crypto.Hash (MD5, Digest)
import Control.Monad.Trans.State

import qualified Data.ByteArray as ByteArray
#if MIN_VERSION_crypton(1,1,0)
import qualified "ram" Data.ByteArray as ByteArray
#else
import qualified "memory" Data.ByteArray as ByteArray
#endif
import qualified Data.ByteString.Base64
import qualified Data.ByteString.Char8 as S8
import qualified Data.ByteString.Lazy as L
Expand Down
4 changes: 3 additions & 1 deletion yesod-static/yesod-static.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: yesod-static
version: 1.6.1.3
version: 1.6.1.4
license: MIT
license-file: LICENSE
author: Michael Snoyman <michael@snoyman.com>
Expand Down Expand Up @@ -46,6 +46,7 @@ library
, hjsmin
, http-types >= 0.7
, memory
, ram >= 0.21 && < 0.23
, mime-types >= 0.1
, process
, template-haskell
Expand Down Expand Up @@ -107,6 +108,7 @@ test-suite tests
, hjsmin
, http-types
, memory
, ram
, mime-types
, process
, template-haskell
Expand Down