lol
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

pythonPackages.cairocffi: v1.0.2 -> v.1.1.0

The tests were failing due the switch to pytest5.
This issue has been addressed upstream in
https://github.com/Kozea/cairocffi/commit/a500f208660ba9861828a2a92b32c33565ee18fd
which is included in v.1.1.0, so bumping the version and
updating the old patch.

Hydra log of the failure:
https://hydra.nixos.org/build/100785460/nixlog/6

Dima 7ff2638b 980a3092

+46 -31
+2 -2
pkgs/development/python-modules/cairocffi/default.nix
··· 19 19 }@args: 20 20 21 21 import ./generic.nix ({ 22 - version = "1.0.2"; 23 - sha256 = "01ac51ae12c4324ca5809ce270f9dd1b67f5166fe63bd3e497e9ea3ca91946ff"; 22 + version = "1.1.0"; 23 + sha256 = "1nq53f5jipgy9jgyfxp43j40qfbmrhgn1cj8bp5rrb3liy3wbh7i"; 24 24 dlopen_patch = ./dlopen-paths.patch; 25 25 disabled = pythonOlder "3.5"; 26 26 inherit withXcffib;
+44 -29
pkgs/development/python-modules/cairocffi/dlopen-paths.patch
··· 1 - commit 0435bc2577d4b18f54b78b2f5185abb2b2005982 2 - Author: Alexander V. Nikolaev <avn@avnik.info> 3 - Date: Sat Feb 6 08:09:06 2016 +0200 1 + Patch dlopen() to allow direct paths to all required libs 4 2 5 - Patch dlopen() to allow direct paths to all required libs 3 + This is an update of the patch submitted in 4 + https://github.com/NixOS/nixpkgs/commit/b13e44e094989d3a902f8c73b22e8d3c0cc7acf4 5 + by Alexander V. Nikolaev <avn@avnik.info> 6 6 7 - This patch is NixOS specific 7 + --- 8 + cairocffi/__init__.py | 34 ++++++++++++++++------------------ 9 + 1 file changed, 16 insertions(+), 18 deletions(-) 8 10 9 11 diff --git a/cairocffi/__init__.py b/cairocffi/__init__.py 10 - index 6061973..3538a58 100644 12 + index 307d58c..43c29e3 100644 11 13 --- a/cairocffi/__init__.py 12 14 +++ b/cairocffi/__init__.py 13 - @@ -21,19 +21,22 @@ VERSION = __version__ = (Path(__file__).parent / 'VERSION').read_text().strip() 14 - version = '1.16.0' 15 - version_info = (1, 16, 0) 15 + @@ -21,28 +21,26 @@ VERSION = __version__ = (Path(__file__).parent / 'VERSION').read_text().strip() 16 + version = '1.17.2' 17 + version_info = (1, 17, 2) 16 18 17 - +# Use hardcoded soname, because ctypes.util use gcc/objdump which shouldn't be required for runtime 19 + +# Use hardcoded soname, because ctypes.util use gcc/objdump which shouldn't be 20 + +# required for runtime 18 21 +_LIBS = { 19 22 + 'cairo': '@cairo@/lib/libcairo@ext@', 20 23 + 'glib-2.0': '@glib@/lib/libglib-2.0@ext@', 21 24 + 'gobject-2.0': '@glib@/lib/libgobject-2.0@ext@', 22 25 + 'gdk_pixbuf-2.0': '@gdk_pixbuf@/lib/libgdk_pixbuf-2.0@ext@', 23 26 +} 27 + + 24 28 25 - -def dlopen(ffi, *names): 26 - +def dlopen(ffi, name, *names): 29 + def dlopen(ffi, library_names, filenames): 27 30 """Try various names for the same library, for different platforms.""" 28 - - for name in names: 29 - - for lib_name in (name, 'lib' + name): 30 - - try: 31 - - path = ctypes.util.find_library(lib_name) 32 - - lib = ffi.dlopen(path or lib_name) 33 - - if lib: 34 - - return lib 35 - - except OSError: 36 - - pass 37 - - raise OSError("dlopen() failed to load a library: %s" % ' / '.join(names)) 38 - + path = _LIBS.get(name, None) 39 - + if path: 40 - + lib = ffi.dlopen(path) 41 - + if lib: 42 - + return lib 43 - + raise OSError("dlopen() failed to load a library: %s as %s" % (name, path)) 31 + - exceptions = [] 32 + - 33 + for library_name in library_names: 34 + - library_filename = find_library(library_name) 35 + - if library_filename: 36 + - filenames = (library_filename,) + filenames 37 + - else: 38 + - exceptions.append( 39 + - 'no library called "{}" was found'.format(library_name)) 40 + - 41 + - for filename in filenames: 42 + - try: 43 + - return ffi.dlopen(filename) 44 + - except OSError as exception: # pragma: no cover 45 + - exceptions.append(exception) 46 + - 47 + - error_message = '\n'.join( # pragma: no cover 48 + - str(exception) for exception in exceptions) 49 + - raise OSError(error_message) # pragma: no cover 50 + + path = _LIBS.get(library_name, None) 51 + + if path: 52 + + lib = ffi.dlopen(path) 53 + + if lib: 54 + + return lib 55 + + 56 + + raise OSError("dlopen() failed to load a library: %s as %s" % (library_name, path)) 44 57 45 58 46 - cairo = dlopen(ffi, 'cairo', 'cairo-2', 'cairo-gobject-2', 'cairo.so.2') 59 + cairo = dlopen( 60 + -- 61 + 2.19.2