Skip to content

Commit

Permalink
Merge pull request #669 from psafont/musty
Browse files Browse the repository at this point in the history
  • Loading branch information
psafont authored Mar 7, 2024
2 parents bdd48d2 + 7920ce8 commit c24b299
Show file tree
Hide file tree
Showing 91 changed files with 844 additions and 665 deletions.
2 changes: 0 additions & 2 deletions .github/unused-upstream.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
bisect_ppx
either
fix
logs-syslog
Expand All @@ -7,7 +6,6 @@ ocaml-version
ocamlformat
ocamlformat-lib
ocp-indent
odoc-parser
syslog-message
tyre
tyxml
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,9 @@ jobs:
- name: Archive upstream libraries
run: make archive

- name: Draft Release ${{ github.ref_name }}
run: gh release create ${{ github.ref_name }} --draft --generate-notes
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Upload artifacts
run: gh release upload ${{ github.ref_name }} licenses.txt xs-opam-repo-${{ github.ref_name }}.tar.gz
- name: Create Release ${{ github.ref_name }}
run: |
gh release create ${{ github.ref_name }} --repo ${{ github.repository }} --generate-notes \
licenses.txt xs-opam-repo-${{ github.ref_name }}.tar.gz
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
cache
cache.log
stash/
xs-opam-repo-*/
xs-opam-repo-*
17 changes: 7 additions & 10 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#

SHELL = /bin/bash
VERSION = $(shell git describe --abbrev=0 --tags)
VERSION = $(shell git describe --tags)
NAME = xs-opam-repo-$(VERSION)

.PHONY: all archive clean licenses
Expand All @@ -13,17 +13,14 @@ all:
archive: $(NAME).tar.gz

