diff --git a/lowlevel/LICENSE b/core/LICENSE similarity index 100% rename from lowlevel/LICENSE rename to core/LICENSE diff --git a/lowlevel/README.md b/core/README.md similarity index 100% rename from lowlevel/README.md rename to core/README.md diff --git a/lowlevel/Setup.hs b/core/Setup.hs similarity index 100% rename from lowlevel/Setup.hs rename to core/Setup.hs diff --git a/lowlevel/cbits/grpc_haskell.c b/core/cbits/grpc_haskell.c similarity index 100% rename from lowlevel/cbits/grpc_haskell.c rename to core/cbits/grpc_haskell.c diff --git a/lowlevel/grpc-haskell-lowlevel.cabal b/core/grpc-haskell-core.cabal similarity index 97% rename from lowlevel/grpc-haskell-lowlevel.cabal rename to core/grpc-haskell-core.cabal index 4ccf212..71d19f6 100644 --- a/lowlevel/grpc-haskell-lowlevel.cabal +++ b/core/grpc-haskell-core.cabal @@ -1,4 +1,4 @@ -name: grpc-haskell-lowlevel +name: grpc-haskell-core version: 0.0.0.0 synopsis: Haskell implementation of gRPC layered on shared C library. homepage: https://github.com/awakenetworks/gRPC-haskell @@ -86,7 +86,7 @@ library test-suite tests build-depends: base >=4.8 && <5.0 - , grpc-haskell-lowlevel + , grpc-haskell-core , bytestring ==0.10.* , unix , time diff --git a/lowlevel/include/grpc_haskell.h b/core/include/grpc_haskell.h similarity index 100% rename from lowlevel/include/grpc_haskell.h rename to core/include/grpc_haskell.h diff --git a/lowlevel/src/Network/GRPC/LowLevel.hs b/core/src/Network/GRPC/LowLevel.hs similarity index 100% rename from lowlevel/src/Network/GRPC/LowLevel.hs rename to core/src/Network/GRPC/LowLevel.hs diff --git a/lowlevel/src/Network/GRPC/LowLevel/Call.hs b/core/src/Network/GRPC/LowLevel/Call.hs similarity index 100% rename from lowlevel/src/Network/GRPC/LowLevel/Call.hs rename to core/src/Network/GRPC/LowLevel/Call.hs diff --git a/lowlevel/src/Network/GRPC/LowLevel/Call/Unregistered.hs b/core/src/Network/GRPC/LowLevel/Call/Unregistered.hs similarity index 100% rename from lowlevel/src/Network/GRPC/LowLevel/Call/Unregistered.hs rename to core/src/Network/GRPC/LowLevel/Call/Unregistered.hs diff --git a/lowlevel/src/Network/GRPC/LowLevel/Client.hs b/core/src/Network/GRPC/LowLevel/Client.hs similarity index 100% rename from lowlevel/src/Network/GRPC/LowLevel/Client.hs rename to core/src/Network/GRPC/LowLevel/Client.hs diff --git a/lowlevel/src/Network/GRPC/LowLevel/Client/Unregistered.hs b/core/src/Network/GRPC/LowLevel/Client/Unregistered.hs similarity index 100% rename from lowlevel/src/Network/GRPC/LowLevel/Client/Unregistered.hs rename to core/src/Network/GRPC/LowLevel/Client/Unregistered.hs diff --git a/lowlevel/src/Network/GRPC/LowLevel/CompletionQueue.hs b/core/src/Network/GRPC/LowLevel/CompletionQueue.hs similarity index 100% rename from lowlevel/src/Network/GRPC/LowLevel/CompletionQueue.hs rename to core/src/Network/GRPC/LowLevel/CompletionQueue.hs diff --git a/lowlevel/src/Network/GRPC/LowLevel/CompletionQueue/Internal.hs b/core/src/Network/GRPC/LowLevel/CompletionQueue/Internal.hs similarity index 100% rename from lowlevel/src/Network/GRPC/LowLevel/CompletionQueue/Internal.hs rename to core/src/Network/GRPC/LowLevel/CompletionQueue/Internal.hs diff --git a/lowlevel/src/Network/GRPC/LowLevel/CompletionQueue/Unregistered.hs b/core/src/Network/GRPC/LowLevel/CompletionQueue/Unregistered.hs similarity index 100% rename from lowlevel/src/Network/GRPC/LowLevel/CompletionQueue/Unregistered.hs rename to core/src/Network/GRPC/LowLevel/CompletionQueue/Unregistered.hs diff --git a/lowlevel/src/Network/GRPC/LowLevel/GRPC.hs b/core/src/Network/GRPC/LowLevel/GRPC.hs similarity index 100% rename from lowlevel/src/Network/GRPC/LowLevel/GRPC.hs rename to core/src/Network/GRPC/LowLevel/GRPC.hs diff --git a/lowlevel/src/Network/GRPC/LowLevel/Op.hs b/core/src/Network/GRPC/LowLevel/Op.hs similarity index 100% rename from lowlevel/src/Network/GRPC/LowLevel/Op.hs rename to core/src/Network/GRPC/LowLevel/Op.hs diff --git a/lowlevel/src/Network/GRPC/LowLevel/Server.hs b/core/src/Network/GRPC/LowLevel/Server.hs similarity index 100% rename from lowlevel/src/Network/GRPC/LowLevel/Server.hs rename to core/src/Network/GRPC/LowLevel/Server.hs diff --git a/lowlevel/src/Network/GRPC/LowLevel/Server/Unregistered.hs b/core/src/Network/GRPC/LowLevel/Server/Unregistered.hs similarity index 100% rename from lowlevel/src/Network/GRPC/LowLevel/Server/Unregistered.hs rename to core/src/Network/GRPC/LowLevel/Server/Unregistered.hs diff --git a/lowlevel/src/Network/GRPC/Unsafe.chs b/core/src/Network/GRPC/Unsafe.chs similarity index 100% rename from lowlevel/src/Network/GRPC/Unsafe.chs rename to core/src/Network/GRPC/Unsafe.chs diff --git a/lowlevel/src/Network/GRPC/Unsafe/ByteBuffer.chs b/core/src/Network/GRPC/Unsafe/ByteBuffer.chs similarity index 100% rename from lowlevel/src/Network/GRPC/Unsafe/ByteBuffer.chs rename to core/src/Network/GRPC/Unsafe/ByteBuffer.chs diff --git a/lowlevel/src/Network/GRPC/Unsafe/ChannelArgs.chs b/core/src/Network/GRPC/Unsafe/ChannelArgs.chs similarity index 100% rename from lowlevel/src/Network/GRPC/Unsafe/ChannelArgs.chs rename to core/src/Network/GRPC/Unsafe/ChannelArgs.chs diff --git a/lowlevel/src/Network/GRPC/Unsafe/Constants.hsc b/core/src/Network/GRPC/Unsafe/Constants.hsc similarity index 100% rename from lowlevel/src/Network/GRPC/Unsafe/Constants.hsc rename to core/src/Network/GRPC/Unsafe/Constants.hsc diff --git a/lowlevel/src/Network/GRPC/Unsafe/Metadata.chs b/core/src/Network/GRPC/Unsafe/Metadata.chs similarity index 100% rename from lowlevel/src/Network/GRPC/Unsafe/Metadata.chs rename to core/src/Network/GRPC/Unsafe/Metadata.chs diff --git a/lowlevel/src/Network/GRPC/Unsafe/Op.chs b/core/src/Network/GRPC/Unsafe/Op.chs similarity index 100% rename from lowlevel/src/Network/GRPC/Unsafe/Op.chs rename to core/src/Network/GRPC/Unsafe/Op.chs diff --git a/lowlevel/src/Network/GRPC/Unsafe/Security.chs b/core/src/Network/GRPC/Unsafe/Security.chs similarity index 100% rename from lowlevel/src/Network/GRPC/Unsafe/Security.chs rename to core/src/Network/GRPC/Unsafe/Security.chs diff --git a/lowlevel/src/Network/GRPC/Unsafe/Slice.chs b/core/src/Network/GRPC/Unsafe/Slice.chs similarity index 100% rename from lowlevel/src/Network/GRPC/Unsafe/Slice.chs rename to core/src/Network/GRPC/Unsafe/Slice.chs diff --git a/lowlevel/src/Network/GRPC/Unsafe/Time.chs b/core/src/Network/GRPC/Unsafe/Time.chs similarity index 100% rename from lowlevel/src/Network/GRPC/Unsafe/Time.chs rename to core/src/Network/GRPC/Unsafe/Time.chs diff --git a/lowlevel/tests/LowLevelTests.hs b/core/tests/LowLevelTests.hs similarity index 100% rename from lowlevel/tests/LowLevelTests.hs rename to core/tests/LowLevelTests.hs diff --git a/lowlevel/tests/LowLevelTests/Op.hs b/core/tests/LowLevelTests/Op.hs similarity index 100% rename from lowlevel/tests/LowLevelTests/Op.hs rename to core/tests/LowLevelTests/Op.hs diff --git a/lowlevel/tests/Properties.hs b/core/tests/Properties.hs similarity index 100% rename from lowlevel/tests/Properties.hs rename to core/tests/Properties.hs diff --git a/lowlevel/tests/UnsafeTests.hs b/core/tests/UnsafeTests.hs similarity index 100% rename from lowlevel/tests/UnsafeTests.hs rename to core/tests/UnsafeTests.hs diff --git a/lowlevel/tests/ssl/generate-cert.sh b/core/tests/ssl/generate-cert.sh similarity index 100% rename from lowlevel/tests/ssl/generate-cert.sh rename to core/tests/ssl/generate-cert.sh diff --git a/lowlevel/tests/ssl/localhost.crt b/core/tests/ssl/localhost.crt similarity index 100% rename from lowlevel/tests/ssl/localhost.crt rename to core/tests/ssl/localhost.crt diff --git a/lowlevel/tests/ssl/localhost.key b/core/tests/ssl/localhost.key similarity index 100% rename from lowlevel/tests/ssl/localhost.key rename to core/tests/ssl/localhost.key diff --git a/grpc-haskell.cabal b/grpc-haskell.cabal index c89d95a..7c34cd0 100644 --- a/grpc-haskell.cabal +++ b/grpc-haskell.cabal @@ -33,7 +33,7 @@ library , transformers , proto3-suite , proto3-wire - , grpc-haskell-lowlevel + , grpc-haskell-core , async ==2.1.* , tasty >= 0.11 && <0.12 @@ -68,7 +68,7 @@ executable hellos-server , bytestring == 0.10.* , containers ==0.5.* , grpc-haskell - , grpc-haskell-lowlevel + , grpc-haskell-core , proto3-suite , proto3-wire , text @@ -88,7 +88,7 @@ executable hellos-client , bytestring == 0.10.* , containers ==0.5.* , grpc-haskell - , grpc-haskell-lowlevel + , grpc-haskell-core , proto3-suite , proto3-wire , text @@ -108,7 +108,7 @@ executable echo-server , bytestring == 0.10.* , containers ==0.5.* , grpc-haskell - , grpc-haskell-lowlevel + , grpc-haskell-core , optparse-generic , proto3-suite , proto3-wire @@ -132,7 +132,7 @@ executable arithmetic-server , bytestring == 0.10.* , containers ==0.5.* , grpc-haskell - , grpc-haskell-lowlevel + , grpc-haskell-core , optparse-generic , proto3-suite , proto3-wire @@ -155,7 +155,7 @@ executable arithmetic-client , bytestring == 0.10.* , containers ==0.5.* , grpc-haskell - , grpc-haskell-lowlevel + , grpc-haskell-core , optparse-generic , proto3-suite , proto3-wire @@ -178,7 +178,7 @@ executable echo-client , bytestring == 0.10.* , containers ==0.5.* , grpc-haskell - , grpc-haskell-lowlevel + , grpc-haskell-core , optparse-generic , proto3-suite , proto3-wire diff --git a/lowlevel/grpc-wtf.log b/lowlevel/grpc-wtf.log deleted file mode 100644 index 0295bfe..0000000 --- a/lowlevel/grpc-wtf.log +++ /dev/null @@ -1,100 +0,0 @@ -these derivations will be built: - /nix/store/ds475dvh1kyjvvvxyqwnlpk3wda8vp15-grpc-haskell-0.0.0.0.drv - /nix/store/9psg2p0cj48iyyqz8gyapzgd958iq2gx-ghc-8.0.2-with-packages.drv -building path(s) ‘/nix/store/l0jccwz2422mkh40w7c092cxq5xpifg5-grpc-haskell-0.0.0.0’ -setupCompilerEnvironmentPhase -Build with /nix/store/hg0ppf88q1rw0q7x3zqhlxbnviq0ddcg-ghc-8.0.2. -unpacking sources -unpacking source archive /nix/store/icbw54842rh6pppwinamf4mq9y8pyk7n-gRPC-haskell -source root is gRPC-haskell -patching sources -compileBuildDriverPhase -setupCompileFlags: -package-db=/tmp/nix-build-grpc-haskell-0.0.0.0.drv-0/package.conf.d -j4 -threaded -[1 of 1] Compiling Main ( Setup.hs, /tmp/nix-build-grpc-haskell-0.0.0.0.drv-0/Main.o ) -Linking Setup ... -configuring -configureFlags: --verbose --prefix=/nix/store/l0jccwz2422mkh40w7c092cxq5xpifg5-grpc-haskell-0.0.0.0 --libdir=$prefix/lib/$compiler --libsubdir=$pkgid --with-gcc=gcc --package-db=/tmp/nix-build-grpc-haskell-0.0.0.0.drv-0/package.conf.d --ghc-option=-optl=-Wl,-rpath=/nix/store/l0jccwz2422mkh40w7c092cxq5xpifg5-grpc-haskell-0.0.0.0/lib/ghc-8.0.2/grpc-haskell-0.0.0.0 --ghc-option=-j4 --disable-split-objs --disable-library-profiling --disable-profiling --enable-shared --disable-coverage --enable-library-vanilla --enable-executable-dynamic --disable-tests --ghc-option=-split-sections --extra-include-dirs=/nix/store/ajvhxxnnx0xiajn0n4vls7v3v29bbmjm-grpc-1.2.0-e2cfe9d/include --extra-lib-dirs=/nix/store/ajvhxxnnx0xiajn0n4vls7v3v29bbmjm-grpc-1.2.0-e2cfe9d/lib -Configuring grpc-haskell-0.0.0.0... -Flags chosen: with-examples=False, debug=False -Dependency async ==2.1.*: using async-2.1.1 -Dependency base >=4.8 && <5.0: using base-4.9.1.0 -Dependency bytestring ==0.10.*: using bytestring-0.10.8.1 -Dependency clock >=0.6.0 && <0.8.0: using clock-0.7.2 -Dependency containers ==0.5.*: using containers-0.5.7.1 -Dependency managed >=1.0.0 && <1.1: using managed-1.0.5 -Dependency pipes >=4.1 && <=4.4: using pipes-4.3.2 -Dependency proto3-suite -any: using proto3-suite-0.1.0.0 -Dependency proto3-wire -any: using proto3-wire-1.0.0 -Dependency safe ==0.3.*: using safe-0.3.14 -Dependency sorted-list >=0.1.6.1 && <=0.3: using sorted-list-0.2.0.0 -Dependency stm ==2.4.*: using stm-2.4.4.1 -Dependency tasty ==0.11.*: using tasty-0.11.2 -Dependency tasty-hunit ==0.9.*: using tasty-hunit-0.9.2 -Dependency tasty-quickcheck >=0.8.4 && <0.9: using tasty-quickcheck-0.8.4 -Dependency transformers -any: using transformers-0.5.2.0 -Dependency vector -any: using vector-0.11.0.0 -Using Cabal-1.24.2.0 compiled by ghc-8.0 -Using compiler: ghc-8.0.2 -Using install prefix: -/nix/store/l0jccwz2422mkh40w7c092cxq5xpifg5-grpc-haskell-0.0.0.0 -Binaries installed in: -/nix/store/l0jccwz2422mkh40w7c092cxq5xpifg5-grpc-haskell-0.0.0.0/bin -Libraries installed in: -/nix/store/l0jccwz2422mkh40w7c092cxq5xpifg5-grpc-haskell-0.0.0.0/lib/ghc-8.0.2/grpc-haskell-0.0.0.0 -Dynamic libraries installed in: -/nix/store/l0jccwz2422mkh40w7c092cxq5xpifg5-grpc-haskell-0.0.0.0/lib/ghc-8.0.2/x86_64-linux-ghc-8.0.2 -Private binaries installed in: -/nix/store/l0jccwz2422mkh40w7c092cxq5xpifg5-grpc-haskell-0.0.0.0/libexec -Data files installed in: -/nix/store/l0jccwz2422mkh40w7c092cxq5xpifg5-grpc-haskell-0.0.0.0/share/x86_64-linux-ghc-8.0.2/grpc-haskell-0.0.0.0 -Documentation installed in: -/nix/store/l0jccwz2422mkh40w7c092cxq5xpifg5-grpc-haskell-0.0.0.0/share/doc/x86_64-linux-ghc-8.0.2/grpc-haskell-0.0.0.0 -Configuration files installed in: -/nix/store/l0jccwz2422mkh40w7c092cxq5xpifg5-grpc-haskell-0.0.0.0/etc -No alex found -Using ar found on system at: -/nix/store/p6wcdqa2ks82xq7d4d5019drrjxlqrdj-binutils-2.27/bin/ar -Using c2hs version 0.28.1 found on system at: -/nix/store/rm05q3q5igssqy6qvqzaxz1y1fnxf47m-c2hs-0.28.1/bin/c2hs -No cpphs found -Using gcc version 5.4.0 given by user at: -/nix/store/r54jv402shjggj3fn2dy895iycy3afxi-gcc-wrapper-5.4.0/bin/gcc -Using ghc version 8.0.2 found on system at: -/nix/store/hg0ppf88q1rw0q7x3zqhlxbnviq0ddcg-ghc-8.0.2/bin/ghc -Using ghc-pkg version 8.0.2 found on system at: -/nix/store/hg0ppf88q1rw0q7x3zqhlxbnviq0ddcg-ghc-8.0.2/bin/ghc-pkg -No ghcjs found -No ghcjs-pkg found -No greencard found -Using haddock version 2.17.3 found on system at: -/nix/store/hg0ppf88q1rw0q7x3zqhlxbnviq0ddcg-ghc-8.0.2/bin/haddock -No happy found -Using haskell-suite found on system at: haskell-suite-dummy-location -Using haskell-suite-pkg found on system at: haskell-suite-pkg-dummy-location -No hmake found -Using hpc version 0.67 found on system at: -/nix/store/hg0ppf88q1rw0q7x3zqhlxbnviq0ddcg-ghc-8.0.2/bin/hpc -Using hsc2hs version 0.68.1 found on system at: -/nix/store/hg0ppf88q1rw0q7x3zqhlxbnviq0ddcg-ghc-8.0.2/bin/hsc2hs -Using hscolour version 1.24 found on system at: -/nix/store/bgcks3g9g5nqpgnvbfgri8pynmm3sks9-hscolour-1.24.1/bin/HsColour -No jhc found -Using ld found on system at: -/nix/store/r54jv402shjggj3fn2dy895iycy3afxi-gcc-wrapper-5.4.0/bin/ld -No lhc found -No lhc-pkg found -No pkg-config found -Using strip version 2.27 found on system at: -/nix/store/p6wcdqa2ks82xq7d4d5019drrjxlqrdj-binutils-2.27/bin/strip -Using tar found on system at: -/nix/store/rhjsykhxrzj3ca8da6b4g6v1yx53xpi3-gnutar-1.29/bin/tar -No uhc found -building -Building grpc-haskell-0.0.0.0... -Preprocessing library grpc-haskell-0.0.0.0... -Setup: can't find source for Network/GRPC/Unsafe/Constants in src, -dist/build/autogen -builder for ‘/nix/store/ds475dvh1kyjvvvxyqwnlpk3wda8vp15-grpc-haskell-0.0.0.0.drv’ failed with exit code 1 -cannot build derivation ‘/nix/store/9psg2p0cj48iyyqz8gyapzgd958iq2gx-ghc-8.0.2-with-packages.drv’: 1 dependencies couldn't be built -error: build of ‘/nix/store/9psg2p0cj48iyyqz8gyapzgd958iq2gx-ghc-8.0.2-with-packages.drv’ failed -/home/clavoie/.nix-profile/bin/nix-shell: failed to build all dependencies diff --git a/stack.yaml b/stack.yaml index 1467d16..6777237 100644 --- a/stack.yaml +++ b/stack.yaml @@ -6,8 +6,8 @@ resolver: lts-8.23 # Local packages, usually specified by relative directory name packages: -- 'lowlevel' - '.' +- 'core' - location: git: git@github.com:awakenetworks/proto3-suite.git commit: 97c4f66c8972416cca8b0bd1d9b307863bbc82e2 diff --git a/tests/tmp/Main.hi b/tests/tmp/Main.hi index 980e587..9426d30 100644 Binary files a/tests/tmp/Main.hi and b/tests/tmp/Main.hi differ diff --git a/tests/tmp/Simple.hi b/tests/tmp/Simple.hi index 477372e..7bc5a64 100644 Binary files a/tests/tmp/Simple.hi and b/tests/tmp/Simple.hi differ diff --git a/tests/tmp/simple-client b/tests/tmp/simple-client index 401fb27..71d7b37 100755 Binary files a/tests/tmp/simple-client and b/tests/tmp/simple-client differ diff --git a/tests/tmp/simple-server b/tests/tmp/simple-server index 887d6f0..21e1d99 100755 Binary files a/tests/tmp/simple-server and b/tests/tmp/simple-server differ