Skip to content

Commit 3141992

Browse files
committed
Bump snapshot
1 parent 8ee9524 commit 3141992

File tree

75 files changed

+118
-183
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+118
-183
lines changed

cabal.config

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ constraints:
99
, aeson ==2.1.2.1
1010
, aeson-warning-parser ==0.1.1
1111
, annotated-wl-pprint ==0.7.0
12-
, ansi-terminal ==1.0
12+
, ansi-terminal ==1.0.2
1313
, ansi-terminal-types ==0.11.5
1414
, appar ==0.1.8
1515
, array ==0.5.5.0
@@ -84,15 +84,15 @@ constraints:
8484
, ghc-boot-th ==9.6.3
8585
, ghc-prim ==0.10.0
8686
, githash ==0.1.7.0
87-
, hackage-security ==0.6.2.3
87+
, hackage-security ==0.6.2.4
8888
, hashable ==1.4.3.0
8989
, hi-file-parser ==0.1.6.0
9090
, hinotify ==0.4.1
9191
, hourglass ==0.2.12
9292
, hpack ==0.36.0
9393
, hpc ==0.6.2.0
9494
, http-api-data ==0.5.1
95-
, http-client ==0.7.15
95+
, http-client ==0.7.16
9696
, http-client-tls ==0.3.6.3
9797
, http-conduit ==2.3.8.3
9898
, http-download ==0.2.1.0
@@ -161,7 +161,7 @@ constraints:
161161
, semigroupoids ==6.0.0.1
162162
, silently ==1.2.5.3
163163
, socks ==0.6.1
164-
, split ==0.2.4
164+
, split ==0.2.5
165165
, splitmix ==0.1.0.5
166166
, stack ==2.14.0
167167
, static-bytes ==0.1.0
@@ -194,12 +194,12 @@ constraints:
194194
, unix-time ==0.4.11
195195
, unliftio ==0.2.25.0
196196
, unliftio-core ==0.2.1.0
197-
, unordered-containers ==0.2.19.1
197+
, unordered-containers ==0.2.20
198198
, uuid-types ==1.0.5.1
199199
, vault ==0.3.1.5
200200
, vector ==0.13.1.0
201201
, vector-algorithms ==0.9.0.1
202-
, vector-stream ==0.1.0.0
202+
, vector-stream ==0.1.0.1
203203
, witherable ==0.4.2
204204
, yaml ==0.11.11.2
205205
, zip-archive ==0.4.3

cabal.project

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
-- specified by the snapshot specifed in Stack's project-level YAML
3434
-- configuration file (`stack.yaml`). The relevant version of GHC can be
3535
-- confirmed by reviewing the snapshot on Stackage. For example, at:
36-
-- https://www.stackage.org/lts-22.0/cabal.config.
36+
-- https://www.stackage.org/lts-22.6/cabal.config.
3737
--
3838
with-compiler: ghc-9.6.3
3939
import: cabal.config

doc/GUIDE.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ packages:
255255

