Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 58f02f269f72
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: cee73f524b95
Choose a head ref
  • 14 commits
  • 7 files changed
  • 6 contributors

Commits on May 17, 2018

  1. oracle-instantclient: move rpmextract and patchelf to nativeBuildInputs 

    (cherry picked from commit 276f289)
    @flokli
    flokli committed May 17, 2018
    Copy the full SHA
    5d8bc76 View commit details

  2. oracle-instantclient: remove unused arguments 

    (cherry picked from commit 0f4269b)
    @flokli
    flokli committed May 17, 2018
    Copy the full SHA
    5048d0f View commit details

  3. oracle-instantclient: prefix LD_LIBRARY_PATH 

    (cherry picked from commit ccb4558)
    @flokli
    flokli committed May 17, 2018
    Copy the full SHA
    4ff26da View commit details

  4. oracle-instantclient: patchelf and wrap adrci and genezi, too 

    (cherry picked from commit 7824c60)
    @flokli
    flokli committed May 17, 2018
    Copy the full SHA
    6304820 View commit details

  5. pythonPackages.cx_oracle: init at 6.1 

    (cherry picked from commit c936651)
    @flokli
    y0no authored and flokli committed May 17, 2018
    Copy the full SHA
    c16fd70 View commit details

  6. python: cx_Oracle: 6.1 -> 6.2.1 

    (cherry picked from commit c1932f5)
    @FRidh @flokli
    FRidh authored and flokli committed May 17, 2018
    Copy the full SHA
    0e56c7b View commit details

  7. pythonPackages.cx_oracle: 6.2.1 -> 6.3.1 

    (cherry picked from commit a88354d)
    @flokli
    flokli committed May 17, 2018
    Copy the full SHA
    b6bf5bc View commit details

  8. pythonPackages.cx_oracle: fix dlopen 

    previously, $ORACLE_HOME had to be set for each python script using this
library.

We now patch odpi to load libclntsh.so from oracle-instantclient if
$ORACLE_HOME was not provided.

(cherry picked from commit 639f795)
    @flokli
    flokli committed May 17, 2018
    Copy the full SHA
    311c44c View commit details

Commits on May 22, 2018

  1. oracle-instantclient: add flokli as maintainer 

    (cherry picked from commit 82eaa5b)
    @flokli
    flokli committed May 22, 2018
    Copy the full SHA
    7fbdb82 View commit details

  2. oracle-instantclient: simplify, use autoPatchelfHook 

    Split `buildCommand`, provide `unpackCmd` and add `installPhase`.

Use autoPatchelfHook, we can get rid of all the manual hacking around
with patchelf.

Use install to install to $out

(cherry picked from commit fe56ad7)
    @flokli
    flokli committed May 22, 2018
    Copy the full SHA
    741316d View commit details

  3. oracle-instantclient: disable building on hydra 

    we requireFile, so hydra can't build it anyways.

(cherry picked from commit 9770699)
    @flokli
    flokli committed May 22, 2018
    Copy the full SHA
    047c7ab View commit details

  4. Merge pull request #40695 from flokli/oracle-fixes-18.03 

    pythonPackages.cx_oracle: fix dlopen, patchelf and fix library path for oracle-instantclient binaries
    @Mic92
    Mic92 authored May 22, 2018
    Copy the full SHA
    daebac6 View commit details

  5. networking.routes: static routes are proto static 

    (cherry picked from commit a32b6d5)
    @globin
    globin committed May 22, 2018
    Copy the full SHA
    99d5d5f View commit details

  6. nix: 2.0.1 -> 2.0.2 

    (cherry picked from commit 9d0b6b9)
    @edolstra @globin
    edolstra authored and globin committed May 22, 2018
    Copy the full SHA
    cee73f5 View commit details
Loading