Merge pull request #39 from psibi/update-lts

psibi · web-flow · commit 0e1b6bd8daaa · 2021-07-03T20:15:21.000+05:30
Update lts
diff --git a/.azure/azure-linux-template.yml b/.azure/azure-linux-template.yml
@@ -9,14 +9,12 @@ jobs:
         BUILD: stack
         STACK_YAML: stack.yaml
         DEPLOY: 1
-      stack-lts-13:
+      stack-lts-16:
         BUILD: stack
-        STACK_YAML: stack-lts-13.yaml
+        STACK_YAML: stack.yaml
       nightly:
         BUILD: stack
         ARGS: "--resolver nightly"
-      style:
-        BUILD: style
     maxParallel: 4
   steps:
   - bash: echo "##vso[task.setvariable variable=TAG]${BUILD_SOURCEBRANCH##refs/tags/}"
@@ -58,8 +56,6 @@ jobs:
     env:
       OS_NAME: ${{ parameters.os }}
     displayName: 'Installation ${{parameters.os}} & Test'
-  - bash: ./.azure/build_release.sh
-    displayName: Build Release
   - task: ArchiveFiles@2
     inputs:
       includeRootFolder: false
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM fpco/alpine-haskell-stack:8.6.5
+FROM fpco/alpine-haskell-stack:8.10.4
 
 COPY . /app
 
diff --git a/shell.nix b/shell.nix
@@ -0,0 +1,9 @@
+with import (fetchTarball
+  "https://github.com/NixOS/nixpkgs/archive/refs/tags/21.05.tar.gz") { };
+stdenv.mkDerivation {
+  name = "xmonad";
+  buildInputs = [
+    ghc
+    zlib
+  ];
+}
diff --git a/stack.yaml b/stack.yaml
@@ -1,4 +1,7 @@
-resolver: lts-14.7
+resolver: lts-18.0
 
 packages:
 - '.'
+
+nix:
+  shell-file: shell.nix
diff --git a/stack.yaml.lock b/stack.yaml.lock
@@ -6,7 +6,7 @@
 packages: []
 snapshots:
 - completed:
-    size: 523700
-    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/14/7.yaml
-    sha256: 8e3f3c894be74d71fa4bf085e0a8baae7e4d7622d07ea31a52736b80f8b9bb1a
-  original: lts-14.7
+    size: 585393
+    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/18/0.yaml
+    sha256: c632012da648385b9fa3c29f4e0afd56ead299f1c5528ee789058be410e883c0
+  original: lts-18.0

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM fpco/alpine-haskell-stack:8.6.5`
	`1`	`+FROM fpco/alpine-haskell-stack:8.10.4`
`2`	`2`
`3`	`3`	`COPY . /app`
`4`	`4`