Update Hackage to use Cabal 3 #862

alexbiehl · 2020-03-11T17:07:40Z

See #852.
The patches in this PR are coming from @dwijnand, @hvr and @phadej. Unfortunately I can't push to the wip/cabal-3.0 branch.

We should enable CI again

imalsogreg · 2020-03-12T01:41:31Z

Distribution/Server/Features/BuildReports/BuildReport.hs

+    <*> uniqueField       "arch"               archL
+    <*> uniqueField       "compiler"           compilerL
+    <*> uniqueField       "client"             clientL
+    <*> undefined --monoidalFieldAla  "flags"              (alaList CommaFSep) flagAssignmentL TODO


Is this undefined resolved?

nope; still needs resolving...

UPDATE: resolved

davean

I still need to check the derived instances and run some tests on a snapshot of hackage.

davean · 2020-03-11T17:43:08Z

Distribution/Server/Packages/Unpack.hs

@@ -235,30 +217,13 @@ basicChecks pkgid tarIndex = do
    throwError "'cabal-version' must be lower than 2.5"


Needs to be bumped.

true; but that's gonna happen outside this PR

davean · 2020-03-11T18:17:18Z

Distribution/Server/Features/BuildReports.hs

@@ -27,7 +27,7 @@ import Distribution.Package
 import Distribution.Version (nullVersion)

 import Control.Arrow (second)
-import Data.ByteString.Lazy.Char8 (unpack) -- Build reports are ASCII
+import Data.ByteString.Lazy (toStrict)


I believe this subsystem will have issues with multi-library packages but I do not think that is a blocking problem.

Attached here due to limitations in github's review system.

davean · 2020-03-12T00:56:37Z

Distribution/Server/Features/PreferredVersions.hs

@@ -378,7 +379,7 @@ versionsFeature ServerEnv{ serverVerbosity = verbosity }

    formatSinglePreferredVersions :: PackageName -> PreferredInfo -> Maybe String
    formatSinglePreferredVersions pkgname pref =
-      display . Dependency pkgname <$> sumRange pref
+      display . (\vr -> Dependency pkgname vr Set.empty) <$> sumRange pref -- XXX: ok?


I think this is correct because PreferedVersions should operate at the package level.

actually.... see b6fbd24

davean · 2020-03-12T02:35:48Z

Distribution/Server/Framework/Instances.hs

@@ -117,7 +116,7 @@ instance SafeCopy VersionRange where
            6 -> withinVersion    <$> safeGet
            7 -> unionVersionRanges     <$> getVR <*> getVR
            8 -> intersectVersionRanges <$> getVR <*> getVR
-            9 -> VersionRangeParens     <$> getVR
+            9 -> stripParensVersionRange <$> getVR -- XXX: correct?


My reading of Cabal says this is correct.

davean · 2020-03-12T02:57:18Z

Distribution/Server/Util/CabalRevisions.hs

