Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into day_22
Browse files Browse the repository at this point in the history
* origin/main:
  Update dependencies (#41)
  Remove hspec skip rules from hlint (#39)
  • Loading branch information
manuphatak committed Jan 10, 2021
2 parents eb3fc6e + 66a2af0 commit 30fd2cb
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
command: stack --no-terminal setup
- run:
name: Install executable
command: stack --no-terminal install
command: stack --no-terminal install --jobs 1
- run:
name: Clean any cached coverage data
command: rm -rfv $(stack --no-terminal path --local-hpc-root)
Expand Down
3 changes: 0 additions & 3 deletions .hlint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,8 @@
- { name: [Data.Map, Data.Map.Strict], as: Map }

- error: { lhs: fit, rhs: it }
- error: { lhs: xit, rhs: it }
- error: { lhs: fdescribe, rhs: describe }
- error: { lhs: xdescribe, rhs: describe }
- error: { lhs: fcontext, rhs: context }
- error: { lhs: xcontext, rhs: context }
- error: { lhs: focus $ a, rhs: a }
- error: { lhs: focus . a, rhs: a }

Expand Down
2 changes: 1 addition & 1 deletion AdventOfCode2020.cabal
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cabal-version: 1.12

-- This file has been generated from package.yaml by hpack version 0.34.2.
-- This file has been generated from package.yaml by hpack version 0.34.3.
--
-- see: https://github.com/sol/hpack

Expand Down
4 changes: 2 additions & 2 deletions stack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#
# resolver: ./custom-snapshot.yaml
# resolver: https://example.com/snapshots/2018-01-01.yaml
resolver: lts-16.23
resolver: lts-16.28

# User packages to be built.
# Various formats can be used as shown in the example below.
Expand All @@ -40,7 +40,7 @@ packages:
# commit: e7b331f14bcffb8367cd58fbfc8b40ec7642100a
#
extra-deps:
- implicit-hie-0.1.2.4
- implicit-hie-0.1.2.5

# Override default flag values for local packages and extra-deps
# flags: {}
Expand Down
14 changes: 7 additions & 7 deletions stack.yaml.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@

packages:
- completed:
hackage: implicit-hie-0.1.2.4@sha256:963fcc1b1136ccfd814bc7182bcb841cc51db18b38f5d45860195aed0ca94ab6,2998
hackage: implicit-hie-0.1.2.5@sha256:517a98ef72f92f0a1617495222774fed3a751a64b0c06fbfc7b858d7aa5de279,2998
pantry-tree:
size: 844
sha256: 25ca5d85e30d0a5a7a1f34420848ab163221b53198dbf2e54090f5ae9050d5b1
sha256: 9bf2645187637b647dfaebf37a45a57e221b3527592ce3b1cfd9faf90339dac3
original:
hackage: implicit-hie-0.1.2.4
hackage: implicit-hie-0.1.2.5
snapshots:
- completed:
size: 532832
url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/16/23.yaml
sha256: fbb2a0519008533924c7753bd7164ddd1009f09504eb06674acad6049b46db09
original: lts-16.23
size: 533053
url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/16/28.yaml
sha256: a9c01d860ac8dfb3a1b6f7ec4a36dd9504a95392b89c99b0877da63fa36a8e97
original: lts-16.28

0 comments on commit 30fd2cb

Please sign in to comment.