diff options
| author | Maximilian Bosch <maximilian@mbosch.me> | 2020-08-22 23:34:20 +0200 |
|---|---|---|
| committer | Maximilian Bosch <maximilian@mbosch.me> | 2020-09-08 19:18:00 +0200 |
| commit | 060c35478cca9e3e1922c8a1c33d33d2748ec860 (patch) | |
| tree | c863d27243fe04d827d7b309e1c79cb55445acd4 | |
| parent | libvirt_5_9_0: fix build w/glibc-2.32 (diff) | |
| download | nixpkgs-origin/glibc232.tar.gz | |
python3Packages.python-engineio: 3.13.0 -> 3.13.2, fix build w/glibc-2.32origin/glibc232
ChangeLog: https://github.com/miguelgrinberg/python-engineio/blob/v3.13.2/CHANGES.md#python-engineio-change-log
Also had to wrap `__nss_files_fopen` in `libredirect` as this is the way
now `nss` uses to retrieve file-databases[1].
[1] https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=299210c1fa67e2dfb564475986fce11cd33db9ad;hp=469c03907b116c37c98d8ad7a9edac2bdbf3e934
| -rw-r--r-- | pkgs/build-support/libredirect/libredirect.c | 7 | ||||
| -rw-r--r-- | pkgs/development/python-modules/python-engineio/default.nix | 6 |
2 files changed, 11 insertions, 2 deletions
diff --git a/pkgs/build-support/libredirect/libredirect.c b/pkgs/build-support/libredirect/libredirect.c index e7f74c736ab0..c8d6956a6bfe 100644 --- a/pkgs/build-support/libredirect/libredirect.c +++ b/pkgs/build-support/libredirect/libredirect.c @@ -121,6 +121,13 @@ FILE * fopen(const char * path, const char * mode) return fopen_real(rewrite(path, buf), mode); } +FILE * __nss_files_fopen(const char * path) +{ + FILE * (*__nss_files_fopen_real) (const char *) = dlsym(RTLD_NEXT, "__nss_files_fopen"); + char buf[PATH_MAX]; + return __nss_files_fopen_real(rewrite(path, buf)); +} + FILE * fopen64(const char * path, const char * mode) { FILE * (*fopen64_real) (const char *, const char *) = dlsym(RTLD_NEXT, "fopen64"); diff --git a/pkgs/development/python-modules/python-engineio/default.nix b/pkgs/development/python-modules/python-engineio/default.nix index 1c48cfa6c66b..d3cdda0f838c 100644 --- a/pkgs/development/python-modules/python-engineio/default.nix +++ b/pkgs/development/python-modules/python-engineio/default.nix @@ -9,17 +9,18 @@ , tornado , websocket_client , websockets +, pytest }: buildPythonPackage rec { pname = "python-engineio"; - version = "3.13.0"; + version = "3.13.2"; src = fetchFromGitHub { owner = "miguelgrinberg"; repo = "python-engineio"; rev = "v${version}"; - sha256 = "1fgfrgcvjg3fyza5lhl1l9cfq073xrwwhh3xs178csrjz4s8s378"; + sha256 = "1hn5nnxp7y2dpf52vrwdxza2sqmzj8admcnwgjkmcxk65s2dhvy1"; }; propagatedBuildInputs = [ @@ -34,6 +35,7 @@ buildPythonPackage rec { tornado websocket_client websockets + pytest ]; # make /etc/protocols accessible to fix socket.getprotobyname('tcp') in sandbox |