Update to LTS

igr · igr · commit 5375478104ea · 2024-06-11T23:29:21.000+02:00
diff --git a/haskell/.gitignore b/haskell/.gitignore
@@ -1,2 +1,3 @@
 .stack-work/
-*~
+*~
+.metals
diff --git a/haskell/app/Functions.hs b/haskell/app/Functions.hs
@@ -4,3 +4,4 @@ module Functions (
 
 helloWorld :: Int -> String
 helloWorld a = "Hello World" ++ show a
+
diff --git a/haskell/app/Main.hs b/haskell/app/Main.hs
@@ -18,5 +18,3 @@ main = do
 
     print "---------"
     funMain
-
-
diff --git a/haskell/app/MtlEx.hs b/haskell/app/MtlEx.hs
@@ -1,4 +1,3 @@
--- MTL is an acronym and stands for Monad Transformer Library
 module MtlEx (
     runMtlEx,
     calcMltEx
diff --git a/haskell/src/Collatz.hs b/haskell/src/Collatz.hs
@@ -1,4 +1,4 @@
-module Collatz where
+module Collatz (step, collatz) where
 
 -- The module is interested in the Collatz conjecture, a famous open problem in mathematics. It asks:
 -- Does the Collatz sequence eventually reach 1 for all positive integer initial values?
diff --git a/haskell/src/Set1.hs b/haskell/src/Set1.hs
@@ -1,4 +1,4 @@
-module Set1 where
+module Set1 (module Set1) where
 
 ------------------------------------------------------------------------------
 -- Ex 1: define variables one and two. They should have type Int and
diff --git a/haskell/stack.yaml b/haskell/stack.yaml
@@ -17,8 +17,7 @@
 #
 # resolver: ./custom-snapshot.yaml
 # resolver: https://example.com/snapshots/2018-01-01.yaml
-resolver:
-  url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/21/17.yaml
+resolver: lts-21.25
 
 # User packages to be built.
 # Various formats can be used as shown in the example below.
diff --git a/haskell/stack.yaml.lock b/haskell/stack.yaml.lock
@@ -20,8 +20,7 @@ packages:
     hackage: ghci-dap-0.0.21.0@sha256:5a14d13b15701887b3fcc9ff631b676891c1b5dc22fcefeee1ec2832c1eb18b0,3326
 snapshots:
 - completed:
-    sha256: 85d2382958c178491d3fe50d770a624621f5ab456beef7d31ac7521f780c9bc7
-    size: 640042
-    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/21/17.yaml
-  original:
-    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/21/17.yaml
+    sha256: a81fb3877c4f9031e1325eb3935122e608d80715dc16b586eb11ddbff8671ecd
+    size: 640086
+    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/21/25.yaml
+  original: lts-21.25

-Original file line number
+Diff line change
@@ @@ -1,2 +1,3 @@ @@
 .stack-work/
 -*~
 +*~
 +.metals
Original file line number	Diff line number	Diff line change
`@@ -4,3 +4,4 @@ module Functions (`
`4`	`4`
`5`	`5`	`helloWorld :: Int -> String`
`6`	`6`	`helloWorld a = "Hello World" ++ show a`
	`7`	`+`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`--- MTL is an acronym and stands for Monad Transformer Library`
`2`	`1`	`module MtlEx (`
`3`	`2`	`runMtlEx,`
`4`	`3`	`calcMltEx`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-module Collatz where`
	`1`	`+module Collatz (step, collatz) where`
`2`	`2`
`3`	`3`	`-- The module is interested in the Collatz conjecture, a famous open problem in mathematics. It asks:`
`4`	`4`	`-- Does the Collatz sequence eventually reach 1 for all positive integer initial values?`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-module Set1 where`
	`1`	`+module Set1 (module Set1) where`
`2`	`2`
`3`	`3`	`------------------------------------------------------------------------------`
`4`	`4`	`-- Ex 1: define variables one and two. They should have type Int and`
Original file line number	Diff line number	Diff line change
`@@ -17,8 +17,7 @@`
`17`	`17`	`#`
`18`	`18`	`# resolver: ./custom-snapshot.yaml`
`19`	`19`	`# resolver: https://example.com/snapshots/2018-01-01.yaml`
`20`		`-resolver:`
`21`		`- url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/21/17.yaml`
	`20`	`+resolver: lts-21.25`
`22`	`21`
`23`	`22`	`# User packages to be built.`
`24`	`23`	`# Various formats can be used as shown in the example below.`