-      (withComponentName' CLibName <$> libsA)
-      (withComponentName' CLibName <$> libsB)
+      (withComponentName' (CLibName LMainLibName) <$> libsA)
+      (withComponentName' (CLibName LMainLibName) <$> libsB)


Can someone else check?

this was due to haskell/cabal@898b284

davean · 2020-03-12T02:57:22Z

Distribution/Server/Util/CabalRevisions.hs

-      (withComponentName CSubLibName <$> sublibsA)
-      (withComponentName CSubLibName <$> sublibsB)
+      (withComponentName (CLibName . LSubLibName) <$> sublibsA)
+      (withComponentName (CLibName . LSubLibName) <$> sublibsB)


Can someone else check?

this was due to haskell/cabal@898b284

davean · 2020-03-12T03:12:37Z

Distribution/Server/Packages/Unpack.hs

+  where
+    -- these names are reserved for the time being, as they have
+    -- special meaning in cabal's UI
+    reservedPkgNames = map mkPackageName ["all","any","none","setup","lib","exe","test"]


Does "bench" also?

no, because back then when I added those blacklisted names there was already: http://hackage.haskell.org/package/bench-1.0.0

davean · 2020-03-12T03:20:28Z

I think Distribution/Server/Packages/Render.hs could be improved after the merge.

phadej · 2020-03-12T08:41:09Z

HTTPS://hackage.haskell.org/package/bench

…

On 12. Mar 2020, at 5.16, davean ***@***.***> wrote: @davean commented on this pull request. I still need to check the derived instances and run some tests on a snapshot of hackage. In Distribution/Server/Packages/Unpack.hs: > @@ -235,30 +217,13 @@ basicChecks pkgid tarIndex = do throwError "'cabal-version' must be lower than 2.5" Needs to be bumped. In Distribution/Server/Features/BuildReports.hs: > @@ -27,7 +27,7 @@ import Distribution.Package import Distribution.Version (nullVersion) import Control.Arrow (second) -import Data.ByteString.Lazy.Char8 (unpack) -- Build reports are ASCII +import Data.ByteString.Lazy (toStrict) I believe this subsystem will have issues with multi-library packages but I do not think that is a blocking problem. Attached here due to limitations in github's review system. In Distribution/Server/Features/PreferredVersions.hs: > @@ -378,7 +379,7 @@ versionsFeature ServerEnv{ serverVerbosity = verbosity } formatSinglePreferredVersions :: PackageName -> PreferredInfo -> Maybe String formatSinglePreferredVersions pkgname pref = - display . Dependency pkgname <$> sumRange pref + display . (\vr -> Dependency pkgname vr Set.empty) <$> sumRange pref -- XXX: ok? I think this is correct because PreferedVersions should operate at the package level. In Distribution/Server/Framework/Instances.hs: > @@ -117,7 +116,7 @@ instance SafeCopy VersionRange where 6 -> withinVersion <$> safeGet 7 -> unionVersionRanges <$> getVR <*> getVR 8 -> intersectVersionRanges <$> getVR <*> getVR - 9 -> VersionRangeParens <$> getVR + 9 -> stripParensVersionRange <$> getVR -- XXX: correct? My reading of Cabal says this is correct. In Distribution/Server/Util/CabalRevisions.hs: > @@ -168,13 +180,13 @@ checkGenericPackageDescription checkMaybe "Cannot add or remove library sections" (checkCondTree checkLibrary) - (withComponentName' CLibName <$> libsA) - (withComponentName' CLibName <$> libsB) + (withComponentName' (CLibName LMainLibName) <$> libsA) + (withComponentName' (CLibName LMainLibName) <$> libsB) Can someone else check? In Distribution/Server/Util/CabalRevisions.hs: > checkListAssoc "Cannot add or remove sub-library sections" (checkCondTree checkLibrary) - (withComponentName CSubLibName <$> sublibsA) - (withComponentName CSubLibName <$> sublibsB) + (withComponentName (CLibName . LSubLibName) <$> sublibsA) + (withComponentName (CLibName . LSubLibName) <$> sublibsB) Can someone else check? In Distribution/Server/Packages/Unpack.hs: > + -- Check that the name and version in Cabal file match + when (packageName pkgDesc /= packageName pkgid) $ + throwError "Package name in the cabal file does not match the file name." + when (packageVersion pkgDesc /= packageVersion pkgid) $ + throwError "Package version in the cabal file does not match the file name." + + -- check for reserved/magic package names + when (packageName pkgid `elem` reservedPkgNames) $ + throwError "Package name is reserved." + + return (pkgDesc, warnings, cabalEntry) + + where + -- these names are reserved for the time being, as they have + -- special meaning in cabal's UI + reservedPkgNames = map mkPackageName ["all","any","none","setup","lib","exe","test"] Does "bench" also? — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub, or unsubscribe.

bgamari · 2020-03-13T15:36:19Z

Thank you for doing this, @alexbiehl, @hvr, and @phadej!

Revision checking doesn't work correctly if there are public multi-lib dependencies.

Co-authored-by: Ben Gamari <[email protected]>

NB: This doesn't work as intended as the `cabalSpecFromVersionDigits` function is too lax; Cabal 3.4 however will provide a new function for helping to converting CabalSpecVersion to a Version (`cabalSpecToVersionDigits`) This reverts commit 0bfe698.

The open TODOs were related to the BuildReport fields for the "time" and the "flags" field. This change only does the bare minimum and in the future somebody will have to clean-up the technical debt incurred here.

hvr · 2020-04-05T14:25:37Z

I've merged this PR in order to prevent it from bitrotting again as well as to have basic CI enabled again. Some more testing is still required to get better confidence we don't have obvious regressions.

dwijnand · 2020-04-05T17:49:21Z

Thanks @hvr!

NB: `Dependency pkgname vr Set.empty` renders as a package with an empty set of sub-libs, i.e. as pkgname:{} >= 1.2.3 && ... instead of pkgname >= 1.2.3 && ...

imalsogreg reviewed Mar 12, 2020

View reviewed changes

davean reviewed Mar 12, 2020

View reviewed changes

hvr and others added 16 commits April 4, 2020 11:00

Disable Travis CI temporarily as it won't work anyway

3fe4114

Compile with Cabal-3.0

753e538

Revision checking doesn't work correctly if there are public multi-lib dependencies.

Update Cabal to 3.0.0.0

333c439

Fixing compilation, hit a FieldDescr roadblock

8d06126

Cargo cult Ben's lens use & hit no Pretty Version

36df7b8

Co-authored-by: Ben Gamari <[email protected]>

Rename BuildReport's fields back, L-suffix lenses

e0c328b

Minimise the aggregate diff of BuildReport

4756e30

Show version & drop now-needless TaggedPackageId failsafe

ce44a64

Woohoo lib-server built!

5a47062

Compile the executables too!

d84960c

Build tests

45c5ad4

Further diff minimising in BuildReport

5123e3b

Drop unused imports int Server.Packages.Unpack

56e279c

Resolve a TODO: code moved to lib:Cabal

3b6c644

Unpack: extract specVersionChecks

e2216ea

Unpack: use lib:Cabal's CabalSpecVersion for known versions

0bfe698

hvr force-pushed the wip/cabal-3.0 branch from ef4e959 to 0bfe698 Compare April 4, 2020 09:22

hvr added 2 commits April 5, 2020 12:22

Resolve TODOs in Distribution.Server.Features.BuildReports.BuildReport

780744e

The open TODOs were related to the BuildReport fields for the "time" and the "flags" field. This change only does the bare minimum and in the future somebody will have to clean-up the technical debt incurred here.

hvr merged commit f8003f3 into master Apr 5, 2020

hvr deleted the wip/cabal-3.0 branch April 5, 2020 14:25

hvr added a commit that referenced this pull request Apr 5, 2020

Fix regression in preferred-versions rendering from #862

b6fbd24

NB: `Dependency pkgname vr Set.empty` renders as a package with an empty set of sub-libs, i.e. as pkgname:{} >= 1.2.3 && ... instead of pkgname >= 1.2.3 && ...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update Hackage to use Cabal 3 #862

Update Hackage to use Cabal 3 #862

alexbiehl commented Mar 11, 2020 •

edited

Loading

imalsogreg Mar 12, 2020

phadej Mar 22, 2020

hvr Apr 5, 2020 •

edited

Loading

davean left a comment

davean Mar 11, 2020

hvr Apr 5, 2020

davean Mar 11, 2020

davean Mar 12, 2020

hvr Apr 5, 2020

davean Mar 12, 2020

davean Mar 12, 2020

hvr Apr 5, 2020

davean Mar 12, 2020

hvr Apr 5, 2020

davean Mar 12, 2020

hvr Apr 5, 2020

davean commented Mar 12, 2020

phadej commented Mar 12, 2020 via email

bgamari commented Mar 13, 2020

hvr commented Apr 5, 2020

dwijnand commented Apr 5, 2020

		@@ -235,30 +217,13 @@ basicChecks pkgid tarIndex = do
		throwError "'cabal-version' must be lower than 2.5"

Update Hackage to use Cabal 3 #862

Update Hackage to use Cabal 3 #862

Conversation

alexbiehl commented Mar 11, 2020 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

hvr Apr 5, 2020 • edited Loading

Choose a reason for hiding this comment

davean left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

davean commented Mar 12, 2020

phadej commented Mar 12, 2020 via email

bgamari commented Mar 13, 2020

hvr commented Apr 5, 2020

dwijnand commented Apr 5, 2020

alexbiehl commented Mar 11, 2020 •

edited

Loading

hvr Apr 5, 2020 •

edited

Loading