Skip to content

Commit 4741580

Browse files
avsmavsm
authored
Merge pull request #24131 from jonahbeckford/opam-publish-dkml-install-dkml-install-installer-dkml-install-runner-dkml-package-console.0.4.0
4 packages from diskuv/dkml-install-api at 0.4.0
2 parents d30211f + 3532069 commit 4741580

File tree

9 files changed

+222
-12
lines changed
  • packages
    • dkml-component-offline-ocamlrun/dkml-component-offline-ocamlrun.4.12.1~v1.0.2
    • dkml-component-offline-opam/dkml-component-offline-opam.2.2.0~alpha0~20221104
    • dkml-component-staging-ocamlrun/dkml-component-staging-ocamlrun.4.12.1~v1.0.2
    • dkml-component-staging-opam32/dkml-component-staging-opam32.2.2.0~alpha0~20221104
    • dkml-component-staging-opam64/dkml-component-staging-opam64.2.2.0~alpha0~20221104
    • dkml-install-installer/dkml-install-installer.0.4.0
    • dkml-install-runner/dkml-install-runner.0.4.0
    • dkml-install/dkml-install.0.4.0
    • dkml-package-console/dkml-package-console.0.4.0

9 files changed

+222
-12
lines changed

‎packages/dkml-component-offline-ocamlrun/dkml-component-offline-ocamlrun.4.12.1~v1.0.2/opam

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,10 @@ homepage: "https://github.com/diskuv/dkml-component-ocamlrun"
99
bug-reports: "https://github.com/diskuv/dkml-component-ocamlrun/issues"
1010
depends: [
1111
"dune" {>= "2.9"}
12-
"dkml-install" {>= "0.2.0"}
12+
"dkml-install" {>= "0.2.0" & < "0.4.0"}
1313
"dkml-component-staging-ocamlrun" {= version}
1414
"diskuvbox" {>= "0.1.0"}
15+
"ocaml" {< "5.1.0"}
1516
"odoc" {with-doc}
1617
]
1718
build: [

‎packages/dkml-component-offline-opam/dkml-component-offline-opam.2.2.0~alpha0~20221104/opam

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ depends: [
2929
"dkml-component-staging-opam32" {= version}
3030
"dkml-component-staging-opam64" {= version}
3131
"dkml-component-staging-ocamlrun" {>= "4.12.1~"}
32-
"dkml-install" {>= "0.2.0"}
32+
"dkml-install" {>= "0.2.0" & < "0.4.0"}
3333
"diskuvbox" {>= "0.1.0"}
3434
"odoc" {with-doc}
3535
]

‎packages/dkml-component-staging-ocamlrun/dkml-component-staging-ocamlrun.4.12.1~v1.0.2/opam

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,15 @@ depends: [
1414
]
1515
dev-repo: "git+https://github.com/diskuv/dkml-component-ocamlrun.git"
1616
available: [ os = "macos" | (os = "linux" & (arch = "x86_32" | arch = "x86_64")) | os = "win32" ]
17+
build-env: [
18+
[HOMEBREW_NO_AUTO_UPDATE = "1"]
19+
]
1720
build: [
1821
# Homebrew's bundle tap, needed for reproducible build auditing in drc's crossplatform-functions.sh.
19-
["sh" "src/opamtime/brewbundle.sh"] {os = "macos"}
22+
# TODO: Move the brewbundle.sh to drc, or in drc skip reproducible build auditing if bundle tap is not installable
23+
# WAS: ["sh" "src/opamtime/brewbundle.sh"] {os = "macos"}
24+
# NOW: Use an empty Brewfule
25+
["touch" "Brewfile"] {os = "macos"}
2026

2127
# OCaml source code
2228
["install" "-d" "dl/ocaml/flexdll"]
@@ -178,9 +184,9 @@ extra-source "dl/flexdll.tar.gz" {
178184
checksum: "sha256=51a6ef2e67ff475c33a76b3dc86401a0f286c9a3339ee8145053ea02d2fb5974"
179185
}
180186
extra-source "dl/homebrew-bundle.tar.gz" {
181-
src: "https://github.com/Homebrew/homebrew-bundle/archive/4756e4c4cf95485c5ea4da27375946c1dac2c71d.tar.gz"
187+
src: "https://github.com/Homebrew/homebrew-bundle/archive/437c67db2f160369fec3a3892e3c577b6b3a4d2c.tar.gz"
182188
checksum: [
183-
"sha256=10c024ca7871cea36b4c27b2601971d3fa6cba6f37855613baf0026d0f555e76"
189+
"sha256=ecb6b03b2d0210369f23e3f8f64cd939a4bba633db08db62a49894653e053df4"
184190
]
185191
}
186192
extra-source "dl/dkml-compiler.tar.gz" {

‎packages/dkml-component-staging-opam32/dkml-component-staging-opam32.2.2.0~alpha0~20221104/opam

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
opam-version: "2.0"
1+
opam-version: "2.0"
22
synopsis: "DKML component for 32-bit versions of opam"
33
description: """
44
For 32-bit capable platforms, opam, opam-putenv and opam-installer will be in <share>/staging-files/<platform>.
@@ -36,9 +36,15 @@ depopts: [
3636
"ocaml-option-32bit"
3737
]
3838
dev-repo: "git+https://github.com/diskuv/dkml-component-opam.git"
39+
build-env: [
40+
[HOMEBREW_NO_AUTO_UPDATE = "1"]
41+
]
3942
build: [
4043
# Homebrew's bundle tap, needed for reproducible build auditing in drc's crossplatform-functions.sh.
41-
["sh" "src/opamtime/brewbundle.sh"] {os = "macos"}
44+
# TODO: Move the brewbundle.sh to drc, or in drc skip reproducible build auditing if bundle tap is not installable
45+
# WAS: ["sh" "src/opamtime/brewbundle.sh"] {os = "macos"}
46+
# NOW: Use an empty Brewfule
47+
["touch" "Brewfile"] {os = "macos"}
4248

4349
# Opam source code
4450
["install" "-d" "dl/opam"]
@@ -154,9 +160,9 @@ extra-source "dl/opam.tar.gz" {
154160
]
155161
}
156162
extra-source "dl/homebrew-bundle.tar.gz" {
157-
src: "https://github.com/Homebrew/homebrew-bundle/archive/4756e4c4cf95485c5ea4da27375946c1dac2c71d.tar.gz"
163+
src: "https://github.com/Homebrew/homebrew-bundle/archive/437c67db2f160369fec3a3892e3c577b6b3a4d2c.tar.gz"
158164
checksum: [
159-
"sha256=10c024ca7871cea36b4c27b2601971d3fa6cba6f37855613baf0026d0f555e76"
165+
"sha256=ecb6b03b2d0210369f23e3f8f64cd939a4bba633db08db62a49894653e053df4"
160166
]
161167
}
162168

‎packages/dkml-component-staging-opam64/dkml-component-staging-opam64.2.2.0~alpha0~20221104/opam

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,15 @@ depopts: [
4040
"ocaml-option-32bit"
4141
]
4242
dev-repo: "git+https://github.com/diskuv/dkml-component-opam.git"
43+
build-env: [
44+
[HOMEBREW_NO_AUTO_UPDATE = "1"]
45+
]
4346
build: [
4447
# Homebrew's bundle tap, needed for reproducible build auditing in drc's crossplatform-functions.sh.
45-
["sh" "src/opamtime/brewbundle.sh"] {os = "macos"}
48+
# TODO: Move the brewbundle.sh to drc, or in drc skip reproducible build auditing if bundle tap is not installable
49+
# WAS: ["sh" "src/opamtime/brewbundle.sh"] {os = "macos"}
50+
# NOW: Use an empty Brewfule
51+
["touch" "Brewfile"] {os = "macos"}
4652

4753
# Opam source code
4854
["install" "-d" "dl/opam"]
@@ -202,9 +208,9 @@ extra-source "dl/opam.tar.gz" {
202208
]
203209
}
204210
extra-source "dl/homebrew-bundle.tar.gz" {
205-
src: "https://github.com/Homebrew/homebrew-bundle/archive/4756e4c4cf95485c5ea4da27375946c1dac2c71d.tar.gz"
211+
src: "https://github.com/Homebrew/homebrew-bundle/archive/437c67db2f160369fec3a3892e3c577b6b3a4d2c.tar.gz"
206212
checksum: [
207-
"sha256=10c024ca7871cea36b4c27b2601971d3fa6cba6f37855613baf0026d0f555e76"
213+
"sha256=ecb6b03b2d0210369f23e3f8f64cd939a4bba633db08db62a49894653e053df4"
208214
]
209215
}
210216

‎packages/dkml-install-installer/dkml-install-installer.0.4.0/opam

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
opam-version: "2.0"
2+
synopsis: "Build tools for DKML installers"
3+
description:
4+
"Build-time executables that can generate Dune include files which will compile essential end-user executables."
5+
maintainer: "opensource+diskuv-ocaml@support.diskuv.com"
6+
authors: "Diskuv, Inc. <opensource+diskuv-ocaml@support.diskuv.com>"
7+
license: "Apache-2.0"
8+
homepage: "https://github.com/diskuv/dkml-install-api"
9+
bug-reports: "https://github.com/diskuv/dkml-install-api/issues"
10+
depends: [
11+
"alcotest" {>= "1.4.0" & with-test}
12+
"odoc" {>= "1.5.3" & with-doc}
13+
"dkml-install" {= version}
14+
"dkml-install-runner" {= version}
15+
"dune" {>= "2.9"}
16+
"astring" {>= "0.8.5"}
17+
"bos" {>= "0.2.0"}
18+
"cmdliner" {>= "1.1.1"}
19+
"fmt" {>= "0.8.9"}
20+
"logs" {>= "0.7.0"}
21+
"crunch" {>= "3.3.1"}
22+
]
23+
available: os = "win32" | os = "linux" | os = "macos"
24+
build: [
25+
["dune" "subst"] {dev}
26+
[
27+
"dune"
28+
"build"
29+
"-p"
30+
name
31+
"-j"
32+
jobs
33+
"--promote-install-files=false"
34+
"@install"
35+
"@runtest" {with-test}
36+
"@doc" {with-doc}
37+
]
38+
["dune" "install" "-p" name "--create-install-files" name]
39+
]
40+
dev-repo: "git+https://github.com/diskuv/dkml-install-api.git"
41+
url {
42+
src:
43+
"https://github.com/diskuv/dkml-install-api/releases/download/0.4.0/dkml-install-api-0.4.0.tar.gz"
44+
checksum: [
45+
"md5=1b3f42a06b0643eb502e6f65d1769b98"
46+
"sha512=55d47cb8c570f3e9fbdb5f4f7960c86fbe357df6c5364c82c9eb326150693fa1dbffe3fa3f5682e355f770c5f3c53bd7ce88ec1d1d9eefecceb8f44ed8b1d326"
47+
]
48+
}

‎packages/dkml-install-runner/dkml-install-runner.0.4.0/opam

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
opam-version: "2.0"
2+
synopsis: "Runner executable for Diskuv OCaml (DKML) installation"
3+
description:
4+
"The runner executable is responsible for loading and running all DKML installation components."
5+
maintainer: "opensource+diskuv-ocaml@support.diskuv.com"
6+
authors: "Diskuv, Inc. <opensource+diskuv-ocaml@support.diskuv.com>"
7+
license: "Apache-2.0"
8+
homepage: "https://github.com/diskuv/dkml-install-api"
9+
bug-reports: "https://github.com/diskuv/dkml-install-api/issues"
10+
depends: [
11+
"alcotest" {>= "1.4.0" & with-test}
12+
"odoc" {>= "1.5.3" & with-doc}
13+
"dkml-install" {= version}
14+
"dune" {>= "2.9"}
15+
"ppx_expect" {>= "v0.14.1"}
16+
"astring" {>= "0.8.5"}
17+
"bos" {>= "0.2.0"}
18+
"cmdliner" {>= "1.1.1"}
19+
"fmt" {>= "0.8.9"}
20+
"logs" {>= "0.7.0"}
21+
"diskuvbox" {>= "0.1.1"}
22+
]
23+
available: os = "win32" | os = "linux" | os = "macos"
24+
build: [
25+
["dune" "subst"] {dev}
26+
[
27+
"dune"
28+
"build"
29+
"-p"
30+
name
31+
"-j"
32+
jobs
33+
"--promote-install-files=false"
34+
"@install"
35+
"@runtest" {with-test}
36+
"@doc" {with-doc}
37+
]
38+
["dune" "install" "-p" name "--create-install-files" name]
39+
]
40+
dev-repo: "git+https://github.com/diskuv/dkml-install-api.git"
41+
url {
42+
src:
43+
"https://github.com/diskuv/dkml-install-api/releases/download/0.4.0/dkml-install-api-0.4.0.tar.gz"
44+
checksum: [
45+
"md5=1b3f42a06b0643eb502e6f65d1769b98"
46+
"sha512=55d47cb8c570f3e9fbdb5f4f7960c86fbe357df6c5364c82c9eb326150693fa1dbffe3fa3f5682e355f770c5f3c53bd7ce88ec1d1d9eefecceb8f44ed8b1d326"
47+
]
48+
}

‎packages/dkml-install/dkml-install.0.4.0/opam

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
opam-version: "2.0"
2+
synopsis: "API and registry for Diskuv OCaml (DKML) installation components"
3+
description:
4+
"All DKML installation components implement the interfaces exposed in this API."
5+
maintainer: "opensource+diskuv-ocaml@support.diskuv.com"
6+
authors: "Diskuv, Inc. <opensource+diskuv-ocaml@support.diskuv.com>"
7+
license: "Apache-2.0"
8+
homepage: "https://github.com/diskuv/dkml-install-api"
9+
bug-reports: "https://github.com/diskuv/dkml-install-api/issues"
10+
depends: [
11+
"ocaml" {>= "4.08.0"}
12+
"alcotest" {>= "1.4.0" & with-test}
13+
"odoc" {>= "1.5.3" & with-doc}
14+
"dune" {>= "2.9"}
15+
"ppx_deriving" {>= "5.2.1"}
16+
"result" {>= "1.5"}
17+
"astring" {>= "0.8.5"}
18+
"bos" {>= "0.2.0"}
19+
"cmdliner" {>= "1.1.1"}
20+
"fmt" {>= "0.8.9"}
21+
"tsort" {>= "2.1.0"}
22+
"diskuvbox" {>= "0.1.1" & with-test}
23+
]
24+
available: os = "win32" | os = "linux" | os = "macos"
25+
build: [
26+
["dune" "subst"] {dev}
27+
[
28+
"dune"
29+
"build"
30+
"-p"
31+
name
32+
"-j"
33+
jobs
34+
"--promote-install-files=false"
35+
"@install"
36+
"@runtest" {with-test}
37+
"@doc" {with-doc}
38+
]
39+
["dune" "install" "-p" name "--create-install-files" name]
40+
]
41+
dev-repo: "git+https://github.com/diskuv/dkml-install-api.git"
42+
url {
43+
src:
44+
"https://github.com/diskuv/dkml-install-api/releases/download/0.4.0/dkml-install-api-0.4.0.tar.gz"
45+
checksum: [
46+
"md5=1b3f42a06b0643eb502e6f65d1769b98"
47+
"sha512=55d47cb8c570f3e9fbdb5f4f7960c86fbe357df6c5364c82c9eb326150693fa1dbffe3fa3f5682e355f770c5f3c53bd7ce88ec1d1d9eefecceb8f44ed8b1d326"
48+
]
49+
}

‎packages/dkml-package-console/dkml-package-console.0.4.0/opam

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
opam-version: "2.0"
2+
synopsis:
3+
"Console setup and uninstall executables for Diskuv OCaml (DKML) installation"
4+
description:
5+
"The setup and uninstall executables are responsible for launching the DKML runners."
6+
maintainer: "opensource+diskuv-ocaml@support.diskuv.com"
7+
authors: "Diskuv, Inc. <opensource+diskuv-ocaml@support.diskuv.com>"
8+
license: "Apache-2.0"
9+
homepage: "https://github.com/diskuv/dkml-install-api"
10+
bug-reports: "https://github.com/diskuv/dkml-install-api/issues"
11+
depends: [
12+
"alcotest" {>= "1.4.0" & with-test}
13+
"odoc" {>= "1.5.3" & with-doc}
14+
"dkml-install" {= version}
15+
"dkml-install-runner" {= version}
16+
"dune" {>= "2.9"}
17+
"diskuvbox" {>= "0.1.1"}
18+
"crunch" {>= "3.3.1"}
19+
"dkml-component-xx-console" {>= "0.1.1"}
20+
]
21+
available: os = "win32" | os = "linux" | os = "macos"
22+
build: [
23+
["dune" "subst"] {dev}
24+
[
25+
"dune"
26+
"build"
27+
"-p"
28+
name
29+
"-j"
30+
jobs
31+
"--promote-install-files=false"
32+
"@install"
33+
"@runtest" {with-test}
34+
"@doc" {with-doc}
35+
]
36+
["dune" "install" "-p" name "--create-install-files" name]
37+
]
38+
dev-repo: "git+https://github.com/diskuv/dkml-install-api.git"
39+
url {
40+
src:
41+
"https://github.com/diskuv/dkml-install-api/releases/download/0.4.0/dkml-install-api-0.4.0.tar.gz"
42+
checksum: [
43+
"md5=1b3f42a06b0643eb502e6f65d1769b98"
44+
"sha512=55d47cb8c570f3e9fbdb5f4f7960c86fbe357df6c5364c82c9eb326150693fa1dbffe3fa3f5682e355f770c5f3c53bd7ce88ec1d1d9eefecceb8f44ed8b1d326"
45+
]
46+
}

0 commit comments

Comments
 (0)