Merge pull request #6115 from kit-ty-kate/no-meta-packages

Remove the meta opam packages opam and opam-admin
ocaml · Jul 29, 2024 · 590b7e7 · 590b7e7
2 parents ebff21b + a243805
commit 590b7e7
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 50 deletions.
diff --git a/dune-project b/dune-project
@@ -2,3 +2,16 @@
 (name opam)
 
 (implicit_transitive_deps true)
+
+(package (name opam-core))
+(package (name opam-format))
+(package (name opam-repository))
+(package (name opam-state))
+(package (name opam-solver))
+(package (name opam-client))
+(package (name opam-devel))
+(package (name opam-installer))
+
+; Meta packages
+(package (name opam))
+(package (name opam-admin))
diff --git a/master_changes.md b/master_changes.md
@@ -118,6 +118,7 @@ users)
 
 ## Internal
   * Stop using polymorphic comparison when comparing `OpamTypes.switch_selections` [#6102 @kit-ty-kate]
+  * Remove the meta opam packages opam and opam-admin [#6115 @kit-ty-kate]
 
 ## Internal: Windows
 

diff --git a/opam-admin.opam b/opam-admin.opam
diff --git a/opam.opam b/opam.opam