Skip to content

Commit a06c975

Browse files
djs55djs55
authored
Merge pull request #262 from samoht/mirage3
Mirage3
2 parents 596d664 + 333d9a0 commit a06c975

823 files changed

Lines changed: 7525 additions & 6361 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Makefile‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@ src/bin/depends.ml: src/bin/depends.ml.in
3030
cp src/bin/depends.ml src/bin/depends.tmp
3131
sed -e 's/££VERSION££/$(shell git rev-parse HEAD)/g' src/bin/depends.tmp > src/bin/depends.ml
3232
cp src/bin/depends.ml src/bin/depends.tmp
33-
sed -e 's/££HOSTNET_PINNED££/$(shell opam info hostnet -f pinned)/g' src/bin/depends.tmp > src/bin/depends.ml
34-
cp src/bin/depends.ml src/bin/depends.tmp
3533
sed -e 's/££HVSOCK_PINNED££/$(shell opam info hvsock -f pinned)/g' src/bin/depends.tmp > src/bin/depends.ml
3634

3735
vpnkit.tgz: vpnkit.exe

‎repo/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ commit:
1919
$(MAKE) update-win
2020
git add win32/packages/upstream
2121
git add darwin/packages/upstream
22-
git commit -a -s -m "AUTO: Update upstream packages"
22+
git commit . -s -m "AUTO: Update upstream packages"

‎repo/darwin/packages/dev/channel.1.1.0/descr‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎repo/darwin/packages/dev/channel.1.1.0/opam‎

Lines changed: 0 additions & 32 deletions
This file was deleted.

‎repo/darwin/packages/dev/channel.1.1.0/url‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎repo/darwin/packages/dev/charrua-client-lwt.dev/opam‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
opam-version: "1.2"
2+
name: "charrua-client-lwt"
3+
maintainer: ["Mindy Preston"]
4+
authors : ["Mindy Preston"]
5+
homepage: "https://github.com/mirage/charrua-core"
6+
bug-reports: "https://github.com/mirage/charrua-core/issues"
7+
dev-repo: "https://github.com/mirage/charrua-core.git"
8+
tags: [ "org:mirage"]
9+
doc: "https://docs.mirage.io"
10+
11+
build: [
12+
["jbuilder" "subst" "-n" name] {pinned}
13+
["jbuilder" "build" "-p" name "-j" jobs]
14+
]
15+
16+
build-test: ["jbuilder" "runtest" "-p" name "-j" jobs]
17+
18+
depends: [
19+
"jbuilder" {>="1.0+beta9"}
20+
"ounit" {test}
21+
"alcotest" {test}
22+
"charrua-core" {>= "0.4"}
23+
"charrua-client"
24+
"cstruct" {>="3.0.2"}
25+
"ipaddr"
26+
"rresult"
27+
"mirage-random" {>= "1.0.0"}
28+
"duration"
29+
"logs"
30+
"tcpip" {>= "3.0.0"}
31+
"fmt"
32+
"lwt"
33+
"mirage-types-lwt" {>="3.0.0"}
34+
"mirage-time-lwt"
35+
]
36+
available: [ocaml-version >= "4.03.0"]

‎repo/darwin/packages/dev/charrua-client-lwt.dev/url‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
git: "https://github.com/mirage/charrua-core.git"

‎repo/darwin/packages/dev/charrua-client-mirage.dev/opam‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
opam-version: "1.2"
2+
name: "charrua-client-mirage"
3+
maintainer: ["Mindy Preston"]
4+
authors : ["Mindy Preston"]
5+
homepage: "https://github.com/mirage/charrua-core"
6+
bug-reports: "https://github.com/mirage/charrua-core/issues"
7+
dev-repo: "https://github.com/mirage/charrua-core.git"
8+
tags: [ "org:mirage"]
9+
doc: "https://docs.mirage.io"
10+
11+
build: [
12+
["jbuilder" "subst" "-n" name] {pinned}
13+
["jbuilder" "build" "-p" name "-j" jobs]
14+
]
15+
16+
build-test: ["jbuilder" "runtest" "-p" name "-j" jobs]
17+
18+
depends: [
19+
"jbuilder" {>="1.0+beta9"}
20+
"ounit" {test}
21+
"alcotest" {test}
22+
"charrua-core" {>= "0.4"}
23+
"charrua-client-lwt"
24+
"charrua-client"
25+
"cstruct" {>="3.0.2"}
26+
"ipaddr"
27+
"rresult"
28+
"mirage-random" {>= "1.0.0"}
29+
"duration"
30+
"logs"
31+
"tcpip" {>= "3.0.0"}
32+
"fmt"
33+
"lwt"
34+
"mirage-types-lwt" {>="3.0.0"}
35+
]
36+
available: [ocaml-version >= "4.03.0"]

‎repo/darwin/packages/dev/charrua-client-mirage.dev/url‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
git: "https://github.com/mirage/charrua-core.git"

‎repo/darwin/packages/dev/charrua-client.dev/descr‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Library using charrua-core to provide a DHCP-configured IPv4 implementation.

0 commit comments

Comments
 (0)