mirror of
https://github.com/unisonweb/unison.git
synced 2024-09-20 06:47:15 +03:00
Mostly Upgrade LTS to ghc 9.6.5
This commit is contained in:
Chris Penner
parent
e28c4f3d43
commit
2d1bf19a65
@ -8,7 +8,7 @@
|
||||
|
||||
module U.Util.Serialization where
|
||||
|
||||
import Control.Applicative (Applicative (liftA2), liftA3)
|
||||
import Control.Applicative (liftA3)
|
||||
import Control.Monad (foldM, replicateM, replicateM_, when)
|
||||
import Data.Bits (Bits, clearBit, setBit, shiftL, shiftR, testBit, (.|.))
|
||||
import Data.ByteString (ByteString, readFile, writeFile)
|
||||
|
||||
@ -172,7 +172,7 @@ execute conn@(Connection _ _ conn0) sql@(Sql s params) = do
|
||||
--
|
||||
-- This function does not support parameters, and is mostly useful for executing DDL and migrations.
|
||||
executeStatements :: Connection -> Text -> IO ()
|
||||
executeStatements conn@(Connection _ _ (Sqlite.Connection database)) sql = do
|
||||
executeStatements conn@(Connection _ _ (Sqlite.Connection database _tempNameCounter)) sql = do
|
||||
logQuery (Sql sql []) Nothing
|
||||
Direct.Sqlite.exec database sql `catch` \(exception :: Sqlite.SQLError) ->
|
||||
throwSqliteQueryException
|
||||
@ -184,7 +184,7 @@ executeStatements conn@(Connection _ _ (Sqlite.Connection database)) sql = do
|
||||
|
||||
-- With results, without checks
|
||||
|
||||
queryStreamRow :: Sqlite.FromRow a => Connection -> Sql -> (IO (Maybe a) -> IO r) -> IO r
|
||||
queryStreamRow :: (Sqlite.FromRow a) => Connection -> Sql -> (IO (Maybe a) -> IO r) -> IO r
|
||||
queryStreamRow conn@(Connection _ _ conn0) sql@(Sql s params) callback =
|
||||
run `catch` \(exception :: Sqlite.SQLError) ->
|
||||
throwSqliteQueryException
|
||||
|
||||
@ -20,7 +20,6 @@ when:
|
||||
|
||||
dependencies:
|
||||
- ListLike
|
||||
- NanoID
|
||||
- aeson
|
||||
- ansi-terminal
|
||||
- asn1-encoding
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
cabal-version: 1.12
|
||||
|
||||
-- This file has been generated from package.yaml by hpack version 0.35.2.
|
||||
-- This file has been generated from package.yaml by hpack version 0.36.0.
|
||||
--
|
||||
-- see: https://github.com/sol/hpack
|
||||
|
||||
@ -224,7 +224,6 @@ library
|
||||
build-depends:
|
||||
IntervalMap
|
||||
, ListLike
|
||||
, NanoID
|
||||
, aeson
|
||||
, ansi-terminal
|
||||
, asn1-encoding
|
||||
@ -420,7 +419,6 @@ test-suite parser-typechecker-tests
|
||||
build-depends:
|
||||
IntervalMap
|
||||
, ListLike
|
||||
, NanoID
|
||||
, aeson
|
||||
, ansi-terminal
|
||||
, asn1-encoding
|
||||
|
||||
12
stack.yaml
12
stack.yaml
@ -44,7 +44,7 @@ packages:
|
||||
- unison-syntax
|
||||
- yaks/easytest
|
||||
|
||||
resolver: lts-20.26
|
||||
resolver: lts-22.26
|
||||
|
||||
extra-deps:
|
||||
# broken version in snapshot
|
||||
@ -57,16 +57,18 @@ extra-deps:
|
||||
- github: unisonweb/haskeline
|
||||
commit: 9275eea7982dabbf47be2ba078ced669ae7ef3d5
|
||||
|
||||
- github: runarorama/fuzzyfind
|
||||
commit: 213b71742839bdb26300463878c1856f76ce8855
|
||||
|
||||
# not in stackage
|
||||
- fuzzyfind-3.0.1
|
||||
- guid-0.1.0@sha256:a7c975be473f6f142d5cc1b39bc807a99043d20b1bb0873fdfe7a3ce84d2faf1,1078
|
||||
- lock-file-0.7.0.0@sha256:3ad84b5e454145e1d928063b56abb96db24a99a21b493989520e58fa0ab37b00,4484
|
||||
- monad-validate-1.2.0.0@sha256:9850f408431098b28806dd464b6825a88a0b56c84f380d7fe0454c1df9d6f881,3505
|
||||
- recover-rtti-0.4.2@sha256:c179a303921126d8d782264e14f386c96e54a270df74be002e4c4ec3c8c7aebd,4529
|
||||
- monad-validate-1.3.0.0@sha256:eb6ddd5c9cf72ff0563cba604fa00291376e96138fdb4932d00ff3a99d66706e,2605
|
||||
- recover-rtti-0.4.3@sha256:01adcbab70a6542914df28ac120a23a923d8566236f2c0295998e9419f53dd62,4672
|
||||
- lsp-2.2.0.0@sha256:82fbf4b69d94d8d22543be71f89986b3e90050032d671fb3de3f8253ea1e5b6f,3550
|
||||
- lsp-types-2.0.2.0@sha256:a9a51c3cea0726d91fe63fa0670935ee720f7b31bc3f3b33b2483fc538152677,29421
|
||||
- row-types-1.0.1.2@sha256:4d4c7cb95d06a32b28ba977852d52a26b4c1f695ef083a6fd874ab6d79933b64,3071
|
||||
- network-udp-0.0.0
|
||||
- network-udp-0.0.0@sha256:408d2d4fa1a25e49e95752ee124cca641993404bb133ae10fb81daef22d876ae,1075
|
||||
|
||||
ghc-options:
|
||||
# All packages
|
||||
|
||||
@ -27,12 +27,23 @@ packages:
|
||||
original:
|
||||
url: https://github.com/unisonweb/haskeline/archive/9275eea7982dabbf47be2ba078ced669ae7ef3d5.tar.gz
|
||||
- completed:
|
||||
hackage: fuzzyfind-3.0.1@sha256:78f89c1d79adf0a15fa2e57c693d42b4765ccfbbe380d0c9d7da6bff9f124f85,1823
|
||||
name: fuzzyfind
|
||||
pantry-tree:
|
||||
sha256: 46f001ec2725d3172161c993bc8fbcf0514e3ba736f868fe2c2655e1ff49dad1
|
||||
size: 542
|
||||
sha256: 38cdef9414d5700e7c735cfa20c6a5c4c347aff64213111c56abc76a80792d97
|
||||
size: 602
|
||||
sha256: 87c684a8f4bab514ecc5c989517a484f40003327a138ff449bb87ec2779696d6
|
||||
size: 388383
|
||||
url: https://github.com/runarorama/fuzzyfind/archive/213b71742839bdb26300463878c1856f76ce8855.tar.gz
|
||||
version: 3.0.1
|
||||
original:
|
||||
hackage: fuzzyfind-3.0.1
|
||||
url: https://github.com/runarorama/fuzzyfind/archive/213b71742839bdb26300463878c1856f76ce8855.tar.gz
|
||||
- completed:
|
||||
hackage: jose-0.9@sha256:0a312116d10cbddc915b77dbf82958307702e8716f3366bf7d166776498857e2,3251
|
||||
pantry-tree:
|
||||
sha256: b787b8fa8a0ffe381a55a8b66f088d80ed7be0bc5acaf2c54cee78c4ab5fee1b
|
||||
size: 2105
|
||||
original:
|
||||
hackage: jose-0.9
|
||||
- completed:
|
||||
hackage: guid-0.1.0@sha256:a7c975be473f6f142d5cc1b39bc807a99043d20b1bb0873fdfe7a3ce84d2faf1,1078
|
||||
pantry-tree:
|
||||
@ -48,19 +59,19 @@ packages:
|
||||
original:
|
||||
hackage: lock-file-0.7.0.0@sha256:3ad84b5e454145e1d928063b56abb96db24a99a21b493989520e58fa0ab37b00,4484
|
||||
- completed:
|
||||
hackage: monad-validate-1.2.0.0@sha256:9850f408431098b28806dd464b6825a88a0b56c84f380d7fe0454c1df9d6f881,3505
|
||||
hackage: monad-validate-1.3.0.0@sha256:eb6ddd5c9cf72ff0563cba604fa00291376e96138fdb4932d00ff3a99d66706e,2605
|
||||
pantry-tree:
|
||||
sha256: 8e049bd12ce2bd470909578f2ee8eb80b89d5ff88860afa30e29dd4eafecfa3e
|
||||
size: 713
|
||||
sha256: 0b2a3a57be48fcc739708b214fca202f1e95b1cd773dd3bb9589d3007cf8cf5e
|
||||
size: 611
|
||||
original:
|
||||
hackage: monad-validate-1.2.0.0@sha256:9850f408431098b28806dd464b6825a88a0b56c84f380d7fe0454c1df9d6f881,3505
|
||||
hackage: monad-validate-1.3.0.0@sha256:eb6ddd5c9cf72ff0563cba604fa00291376e96138fdb4932d00ff3a99d66706e,2605
|
||||
- completed:
|
||||
hackage: recover-rtti-0.4.2@sha256:c179a303921126d8d782264e14f386c96e54a270df74be002e4c4ec3c8c7aebd,4529
|
||||
hackage: recover-rtti-0.4.3@sha256:01adcbab70a6542914df28ac120a23a923d8566236f2c0295998e9419f53dd62,4672
|
||||
pantry-tree:
|
||||
sha256: ad6f24481ebd25a1456d5dfaf08d48d95394ce83eb82a267e01d87d34f13bb83
|
||||
size: 2488
|
||||
sha256: 59a5df9c88f83816a9826b1e9708153d06d64bd1aed6c1d71ef0a1f6db070599
|
||||
size: 2489
|
||||
original:
|
||||
hackage: recover-rtti-0.4.2@sha256:c179a303921126d8d782264e14f386c96e54a270df74be002e4c4ec3c8c7aebd,4529
|
||||
hackage: recover-rtti-0.4.3@sha256:01adcbab70a6542914df28ac120a23a923d8566236f2c0295998e9419f53dd62,4672
|
||||
- completed:
|
||||
hackage: lsp-2.2.0.0@sha256:82fbf4b69d94d8d22543be71f89986b3e90050032d671fb3de3f8253ea1e5b6f,3550
|
||||
pantry-tree:
|
||||
@ -88,10 +99,10 @@ packages:
|
||||
sha256: ee19a66c9d420861c5cc1dfad3210e2a53cdc6088ff3dd90b44f7961f5caebee
|
||||
size: 284
|
||||
original:
|
||||
hackage: network-udp-0.0.0
|
||||
hackage: network-udp-0.0.0@sha256:408d2d4fa1a25e49e95752ee124cca641993404bb133ae10fb81daef22d876ae,1075
|
||||
snapshots:
|
||||
- completed:
|
||||
sha256: 5a59b2a405b3aba3c00188453be172b85893cab8ebc352b1ef58b0eae5d248a2
|
||||
size: 650475
|
||||
url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/20/26.yaml
|
||||
original: lts-20.26
|
||||
sha256: 8e7996960d864443a66eb4105338bbdd6830377b9f6f99cd5527ef73c10c01e7
|
||||
size: 719128
|
||||
url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/22/26.yaml
|
||||
original: lts-22.26
|
||||
|
||||
@ -9,7 +9,6 @@ library:
|
||||
other-modules: Paths_unison_share_api
|
||||
|
||||
dependencies:
|
||||
- NanoID
|
||||
- aeson >= 2.0.0.0
|
||||
- async
|
||||
- base
|
||||
|
||||
@ -16,7 +16,6 @@ import Data.ByteString.Char8 (unpack)
|
||||
import Data.ByteString.Char8 qualified as C8
|
||||
import Data.ByteString.Lazy qualified as Lazy
|
||||
import Data.ByteString.Lazy.UTF8 qualified as BLU
|
||||
import Data.NanoID (customNanoID, defaultAlphabet, unNanoID)
|
||||
import Data.OpenApi (Info (..), License (..), OpenApi, URL (..))
|
||||
import Data.OpenApi.Lens qualified as OpenApi
|
||||
import Data.Proxy (Proxy (..))
|
||||
@ -409,9 +408,7 @@ app env rt codebase uiPath expectedToken allowCorsHost =
|
||||
-- each others codebases.
|
||||
genToken :: IO Strict.ByteString
|
||||
genToken = do
|
||||
g <- createSystemRandom
|
||||
n <- customNanoID defaultAlphabet 16 g
|
||||
pure $ unNanoID n
|
||||
BSC.pack . UUID.toString <$> UUID.nextRandom
|
||||
|
||||
data Waiter a = Waiter
|
||||
{ notify :: a -> IO (),
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
cabal-version: 1.12
|
||||
|
||||
-- This file has been generated from package.yaml by hpack version 0.35.2.
|
||||
-- This file has been generated from package.yaml by hpack version 0.36.0.
|
||||
--
|
||||
-- see: https://github.com/sol/hpack
|
||||
|
||||
@ -84,7 +84,6 @@ library
|
||||
ghc-options: -Wall
|
||||
build-depends:
|
||||
Diff
|
||||
, NanoID
|
||||
, aeson >=2.0.0.0
|
||||
, async
|
||||
, base
|
||||
|
||||
Loading…
Reference in New Issue
Block a user