From 18076baacb0f61e49348068871a352f2bfc55396 Mon Sep 17 00:00:00 2001 From: Sibi Prabakaran Date: Fri, 2 Jul 2021 14:24:18 +0530 Subject: [PATCH 1/3] Update lts --- shell.nix | 9 +++++++++ stack.yaml | 5 ++++- stack.yaml.lock | 8 ++++---- 3 files changed, 17 insertions(+), 5 deletions(-) create mode 100644 shell.nix diff --git a/shell.nix b/shell.nix new file mode 100644 index 0000000..930b08a --- /dev/null +++ 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 index f51211d..07e4a73 100644 --- 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 index 8d62222..93eb45b 100644 --- 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 From 2f4f5b63641b44cff1a976c0bf51e08d50067a9c Mon Sep 17 00:00:00 2001 From: Sibi Prabakaran Date: Fri, 2 Jul 2021 19:05:33 +0530 Subject: [PATCH 2/3] Update --- .azure/azure-linux-template.yml | 4 ++-- Dockerfile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.azure/azure-linux-template.yml b/.azure/azure-linux-template.yml index 5682e00..ac1279c 100644 --- a/.azure/azure-linux-template.yml +++ b/.azure/azure-linux-template.yml @@ -9,9 +9,9 @@ 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" diff --git a/Dockerfile b/Dockerfile index 44a956c..2a4d4f1 100644 --- 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 From 9a1f7847a95479d188480049a1e662e384404d9b Mon Sep 17 00:00:00 2001 From: Sibi Prabakaran Date: Sat, 3 Jul 2021 10:09:55 +0530 Subject: [PATCH 3/3] Update --- .azure/azure-linux-template.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.azure/azure-linux-template.yml b/.azure/azure-linux-template.yml index ac1279c..2f6960d 100644 --- a/.azure/azure-linux-template.yml +++ b/.azure/azure-linux-template.yml @@ -15,8 +15,6 @@ jobs: 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