digital-asset/daml
1
1
Fork 0
mirror of https://github.com/digital-asset/daml.git synced 2024-09-20 01:07:18 +03:00
Code Issues Projects Releases Wiki Activity

Remove Data.SemVer workaround. (#1246)

Browse Source
This commit is contained in:
A. F. Mota 2019-05-20 14:38:59 +02:00 committed by GitHub
parent 5236494b63
commit db155477a5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
WORKSPACE
View File

@ -473,6 +473,7 @@ hazel_repositories(
hazel_github_external("awakesecurity", "proto3-suite", "dd01df7a3f6d0f1ea36125a67ac3c16936b53da0", "59ea7b876b14991347918eefefe24e7f0e064b5c2cc14574ac4ab5d6af6413ca") +
hazel_hackage("happy", "1.19.10", "22eb606c97105b396e1c7dc27e120ca02025a87f3e44d2ea52be6a653a52caed") +
hazel_hackage("bytestring-nums", "0.3.6", "bdca97600d91f00bb3c0f654784e3fbd2d62fcf4671820578105487cdf39e7cd") +
hazel_hackage("semver", "0.3.4", "42dbdacb08f30ac8bf2f014981cb080737f793b89d57626cb7e2ab8c3d768e6b") +
hazel_hackage(
"network",
"2.8.0.0",

9
daml-assistant/exe/DAML/Assistant.hs
View File

@ -167,14 +167,7 @@ handleCommand env@Env{..} = \case
<$ guard (not (isInstalled v))
]
-- | Workaround for Data.SemVer old unfixed bug (see https://github.com/brendanhay/semver/pull/6)
-- TODO: move away from Data.SemVer...
versionCompare v1 v2 =
if v1 == v2
then EQ
else compare v1 v2
versions = nubSortBy versionCompare (envVersions ++ fromRight [] installedVersionsE)
versions = nubSort (envVersions ++ fromRight [] installedVersionsE)
versionTable = [ (versionToText v, versionAttrs v) | v <- versions ]
versionWidth = maximum (1 : map (T.length . fst) versionTable)
versionLines =