Fix build on new trunk

ChrisPenner · ChrisPenner · commit 9f188e480c9c · 2026-01-20T10:44:30.000-08:00
diff --git a/share-api/src/Share/NamespaceDiffs.hs b/share-api/src/Share/NamespaceDiffs.hs
@@ -209,7 +209,7 @@ compressNameTree (diffs Cofree.:< children) =
                   (childDiffs Cofree.:< nestedChildren)
                     | null childDiffs,
                       [(k, v)] <- Map.toList nestedChildren ->
-                        (Path.prefix (Path.singleton ns) (Path.Relative k), v)
+                        (Path.prefix (Path.singleton ns) k, v)
                     | otherwise ->
                         (Path.singleton ns, child)
             )
diff --git a/stack.yaml b/stack.yaml
@@ -19,6 +19,7 @@ packages:
 - unison/lib/orphans/unison-hash-orphans-aeson
 - unison/lib/orphans/unison-hash-orphans-sqlite
 - unison/lib/orphans/uuid-orphans-sqlite
+- unison/lib/unison-credentials
 - unison/lib/unison-dynlib
 - unison/lib/unison-hash
 - unison/lib/unison-hashing

Original file line number	Diff line number	Diff line change
`@@ -209,7 +209,7 @@ compressNameTree (diffs Cofree.:< children) =`
`209`	`209`	`(childDiffs Cofree.:< nestedChildren)`
`210`	`210`	`\| null childDiffs,`
`211`	`211`	`[(k, v)] <- Map.toList nestedChildren ->`
`212`		`- (Path.prefix (Path.singleton ns) (Path.Relative k), v)`
	`212`	`+ (Path.prefix (Path.singleton ns) k, v)`
`213`	`213`	`\| otherwise ->`
`214`	`214`	`(Path.singleton ns, child)`
`215`	`215`	`)`