Skip to content
Merged
Show file tree
Hide file tree
Changes from 29 commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
c108bbd
[feat] upgrade nixpkgs to upgrade hls and the hs pkg-set
MangoIV Oct 13, 2023
fbeca69
[chore] add changelog entry
MangoIV Oct 13, 2023
7990874
[fix] fix compile errors
MangoIV Oct 13, 2023
6b6497d
[fix] pin ormolu
MangoIV Oct 14, 2023
447b4cc
[chore] appease hlint
MangoIV Oct 14, 2023
52be7bb
[fix] set numStripes to 1
MangoIV Oct 16, 2023
f6c0d75
[fix] don't use Hashable for hashes that are supposed to be stable
MangoIV Oct 16, 2023
0c0ea75
[feat] replicate the behaviour of the old test in the new testsuite
MangoIV Oct 17, 2023
86cd4af
[feat] finish porting over the test from the old to the new testsuite
MangoIV Oct 18, 2023
6bd5be1
[fix] apply suggestions by Paolo
MangoIV Oct 18, 2023
d6e69d9
[fix] fix behaviour of the cleanup function within `withResource`
MangoIV Oct 23, 2023
06ae50e
[fix] don't check the trailing dot test in nix tests
MangoIV Oct 24, 2023
a809b68
[fix] restore consumeMessage1
MangoIV Oct 30, 2023
52ead1f
[fix] revert the nom change
MangoIV Nov 2, 2023
9709c6d
[feat] upgrade nixpkgs to upgrade hls and the hs pkg-set
MangoIV Oct 13, 2023
071dcca
[fix] don't use Hashable for hashes that are supposed to be stable
MangoIV Oct 16, 2023
b3e3a4d
[fix] apply suggestions by Paolo
MangoIV Oct 18, 2023
c8ccac6
[fix] revert the nom change
MangoIV Nov 2, 2023
dd387cd
[fix] don't check the trailing dot test in nix tests
MangoIV Oct 24, 2023
275f0eb
[wip] update to ghc 9.4.7
MangoIV Oct 23, 2023
639870b
[fix] fix the test-suite such that we don't react on proposals
MangoIV Oct 31, 2023
418856c
[feat] fix issue with swagger typechecking
MangoIV Oct 31, 2023
b83fba4
[chore] add changelog.d entry
MangoIV Nov 1, 2023
b03792a
[chore] switch to wire upstream text-icu-translit
MangoIV Nov 1, 2023
42ae7f9
[feat] update nixpkgs again
MangoIV Nov 1, 2023
aeb53bd
[fix] fix docs (python was mad), remove ormolu hack
MangoIV Nov 2, 2023
8c9a3a2
[chore] apply formatting (because ormolu changes are somehow always
MangoIV Nov 2, 2023
fc5d08c
[fix] import `fromMaybe` (I guess it got removed when rebasing)
MangoIV Nov 2, 2023
237fc8e
[chore] appease hlint
MangoIV Nov 5, 2023
01470fe
[fix] fix typo
MangoIV Nov 6, 2023
2957fac
[fix] remove left ober traceIO
MangoIV Nov 6, 2023
a4289f1
Merge remote-tracking branch 'origin/develop' into mangoiv/upgrade-to-94
MangoIV Nov 7, 2023
1a742d6
[fix] s/consumeMessage1/mlsCliConsume
MangoIV Nov 9, 2023
70b2add
[fix] hi ci
MangoIV Nov 12, 2023
a6100d3
[fix] apply changes asked for by Paolo and Akshay
MangoIV Nov 14, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .envrc
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ if [[ ! -d "$env_dir" || ! -f "$layout_dir/nix-rebuild" || "$store_paths" != $(<
else
nix build -f nix wireServer.devEnv -Lv --out-link ./.env
fi

echo "$store_paths" > "$layout_dir/nix-rebuild"
fi

Expand Down
4 changes: 4 additions & 0 deletions cabal.project
Original file line number Diff line number Diff line change
Expand Up @@ -161,3 +161,7 @@ package zauth
ghc-options: -Werror
package fedcalls
ghc-options: -Werror

allow-newer:
, proto-lens-protoc:base
, proto-lens-protoc:ghc
Comment thread
MangoIV marked this conversation as resolved.
1 change: 1 addition & 0 deletions changelog.d/5-internal/WPB-5042
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
upgrade nixpkgs to upgrade haskell-language-server
1 change: 1 addition & 0 deletions changelog.d/5-internal/WPB-5175
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
upgrade the GHC version to GHC 9.4
2 changes: 1 addition & 1 deletion hack/bin/generate-local-nix-packages.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ set -euo pipefail

SCRIPT_DIR=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
ROOT_DIR=$(cd -- "$SCRIPT_DIR/../../" &> /dev/null && pwd)
cabalFiles=$(find -L "$ROOT_DIR" -name '*.cabal' \
cabalFiles=$(find "$ROOT_DIR" -name '*.cabal' \
| grep -v dist-newstyle | sort)

warningFile=$(mktemp)
Expand Down
2 changes: 2 additions & 0 deletions integration/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
, cryptonite
, data-default
, data-timeout
, deriving-aeson
, directory
, errors
, exceptions
Expand Down Expand Up @@ -92,6 +93,7 @@ mkDerivation {
cryptonite
data-default
data-timeout
deriving-aeson
directory
errors
exceptions
Expand Down
2 changes: 2 additions & 0 deletions integration/integration.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ common common-all
NoImplicitPrelude
AllowAmbiguousTypes
BangPatterns
BlockArguments
ConstraintKinds
DataKinds
DefaultSignatures
Expand Down Expand Up @@ -156,6 +157,7 @@ library
, cryptonite
, data-default
, data-timeout
, deriving-aeson
, directory
, errors
, exceptions
Expand Down
Loading