This reverts commit c778945806.
I believe this is exactly what brings the staging branch into
the right shape after the last merge from master (through staging-next);
otherwise part of staging changes would be lost
(due to being already reachable from master but reverted).
This bumps odpic to 3.1.0 - with the current version in unstable,
python*Packages.cx_oracle fails to compile due to some types missing in
our version of odpic:
```
gcc -Wno-unused-result -Wsign-compare -DNDEBUG -g -fwrapv -O3 -Wall -fPIC -DCXO_BUILD_VERSION=7.0.0 -I/nix/store/43lwkzvxwcymshchqhhafr2rnw2kk8ll-odpic-2.4.2/include -I/nix/store/ydk0mfpvn9smcmn72wc9i20slv1d2b79-python3-3.7.2/include/python3.7m -c src/cxoBuffer.c -o build/temp.linux-x86_64-3.7/src/cxoBuffer.o
In file included from src/cxoBuffer.c:17:0:
src/cxoModule.h:372:5: error: unknown type name 'dpiSodaColl'
dpiSodaColl *handle;
^~~~~~~~~~~
src/cxoModule.h:379:5: error: unknown type name 'dpiSodaDb'
dpiSodaDb *handle;
^~~~~~~~~
src/cxoModule.h:386:5: error: unknown type name 'dpiSodaDoc'
dpiSodaDoc *handle;
^~~~~~~~~~
src/cxoModule.h:392:5: error: unknown type name 'dpiSodaDocCursor'
dpiSodaDocCursor *handle;
^~~~~~~~~~~~~~~~
src/cxoModule.h:398:5: error: unknown type name 'dpiSodaOperOptions'
dpiSodaOperOptions options;
^~~~~~~~~~~~~~~~~~
src/cxoModule.h:492:9: error: unknown type name 'dpiSodaColl'; did you mean 'dpiPool'?
dpiSodaColl *handle);
^~~~~~~~~~~
dpiPool
src/cxoModule.h:496:49: error: unknown type name 'dpiSodaDoc'; did you mean 'cxoSodaDoc'?
cxoSodaDoc *cxoSodaDoc_new(cxoSodaDatabase *db, dpiSodaDoc *handle);
^~~~~~~~~~
cxoSodaDoc
src/cxoModule.h:499:9: error: unknown type name 'dpiSodaDocCursor'; did you mean 'cxoSodaDocCursor'?
dpiSodaDocCursor *handle);
^~~~~~~~~~~~~~~~
cxoSodaDocCursor
```
