diff --git a/Makefile b/Makefile index dab64d021e..df625369b5 100644 --- a/Makefile +++ b/Makefile @@ -58,7 +58,6 @@ endif .PHONY: clean clean: cabal clean - $(MAKE) -C services/nginz clean -rm -rf dist .PHONY: clean-hint diff --git a/changelog.d/5-internal/pr-2965 b/changelog.d/5-internal/pr-2965 new file mode 100644 index 0000000000..7540da5e62 --- /dev/null +++ b/changelog.d/5-internal/pr-2965 @@ -0,0 +1 @@ +Fix `make clean`; allow new data constructors in `ToSchema Version` instance diff --git a/libs/wire-api/src/Wire/API/Routes/Version.hs b/libs/wire-api/src/Wire/API/Routes/Version.hs index 68d46bf8ee..5586be14ba 100644 --- a/libs/wire-api/src/Wire/API/Routes/Version.hs +++ b/libs/wire-api/src/Wire/API/Routes/Version.hs @@ -64,11 +64,7 @@ data Version = V0 | V1 | V2 | V3 instance ToSchema Version where schema = enum @Integer "Version" . mconcat $ - [ element 0 V0, - element 1 V1, - element 2 V2, - element 3 V3 - ] + (\v -> element (fromIntegral $ fromEnum v) v) <$> [minBound @Version ..] mkVersion :: Integer -> Maybe Version mkVersion n = case Aeson.fromJSON (Aeson.Number (fromIntegral n)) of