256256
The value of the `resolver` key tells Stack *how* to build your package: which
257257
GHC version to use, versions of package dependencies, and so on. Our value here
258-
says to use [LTS Haskell 22.0](https://www.stackage.org/lts-22.0), which
258+
says to use [LTS Haskell 22.6](https://www.stackage.org/lts-22.6), which
259259
implies GHC 9.6.3 (which is why `stack build` installs that version of GHC if it
260260
is not already available to Stack). There are a number of values you can use for
261261
`resolver`, which we'll cover later.
@@ -503,7 +503,7 @@ also known as *snapshots*. We mentioned the LTS resolvers, and you can get quite
503503
a bit of information about it at
504504
[https://www.stackage.org/lts](https://www.stackage.org/lts), including:
505505

506-
* The appropriate resolver value (`resolver: lts-22.0`, as is currently the
506+
* The appropriate resolver value (`resolver: lts-22.6`, as is currently the
507507
latest LTS)
508508
* The GHC version used
509509
* A full list of all packages available in this snapshot
@@ -522,7 +522,7 @@ towards by default as well).
522522

523523
## Resolvers and changing your compiler version
524524

525-
Let's explore package sets a bit further. Instead of `lts-22.0`, let's change
525+
Let's explore package sets a bit further. Instead of `lts-22.6`, let's change
526526
our `stack.yaml` file to use the
527527
[latest nightly](https://www.stackage.org/nightly). Right now, this is currently
528528
2023-09-24 - please see the resolver from the link above to get the latest.
@@ -1340,7 +1340,7 @@ yields output like:
13401340

13411341
~~~text
13421342
Run from outside a project, using implicit global project config
1343-
Using latest snapshot resolver: lts-22.0
1343+
Using latest snapshot resolver: lts-22.6
13441344
Writing global (non-project-specific) config file to: /home/michael/.stack/global/stack.yaml
13451345
Note: You can change the snapshot via the resolver field there.
13461346
I installed the stm package via --package stm

doc/Stack_and_VS_Code.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ enabled). For further information about these options, see the `install-ghc`
7575

7676
For this workaround to work, each time that a resolver is used that references a
7777
different version of GHC, then GHCup must be used to install it (if GHCup has
78-
not already installed that version). For example, to use `resolver: lts-22.0`
78+
not already installed that version). For example, to use `resolver: lts-22.6`
7979
(GHC 9.6.3), the command `ghcup install ghc 9.6.3` must have been used to
8080
install GHC 9.6.3. That may be a minor inconvenience for some people, as one the
8181
primary benefits of Stack over other Haskell build tools has been that Stack

doc/custom_snapshot.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ available in snapshots to ensure reproducibility.
1717
snapshot specification.
1818

1919
~~~yaml
20-
resolver: lts-22.0 # Inherits GHC version and package set
20+
resolver: lts-22.6 # Inherits GHC version and package set
2121
compiler: ghc-9.6.2 # Overwrites GHC version in the resolver, optional
2222

2323
# Additional packages, follows extra-deps syntax
@@ -61,35 +61,35 @@ custom snapshot, due to Stack sharing snapshot packages whenever possible.
6161

6262
### Overriding the compiler
6363

64-
The following snapshot specification will be identical to `lts-22.0`, but
64+
The following snapshot specification will be identical to `lts-22.6`, but
6565
instead use `ghc-9.6.2` instead of `ghc-9.6.3`:
6666

6767
~~~yaml
68-
resolver: lts-22.0
68+
resolver: lts-22.6
6969
compiler: ghc-9.6.2
7070
~~~
7171

7272
### Dropping packages
7373

74-
The following snapshot specification will be identical to `lts-22.0`, but
74+
The following snapshot specification will be identical to `lts-22.6`, but
7575
without the `text` package in our snapshot. Removing this package will cause all
7676
the packages that depend on `text` to be unbuildable, but they will still be
7777
present in the snapshot.
7878

7979
~~~yaml
80-
resolver: lts-22.0
80+
resolver: lts-22.6
8181
drop-packages:
8282
- text
8383
~~~
8484

8585
### Hiding packages
8686

87-
The following snapshot specification will be identical to `lts-22.0`, but the
87+
The following snapshot specification will be identical to `lts-22.6`, but the
8888
`text` package will be hidden when registering. This will affect, for example,
8989
the import parser in the script command.
9090

9191
~~~yaml
92-
resolver: lts-22.0
92+
resolver: lts-22.6
9393
hidden:
9494
- text
9595
~~~
@@ -99,11 +99,11 @@ hidden:
9999
In order to specify GHC options for a package, you use the same syntax as the
100100
[ghc-options](yaml_configuration.md#ghc-options) key for build configuration.
101101

102-
The following snapshot specification will be identical to `lts-22.0`, but
102+
The following snapshot specification will be identical to `lts-22.6`, but
103103
provides `-O1` as a ghc-option for `text`:
104104

105105
~~~yaml
106-
resolver: lts-22.0
106+
resolver: lts-22.6
107107
packages:
108108
- text-2.0.2
109109
ghc-options:
@@ -122,11 +122,11 @@ packages in the `packages` list, rather than all packages in the snapshot.
122122

123123
In order to specify Cabal flags for a package, you use the same syntax as the
124124
[flags](yaml_configuration.md#flags) key for build configuration. The
125-
following snapshot specification will be identical to `lts-22.0`, but
125+
following snapshot specification will be identical to `lts-22.6`, but
126126
it enables the `developer` Cabal flag:
127127

128128
~~~yaml
129-
resolver: lts-22.0
129+
resolver: lts-22.6
130130
packages:
131131
- text-2.0.2
132132
flags:

doc/faq.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ here is to be as helpful and concise as possible.
99
## What version of GHC is used when I run something like `stack ghci`?
1010

1111
The version of GHC, as well as which packages can be installed, are specified by
12-
the _resolver_. This may be something like `lts-22.0`, which is from
12+
the _resolver_. This may be something like `lts-22.6`, which is from
1313
[Stackage](https://www.stackage.org/). The [user's guide](GUIDE.md) discusses
1414
the resolver in more detail.
1515

@@ -76,7 +76,7 @@ You can make tweaks to a snapshot by modifying the `extra-deps` configuration
7676
value in your `stack.yaml` file, e.g.:
7777

7878
~~~yaml
79-
resolver: lts-22.0
79+
resolver: lts-22.6
8080
packages:
8181
- .
8282
extra-deps:
@@ -91,7 +91,7 @@ Add it to the
9191
directory where your `stack.yaml` file lives, e.g.
9292

9393
~~~yaml
94-
resolver: lts-22.0
94+
resolver: lts-22.6
9595
packages:
9696
- .
9797
extra-deps:

doc/list_command.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,17 +44,17 @@ Error: [S-4926]
4444
pantry, pretty, pasty, xattr, alloy, para, pappy, alure, polar and
4545
factory.
4646
47-
stack --resolver lts-22.0 list base unix Win32 acme-missiles pantry
47+
stack --resolver lts-22.6 list base unix Win32 acme-missiles pantry
4848
Error: [S-4926]
4949
* Package does not appear in snapshot: base.
5050
* Package does not appear in snapshot: unix.
5151
* Package does not appear in snapshot: Win32.
5252
* Package does not appear in snapshot: acme-missiles.
5353
54-
stack --resolver lts-22.0 list pantry
54+
stack --resolver lts-22.6 list pantry
5555
pantry-0.9.3.1
5656
57-
stack --resolver lts-22.0 list
57+
stack --resolver lts-22.6 list
5858
AC-Angle-1.0
5959
ALUT-2.4.0.3
6060
...

doc/script_command.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ configuration files (global and project-level). A snapshot must be specified on
1818
the command line (with the `--resolver` option). For example:
1919

2020
~~~text
21-
stack script --resolver lts-22.0 MyScript.hs
21+
stack script --resolver lts-22.6 MyScript.hs
2222
~~~
2323

2424
The `stack script` command behaves as if the `--install-ghc` flag had been
@@ -100,7 +100,7 @@ main = do
100100
can be compiled and run, with arguments, with:
101101

102102
~~~text
103-
stack --resolver lts-22.0 script --package acme-missiles --compile MyScript.hs -- "Don't panic!" "Duck and cover!"
103+
stack --resolver lts-22.6 script --package acme-missiles --compile MyScript.hs -- "Don't panic!" "Duck and cover!"
104104
~~~
105105

106106
All the compilation outputs (like `Main.hi`, `Main.o`, and the executable

doc/scripts.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ An example will be easiest to understand. Consider the Haskell source file
1919

2020
~~~haskell
2121
#!/usr/bin/env stack
22-
-- stack script --resolver lts-22.0 --package turtle
22+
-- stack script --resolver lts-22.6 --package turtle
2323
{-# LANGUAGE OverloadedStrings #-}
2424
import Turtle (echo)
2525
main = echo "Hello World!"
@@ -78,10 +78,10 @@ able to reuse everything already built).
7878

7979
The second line of the source code is the Stack interpreter options comment. In
8080
this example, it specifies the `stack script` command with the options of a
81-
LTS Haskell 22.0 snapshot (`--resolver lts-22.0`) and ensuring the
81+
LTS Haskell 22.6 snapshot (`--resolver lts-22.6`) and ensuring the
8282
[`turtle` package](https://hackage.haskell.org/package/turtle) is available
8383
(`--package turtle`). The version of the package will be that in the specified
84-
snapshot (`lts-22.0` provides `turtle-1.6.2`).
84+
snapshot (`lts-22.6` provides `turtle-1.6.2`).
8585

8686
## Arguments and interpreter options and arguments
8787

@@ -116,7 +116,7 @@ For example, the command `stack MyScript.hs arg1 arg2` with `MyScript.hs`:
116116
~~~haskell
117117
#!/usr/bin/env stack
118118
{- stack script
119-
--resolver lts-22.0
119+
--resolver lts-22.6
120120
--
121121
+RTS -s -RTS
122122
-}
@@ -132,7 +132,7 @@ main = do
132132
is equivalent to the following command at the command line:
133133

134134
~~~text
135-
stack script --resolver lts-22.0 -- MyScript.hs arg1 arg2 +RTS -s -RTS
135+
stack script --resolver lts-22.6 -- MyScript.hs arg1 arg2 +RTS -s -RTS
136136
~~~
137137

138138
where `+RTS -s -RTS` are some of GHC's
@@ -161,7 +161,7 @@ space separated list. For example:
161161
~~~haskell
162162
#!/usr/bin/env stack
163163
{- stack script
164-
--resolver lts-22.0
164+
--resolver lts-22.6
165165
--package turtle
166166
--package "stm async"
167167
--package http-client,http-conduit
@@ -191,7 +191,7 @@ which makes use of the joke package
191191

192192
~~~haskell
193193
{- stack script
194-
--resolver lts-22.0
194+
--resolver lts-22.6
195195
--package acme-missiles
196196
-}
197197
import Acme.Missiles (launchMissiles)
@@ -202,7 +202,7 @@ main = launchMissiles
202202

203203
The command `stack --script-no-run-compile Script.hs` then behaves as if the
204204
command
205-
`stack script --resolver lts-22.0 --package acme-missiles --no-run --compile -- Script.hs`
205+
`stack script --resolver lts-22.6 --package acme-missiles --no-run --compile -- Script.hs`
206206
had been given. `Script.hs` is compiled (without optimisation) and the resulting
207207
executable is not run: no missiles are launched in the process!
208208

@@ -239,7 +239,7 @@ example with `runghc`:
239239
{- stack
240240
runghc
241241
--install-ghc
242-
--resolver lts-22.0
242+
--resolver lts-22.6
243243
--package base
244244
--package turtle
245245
--
@@ -262,7 +262,7 @@ it. Here is an example:
262262
{- stack
263263
exec ghci
264264
--install-ghc
265-
--resolver lts-22.0
265+
--resolver lts-22.6
266266
--package turtle
267267
-}
268268
~~~

doc/stack_yaml_vs_cabal_package_file.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ requires that you have chosen a specific version for each package available.
6464

6565
The most common means by which this set of packages is defined is via a
6666
snapshot provided by Stackage. For example, if you go to the page
67-
<https://www.stackage.org/lts-22.0>, you will see a list of 3,341 packages at
68-
specific version numbers. When you then specify `resolver: lts-22.0`, you're
67+
<https://www.stackage.org/lts-22.6>, you will see a list of 3,341 packages at
68+
specific version numbers. When you then specify `resolver: lts-22.6`, you're
6969
telling Stack to use those package versions in resolving dependencies down to
7070
specific versions of packages.
7171

0 commit comments

Comments
 (0)