$(NAME).tar.gz:
# don't package ocaml, do package cache
mv packages/ocaml .
mv packages/upstream-extra .
# Add only upstream and xs pkgs into cache, add ocaml ones to metadata
mkdir -p stash
mv packages/{ocaml,upstream-extra,xs-extra,xs-extra-dummy} stash
env OPAMFETCH=wget opam admin cache |& tee cache.log
! grep ERROR cache.log
git archive --format=tar.gz --prefix=$(NAME)/ HEAD > $@
tar zxf $@
cd $(NAME) && ln -fs ../cache .
tar czhf $@ $(NAME)
mv ocaml packages
mv upstream-extra packages
mv stash/ocaml packages/
tar zcf $@ --transform "flags=r;s|^|$(NAME)/|" cache packages tools repo
mv stash/* packages/

# report licenses of xs-toolstack from *installed* packages
licenses:
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
opam-version: "2.0"
name: "chrome-trace"
version: "3.11.1"
version: "3.14.0"
synopsis: "Chrome trace event generation library"
description:
"This library offers no backwards compatibility guarantees. Use at your own risk."
Expand All @@ -11,7 +11,7 @@ homepage: "https://github.com/ocaml/dune"
doc: "https://dune.readthedocs.io/"
bug-reports: "https://github.com/ocaml/dune/issues"
depends: [
"dune" {>= "3.5"}
"dune" {>= "3.12"}
"ocaml" {>= "4.08.0"}
"odoc" {with-doc}
]
Expand All @@ -24,10 +24,10 @@ build: [
dev-repo: "git+https://github.com/ocaml/dune.git"
url {
src:
"https://github.com/ocaml/dune/releases/download/3.11.1/dune-3.11.1.tbz"
"https://github.com/ocaml/dune/releases/download/3.14.0/dune-3.14.0.tbz"
checksum: [
"sha256=866f2307adadaf7604f3bf9d98bb4098792baa046953a6726c96c40fc5ed3f71"
"sha512=c888153b204a16bcfed2636de776bbd5f9ca84484e716cc1e9ef3ba3c904e9dd15a2609ae943cddb6097912623ec54618c58386d6730ff742d746850400fb3cc"
"sha256=f4d09d89162621fdff424c253fa50c4920d2179fb5b3d1debab7bbe97c68b2fc"
"sha512=f5ead1a9a0cc26e00a762e83e107b47c3c3fe9b44d9e505547c385c7938208d4fdcc91a8099512e76ea4a426f3543445b4d75ef0b621dc7dbfdcbb615bc0b999"
]
}
x-commit-hash: "7cbb0e7277c6cacd1ccf7941cac5a03c25fc63cf"
x-commit-hash: "73250f00372d3f28a25963ded6138728f4202663"
27 changes: 27 additions & 0 deletions packages/upstream-extra/conf-ruby.1.0.0/opam
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
opam-version: "2.0"
name: "conf-ruby"
version: "1.0.0"
synopsis: "Virtual package relying on Ruby"
description:
"This package can only install if the `ruby` program is available on the system."
maintainer: "Takuma Ishikawa <[email protected]>"
authors: "Yukihiro Matsumoto (Matz) and contributers"
license: "2-clause BSDL or the conditions in COPYING of the Ruby repository"
homepage: "https://www.ruby-lang.org/"
bug-reports: "https://github.com/ocaml/opam-repository/issues"
flags: conf
build: ["ruby" "--version"]
depexts: [
["ruby"] {os-distribution = "alpine"}
["ruby"] {os-distribution = "arch"}
["ruby"] {os-distribution = "centos"}
["ruby"] {os-family = "debian"}
["ruby"] {os-distribution = "fedora"}
["dev-lang/ruby"] {os-distribution = "gentoo"}
["ruby"] {os-distribution = "homebrew" & os = "macos"}
["ruby"] {os = "netbsd"}
["ruby"] {os-distribution = "nixos"}
["ruby"] {os = "openbsd"}
["ruby"] {os-family = "suse" | os-family = "opensuse"}
["ruby" "rubygems"] {os-distribution = "ol"}
]
58 changes: 58 additions & 0 deletions packages/upstream-extra/crunch.3.3.1/opam
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
opam-version: "2.0"
name: "crunch"
version: "3.3.1"
synopsis: "Convert a filesystem into a static OCaml module"
description: """\
`ocaml-crunch` takes a directory of files and compiles them into a standalone
OCaml module which serves the contents directly from memory. This can be
convenient for libraries that need a few embedded files (such as a web server)
and do not want to deal with all the trouble of file configuration."""
maintainer: "MirageOS team"
authors: [
"Anil Madhavapeddy"
"Thomas Gazagnaire"
"Stefanie Schirmer"
"Hannes Mehnert"
]
license: "ISC"
tags: ["org:mirage" "org:xapi-project"]
homepage: "https://github.com/mirage/ocaml-crunch"
doc: "https://mirage.github.io/ocaml-crunch/"
bug-reports: "https://github.com/mirage/ocaml-crunch/issues"
depends: [
"ocaml" {>= "4.08.0"}
"cmdliner" {>= "1.1"}
"ptime"
"dune" {>= "2.5"}
"lwt" {with-test}
"mirage-kv" {with-test & >= "3.0.0"}
"mirage-kv-mem" {with-test & >= "3.0.0"}
"fmt" {with-test}
]
conflicts: [
"mirage-kv" {< "3.0.0"}
]
build: [
["dune" "subst"] {dev}
[
"dune"
"build"
"-p"
name
"-j"
jobs
"@install"
"@runtest" {with-test}
"@doc" {with-doc}
]
]
dev-repo: "git+https://github.com/mirage/ocaml-crunch.git"
url {
src:
"https://github.com/mirage/ocaml-crunch/releases/download/v3.3.1/crunch-3.3.1.tbz"
checksum: [
"sha256=2c5ba0d4110bcbb7731cba4eafb6c44a7487c3f88c1ad47401271b69ffa8ed6a"
"sha512=5aaa1b67456dd2f5e3ab450ea547e62fba2b0341a49f3b24669162dce91b6ea1158c1594d60c6df3e416e719484411c50ae61017c40b2f75ee90401aa543bd08"
]
}
x-commit-hash: "bd4f0195b35c602b8b83886bc8731e649b1e3f9c"
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
opam-version: "2.0"
name: "dune-rpc"
version: "3.11.1"
version: "3.14.0"
synopsis: "Communicate with dune using rpc"
description: "Library to connect and control a running dune instance"
maintainer: "Jane Street Group, LLC <[email protected]>"
Expand All @@ -10,7 +10,7 @@ homepage: "https://github.com/ocaml/dune"
doc: "https://dune.readthedocs.io/"
bug-reports: "https://github.com/ocaml/dune/issues"
depends: [
"dune" {>= "3.5"}
"dune" {>= "3.12"}
"csexp"
"ordering"
"dyn"
Expand All @@ -28,10 +28,10 @@ build: [
dev-repo: "git+https://github.com/ocaml/dune.git"
url {
src:
"https://github.com/ocaml/dune/releases/download/3.11.1/dune-3.11.1.tbz"
"https://github.com/ocaml/dune/releases/download/3.14.0/dune-3.14.0.tbz"
checksum: [
"sha256=866f2307adadaf7604f3bf9d98bb4098792baa046953a6726c96c40fc5ed3f71"
"sha512=c888153b204a16bcfed2636de776bbd5f9ca84484e716cc1e9ef3ba3c904e9dd15a2609ae943cddb6097912623ec54618c58386d6730ff742d746850400fb3cc"
"sha256=f4d09d89162621fdff424c253fa50c4920d2179fb5b3d1debab7bbe97c68b2fc"
"sha512=f5ead1a9a0cc26e00a762e83e107b47c3c3fe9b44d9e505547c385c7938208d4fdcc91a8099512e76ea4a426f3543445b4d75ef0b621dc7dbfdcbb615bc0b999"
]
}
x-commit-hash: "7cbb0e7277c6cacd1ccf7941cac5a03c25fc63cf"
x-commit-hash: "73250f00372d3f28a25963ded6138728f4202663"
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
opam-version: "2.0"
name: "merlin-lib"
version: "4.12-414"
version: "4.13-414"
synopsis: "Merlin's libraries"
description: """\
These libraries provides access to low-level compiler interfaces and the
Expand All @@ -26,10 +26,10 @@ build: [
dev-repo: "git+https://github.com/ocaml/merlin.git"
url {
src:
"https://github.com/ocaml/merlin/releases/download/v4.12-414/merlin-4.12-414.tbz"
"https://github.com/ocaml/merlin/releases/download/v4.13-414/merlin-4.13-414.tbz"
checksum: [
"sha256=b603144f82b215e26e6d8558d5276ff59bcf07527072a106702bb0b8ca971d14"
"sha512=3bf4f5e4754def9818ce0abbdf2253fe9d5e0abec7e8814012e2ff9de6a174f288c257780eb9f8aa4d794c0b62a524848d579d2a3495a5747a0970ee9fbfff29"
"sha256=025cf1a93ba1e40916f5d9cf22fe7569bbfbaf403f54e4b724e4f92078b1db03"
"sha512=cf7e292a515122756bd614eedbf11cc09108e6afab77cd5805428207b3ca5a98494ee43ad59fcfb667b48fe0874f0a8359882b3c14ee270769f99c41e176d455"
]
}
x-commit-hash: "cc56ce484b89890cd08fd77c1dd17682834134b8"
x-commit-hash: "b06a4e4f976100c23173d715f1b35cd91f8131f0"
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
opam-version: "2.0"
name: "merlin"
version: "4.12-414"
version: "4.13-414"
synopsis:
"Editor helper, provides completion, typing and source browsing in Vim and Emacs"
description:
Expand Down Expand Up @@ -73,10 +73,10 @@ See https://github.com/OCamlPro/opam-user-setup"""
dev-repo: "git+https://github.com/ocaml/merlin.git"
url {
src:
"https://github.com/ocaml/merlin/releases/download/v4.12-414/merlin-4.12-414.tbz"
"https://github.com/ocaml/merlin/releases/download/v4.13-414/merlin-4.13-414.tbz"
checksum: [
"sha256=b603144f82b215e26e6d8558d5276ff59bcf07527072a106702bb0b8ca971d14"
"sha512=3bf4f5e4754def9818ce0abbdf2253fe9d5e0abec7e8814012e2ff9de6a174f288c257780eb9f8aa4d794c0b62a524848d579d2a3495a5747a0970ee9fbfff29"
"sha256=025cf1a93ba1e40916f5d9cf22fe7569bbfbaf403f54e4b724e4f92078b1db03"
"sha512=cf7e292a515122756bd614eedbf11cc09108e6afab77cd5805428207b3ca5a98494ee43ad59fcfb667b48fe0874f0a8359882b3c14ee270769f99c41e176d455"
]
}
x-commit-hash: "cc56ce484b89890cd08fd77c1dd17682834134b8"
x-commit-hash: "b06a4e4f976100c23173d715f1b35cd91f8131f0"
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
opam-version: "2.0"
name: "ocaml-lsp-server"
version: "1.16.2"
version: "1.17.0"
synopsis: "LSP Server for OCaml"
description: "An LSP server for OCaml."
maintainer: "Rudi Grinberg <[email protected]>"
Expand Down Expand Up @@ -33,7 +33,8 @@ depends: [
"ordering"
"dune-build-info"
"spawn"
"odoc-parser" {>= "2.0.0" & < "2.3.0"}
"astring"
"camlp-streams"
"ppx_expect" {>= "v0.15.0" & with-test}
"ocamlformat" {with-test & = "0.24.1"}
"ocamlc-loc" {>= "3.7.0"}
Expand All @@ -52,10 +53,10 @@ build: [
dev-repo: "git+https://github.com/ocaml/ocaml-lsp.git"
url {
src:
"https://github.com/ocaml/ocaml-lsp/releases/download/1.16.2/lsp-1.16.2.tbz"
"https://github.com/ocaml/ocaml-lsp/releases/download/1.17.0/lsp-1.17.0.tbz"
checksum: [
"sha256=1487d5a4e2f2d4f023341058551bdb8ba86c23367b7c5b4fdda3aa7dc02aaec4"
"sha512=4a392f6d3deafc6dd37f9603250e736c8d8195ea42c782252386616e8c1562d744e02beee54ec45254cba23efd343ebb33789babb093b0e70122ba86d7e67717"
"sha256=8fb8bbd717eefd2608b4d83458105b660e0de3a1134dc8fc216ae659d4d19600"
"sha512=6876df760dbcb51f85e7fd9d08cc8498c69ede38a52f4e12407187da3fbd9657c71f3223f9490ad97edd5259cfdeb2819d943db65bb9ce3c2a18dace3b65ffa8"
]
}
x-commit-hash: "22cefd841bb0b6b9a6fd4fe5befe5eb68d213ce3"
x-commit-hash: "d3d8de5a4213c2a16e43ac4f87cbbe88a894d05f"
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ name: "ocaml-migrate-parsetree"
version: "2.4.0"
synopsis: "Convert OCaml parsetrees between different versions"
description: """\
Deprecated. Please, use Ppxlib instead.
More info on https://ocaml.org/changelog/2023-10-23-omp-deprecation

Convert OCaml parsetrees between different versions

This library converts parsetrees, outcometree and ast mappers between
Expand All @@ -24,6 +27,7 @@ depends: [
"cinaps" {with-test & >= "v0.13.0"}
]
conflicts: ["base-effects"]
flags: deprecated
build: ["dune" "build" "-p" name "-j" jobs]
run-test: ["dune" "runtest" "-p" name "-j" jobs]
dev-repo: "git+https://github.com/ocaml-ppx/ocaml-migrate-parsetree.git"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
opam-version: "2.0"
name: "ocamlc-loc"
version: "3.11.1"
version: "3.14.0"
synopsis: "Parse ocaml compiler output into structured form"
description:
"This library offers no backwards compatibility guarantees. Use at your own risk."
Expand All @@ -11,7 +11,7 @@ homepage: "https://github.com/ocaml/dune"
doc: "https://dune.readthedocs.io/"
bug-reports: "https://github.com/ocaml/dune/issues"
depends: [
"dune" {>= "3.5"}
"dune" {>= "3.12"}
"ocaml" {>= "4.08.0"}
"dyn" {= version}
"odoc" {with-doc}
Expand All @@ -28,10 +28,10 @@ build: [
dev-repo: "git+https://github.com/ocaml/dune.git"
url {
src:
"https://github.com/ocaml/dune/releases/download/3.11.1/dune-3.11.1.tbz"
"https://github.com/ocaml/dune/releases/download/3.14.0/dune-3.14.0.tbz"
checksum: [
"sha256=866f2307adadaf7604f3bf9d98bb4098792baa046953a6726c96c40fc5ed3f71"
"sha512=c888153b204a16bcfed2636de776bbd5f9ca84484e716cc1e9ef3ba3c904e9dd15a2609ae943cddb6097912623ec54618c58386d6730ff742d746850400fb3cc"
"sha256=f4d09d89162621fdff424c253fa50c4920d2179fb5b3d1debab7bbe97c68b2fc"
"sha512=f5ead1a9a0cc26e00a762e83e107b47c3c3fe9b44d9e505547c385c7938208d4fdcc91a8099512e76ea4a426f3543445b4d75ef0b621dc7dbfdcbb615bc0b999"
]
}
x-commit-hash: "7cbb0e7277c6cacd1ccf7941cac5a03c25fc63cf"
x-commit-hash: "73250f00372d3f28a25963ded6138728f4202663"
45 changes: 45 additions & 0 deletions packages/upstream-extra/odoc-parser.2.4.1/opam
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
opam-version: "2.0"
name: "odoc-parser"
version: "2.4.1"
synopsis: "Parser for ocaml documentation comments"
description: """\
Odoc_parser is a library for parsing the contents of OCaml documentation
comments, formatted using 'odoc' syntax, an extension of the language
understood by ocamldoc."""
maintainer: "Jon Ludlam <[email protected]>"
authors: "Anton Bachin <[email protected]>"
license: "ISC"
homepage: "https://github.com/ocaml/odoc"
doc: "https://ocaml.github.io/odoc/odoc_parser"
bug-reports: "https://github.com/ocaml/odoc/issues"
depends: [
"dune" {>= "3.7"}
"ocaml" {>= "4.02.0"}
"astring"
"result"
"camlp-streams"
"ppx_expect" {with-test}
("ocaml" {< "4.04.1" & with-test} | "sexplib0" {with-test})
]
build: [
["dune" "subst"] {dev}
[
"dune"
"build"
"-p"
name
"-j"
jobs
"@install"
"@src/parser/runtest" {with-test}
]
]
dev-repo: "git+https://github.com/ocaml/odoc.git"
url {
src: "https://github.com/ocaml/odoc/releases/download/2.4.1/odoc-2.4.1.tbz"
checksum: [
"sha256=b814a0b9020b503eb67f17d1d9a969d052b63d8cdc7cdfa5fb793b137558cedb"
"sha512=8ed2ed6ef705c00a2c90b7c57e7e5c747247e3406f1b7415a46db7cbd19d02678db40be761984d627f4fa2d9b38f696c77d8b5d40108e12563e101d07949821c"
]
}
x-commit-hash: "0e671097a35ef938ea390a6bb894f25d8dc847a8"
Loading

0 comments on commit c24b299

Please sign in to comment.