From 222a6a3fb43f8963a7b9672e9585192ece27814a Mon Sep 17 00:00:00 2001 From: agustin Date: Sat, 28 Jul 2018 16:30:25 +0200 Subject: [PATCH 1/4] msgpack got renamed to msgpack4nim --- example/example_server.nim | 2 +- src/nimrpc/rpc_client.nim | 2 +- src/nimrpc/rpc_server.nim | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/example/example_server.nim b/example/example_server.nim index a97ae83..b910a1c 100644 --- a/example/example_server.nim +++ b/example/example_server.nim @@ -1,4 +1,4 @@ -import nimrpc/rpc_server, nimrpc/rpc_type, asyncnet, asyncdispatch, msgpack +import nimrpc/rpc_server, nimrpc/rpc_type, asyncnet, asyncdispatch, msgpack4nim # Define your remote proc # Remote porc must have two params, first is input, second is output (so it's var param). diff --git a/src/nimrpc/rpc_client.nim b/src/nimrpc/rpc_client.nim index 1452c77..278509a 100644 --- a/src/nimrpc/rpc_client.nim +++ b/src/nimrpc/rpc_client.nim @@ -1,4 +1,4 @@ -import net, asyncdispatch, msgpack, tables +import net, asyncdispatch, msgpack4nim, tables import rpc_type type diff --git a/src/nimrpc/rpc_server.nim b/src/nimrpc/rpc_server.nim index 6836023..dc967ce 100644 --- a/src/nimrpc/rpc_server.nim +++ b/src/nimrpc/rpc_server.nim @@ -1,4 +1,4 @@ -import asyncnet, asyncdispatch, msgpack, tables +import asyncnet, asyncdispatch, msgpack4nim, tables import rpc_type type From a79471e7f5613799164f882b2c068a836476c722 Mon Sep 17 00:00:00 2001 From: agustin Date: Sat, 28 Jul 2018 16:43:00 +0200 Subject: [PATCH 2/4] msgpack4nim requires nim 0.18.1 --- nimrpc.nimble | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nimrpc.nimble b/nimrpc.nimble index a97d03d..a6909e8 100644 --- a/nimrpc.nimble +++ b/nimrpc.nimble @@ -9,7 +9,7 @@ srcDir = "src" [Deps] Requires: """ -nim >= 0.11.2 +nim >= 0.18.1 msgpack4nim >= 0.1.2 From 7c871b016978417ba660ca5195edc70e48b1013e Mon Sep 17 00:00:00 2001 From: agustin Date: Sat, 28 Jul 2018 16:58:18 +0200 Subject: [PATCH 3/4] change Araq/Nim:master to nim-lang/nim:devel to get nim 0.18.1 --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 085a1c0..4ac963a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,10 +2,10 @@ os: - linux env: - - BRANCH="master" + - BRANCH="devel" install: - - git clone -b $BRANCH git://github.com/Araq/Nim.git; cd Nim; git clone -b $BRANCH --depth 1 git://github.com/nim-lang/csources; cd csources && sh build.sh; cd ..; bin/nim c koch; ./koch boot -d:release; cd ..; export PATH=`pwd`/Nim/bin:$PATH + - git clone -b $BRANCH git://github.com/nim-lang/Nim.git; cd Nim; git clone -b $BRANCH --depth 1 git://github.com/nim-lang/csources; cd csources && sh build.sh; cd ..; bin/nim c koch; ./koch boot -d:release; cd ..; export PATH=`pwd`/Nim/bin:$PATH - git clone https://github.com/nim-lang/nimble.git; cd nimble; yes | nim c -r src/nimble install; cd ..; export PATH=~/.nimble/bin:$PATH; nimble update; nimble install msgpack4nim before_script: From dd2c6c01de1a3f5bc3c1af9560a8b58ebfc4b4c1 Mon Sep 17 00:00:00 2001 From: agustin Date: Sat, 28 Jul 2018 16:58:18 +0200 Subject: [PATCH 4/4] change Araq/Nim:master to nim-lang/nim:devel to get nim 0.18.1 --- .travis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 085a1c0..31a9fe7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,10 +2,11 @@ os: - linux env: - - BRANCH="master" + - BRANCH="devel" + - SOURCES_BRANCH="master" install: - - git clone -b $BRANCH git://github.com/Araq/Nim.git; cd Nim; git clone -b $BRANCH --depth 1 git://github.com/nim-lang/csources; cd csources && sh build.sh; cd ..; bin/nim c koch; ./koch boot -d:release; cd ..; export PATH=`pwd`/Nim/bin:$PATH + - git clone -b $BRANCH git://github.com/nim-lang/Nim.git; cd Nim; git clone -b $SOURCES_BRANCH --depth 1 git://github.com/nim-lang/csources; cd csources && sh build.sh; cd ..; bin/nim c koch; ./koch boot -d:release; cd ..; export PATH=`pwd`/Nim/bin:$PATH - git clone https://github.com/nim-lang/nimble.git; cd nimble; yes | nim c -r src/nimble install; cd ..; export PATH=~/.nimble/bin:$PATH; nimble update; nimble install msgpack4nim before_script: