Skip to content

Commit 89eff41

Browse files
authored
Merge branch 'master' into revert/sequential-tests
2 parents 160a0aa + e49d566 commit 89eff41

File tree

4 files changed

+16
-4
lines changed

4 files changed

+16
-4
lines changed

cabal.project

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ packages:
88
./hls-test-utils
99

1010

11-
index-state: 2025-05-12T13:26:29Z
11+
index-state: 2025-06-07T14:57:40Z
1212

1313
tests: True
1414
test-show-details: direct

haskell-language-server.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -806,7 +806,7 @@ library hls-stan-plugin
806806
, lsp-types
807807
, text
808808
, unordered-containers
809-
, stan >= 0.1.2.0
809+
, stan >= 0.2.1.0
810810
, trial
811811
, directory
812812

stack-lts22.yaml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ ghc-options:
1515
allow-newer: true
1616
allow-newer-deps:
1717
- extensions
18+
# stan dependencies
19+
- directory-ospath-streaming
1820

1921
extra-deps:
2022
- Diff-0.5
@@ -29,7 +31,7 @@ extra-deps:
2931
- retrie-1.2.3
3032

3133
# stan and friends
32-
- stan-0.1.3.0
34+
- stan-0.2.1.0
3335
- dir-traverse-0.2.3.0
3436
- extensions-0.1.0.1
3537
- tomland-1.3.3.2
@@ -39,6 +41,7 @@ extra-deps:
3941
- validation-selective-0.2.0.0
4042
- cabal-add-0.1
4143
- cabal-install-parsers-0.6.1.1
44+
- directory-ospath-streaming-0.2.2
4245

4346

4447
configure-options:
@@ -56,6 +59,9 @@ flags:
5659
BuildExecutable: false
5760
cabal-add:
5861
cabal-syntax: true
62+
# stan dependencies
63+
directory-ospath-streaming:
64+
os-string: false
5965

6066
nix:
6167
packages: [icu libcxx zlib]

stack.yaml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ allow-newer-deps:
1717
- extensions
1818
- hw-fingertree
1919
- retrie
20+
# stan dependencies
21+
- directory-ospath-streaming
2022

2123
extra-deps:
2224
- floskell-0.11.1
@@ -28,12 +30,13 @@ extra-deps:
2830
- retrie-1.2.3
2931

3032
# stan dependencies not found in the stackage snapshot
31-
- stan-0.1.3.0
33+
- stan-0.2.1.0
3234
- dir-traverse-0.2.3.0
3335
- extensions-0.1.0.1
3436
- trial-0.0.0.0
3537
- trial-optparse-applicative-0.0.0.0
3638
- trial-tomland-0.0.0.0
39+
- directory-ospath-streaming-0.2.2
3740

3841
configure-options:
3942
ghcide:
@@ -50,6 +53,9 @@ flags:
5053
BuildExecutable: false
5154
cabal-add:
5255
cabal-syntax: true
56+
# stan dependencies
57+
directory-ospath-streaming:
58+
os-string: false
5359

5460
nix:
5561
packages: [icu libcxx zlib]

0 commit comments

Comments
 (0)