Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
base: 4aa259290505
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 49d46a41d6fa
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Feb 1, 2019

  1. odpic: 2.4.2 -> 3.1.0

    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
    ```
    flokli committed Feb 1, 2019
    Copy the full SHA
    1bbad11 View commit details
    Browse the repository at this point in the history

Commits on Feb 11, 2019

  1. Merge pull request #55049 from flokli/odpic-3.1.0

    odpic: 2.4.2 -> 3.1.0
    flokli committed Feb 11, 2019
    Copy the full SHA
    49d46a4 View commit details
    Browse the repository at this point in the history