git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #79235 from goertzenator/add_vispy

vispy: init at 0.6.4

commit1be9aa3a830cb131025217e7fe7e122ad03a2f36 authoradisbladis <adisbladis@gmail.com> dateTue 21 Jul 2020, 21:37 (6 years ago) parentcfcc6305f57e9f
6 files changed+157
maintainers/maintainer-list.nix+6 pkgs/development/python-modules/freetype-py/default.nix+31 pkgs/development/python-modules/freetype-py/library-paths.patch+37 pkgs/development/python-modules/vispy/default.nix+40 pkgs/development/python-modules/vispy/library-paths.patch+39 pkgs/top-level/python-packages.nix+4
maintainers/maintainer-list.nix+6
@@ -3064,6 +3064,12 @@
30643064 githubId = 25820499;
30653065 name = "Roman Kretschmer";
30663066 };
3067+ goertzenator = {
3068+ email = "daniel.goertzen@gmail.com";
3069+ github = "goertzenator";
3070+ githubId = 605072;
3071+ name = "Daniel Goertzen";
3072+ };
30673073 goibhniu = {
30683074 email = "cillian.deroiste@gmail.com";
30693075 github = "cillianderoiste";
pkgs/development/python-modules/freetype-py/default.nixnew file+31
@@ -0,0 +1,31 @@
1+{ lib, buildPythonPackage, fetchPypi, substituteAll, stdenv, setuptools_scm, freetype }:
2+
3+buildPythonPackage rec {
4+ pname = "freetype-py";
5+ version = "2.1.0.post1";
6+
7+ src = fetchPypi {
8+ inherit pname version;
9+ sha256 = "1k62fx53qrv9nb73mpqi2r11wzbx41qfv5qppvh6rylywnrknf3n";
10+ };
11+
12+ patches = [
13+ (substituteAll {
14+ src = ./library-paths.patch;
15+ freetype = "${freetype.out}/lib/libfreetype${stdenv.hostPlatform.extensions.sharedLibrary}";
16+ })
17+ ];
18+
19+ nativeBuildInputs = [ setuptools_scm ];
20+
21+ propagatedBuildInputs = [ freetype ];
22+
23+ pythonImportsCheck = [ "freetype" ];
24+
25+ meta = with lib; {
26+ homepage = "https://github.com/rougier/freetype-py";
27+ description = "FreeType (high-level Python API)";
28+ license = licenses.bsd3;
29+ maintainers = with maintainers; [ goertzenator ];
30+ };
31+}
pkgs/development/python-modules/freetype-py/library-paths.patchnew file+37
@@ -0,0 +1,37 @@
1+diff --git a/freetype/raw.py b/freetype/raw.py
2+index ff3bea3..78c68ab 100644
3+--- a/freetype/raw.py
4++++ b/freetype/raw.py
5+@@ -19,31 +19,7 @@ from freetype.ft_enums import *
6+ from freetype.ft_errors import *
7+ from freetype.ft_structs import *
8+
9+-# First, look for a bundled FreeType shared object on the top-level of the
10+-# installed freetype-py module.
11+-system = platform.system()
12+-if system == 'Windows':
13+- library_name = 'libfreetype.dll'
14+-elif system == 'Darwin':
15+- library_name = 'libfreetype.dylib'
16+-else:
17+- library_name = 'libfreetype.so'
18+-
19+-filename = os.path.join(os.path.dirname(freetype.__file__), library_name)
20+-
21+-# If no bundled shared object is found, look for a system-wide installed one.
22+-if not os.path.exists(filename):
23+- # on windows all ctypes does when checking for the library
24+- # is to append .dll to the end and look for an exact match
25+- # within any entry in PATH.
26+- filename = ctypes.util.find_library('freetype')
27+-
28+- if filename is None:
29+- if platform.system() == 'Windows':
30+- # Check current working directory for dll as ctypes fails to do so
31+- filename = os.path.join(os.path.realpath('.'), "freetype.dll")
32+- else:
33+- filename = library_name
34++filename = "@freetype@"
35+
36+ try:
37+ _lib = ctypes.CDLL(filename)
pkgs/development/python-modules/vispy/default.nixnew file+40
@@ -0,0 +1,40 @@
1+{ lib, buildPythonPackage, substituteAll, stdenv,
2+ fetchPypi, numpy, cython, freetype-py, fontconfig, libGL,
3+ setuptools_scm, setuptools-scm-git-archive
4+ }:
5+
6+buildPythonPackage rec {
7+ pname = "vispy";
8+ version = "0.6.4";
9+
10+ src = fetchPypi {
11+ inherit pname version;
12+ sha256 = "07sb4qww6mgzm66qsrr3pd66yz39r6jj4ibb3qmfg1kwnxs6ayv2";
13+ };
14+
15+ patches = [
16+ (substituteAll {
17+ src = ./library-paths.patch;
18+ fontconfig = "${fontconfig.lib}/lib/libfontconfig${stdenv.hostPlatform.extensions.sharedLibrary}";
19+ gl = "${libGL.out}/lib/libGL${stdenv.hostPlatform.extensions.sharedLibrary}";
20+ })
21+ ];
22+
23+ nativeBuildInputs = [
24+ cython setuptools_scm setuptools-scm-git-archive
25+ ];
26+
27+ propagatedBuildInputs = [
28+ numpy freetype-py fontconfig libGL
29+ ];
30+
31+ doCheck = false; # otherwise runs OSX code on linux.
32+ pythonImportsCheck = [ "vispy" ];
33+
34+ meta = with lib; {
35+ homepage = "http://vispy.org/index.html";
36+ description = "Interactive scientific visualization in Python";
37+ license = licenses.bsd3;
38+ maintainers = with maintainers; [ goertzenator ];
39+ };
40+}
pkgs/development/python-modules/vispy/library-paths.patchnew file+39
@@ -0,0 +1,39 @@
1+diff --git a/vispy/ext/fontconfig.py b/vispy/ext/fontconfig.py
2+index ff24662b..6a5079f0 100644
3+--- a/vispy/ext/fontconfig.py
4++++ b/vispy/ext/fontconfig.py
5+@@ -7,10 +7,7 @@ from ..util.wrappers import run_subprocess
6+
7+ # Some code adapted from Pyglet
8+
9+-fc = util.find_library('fontconfig')
10+-if fc is None:
11+- raise ImportError('fontconfig not found')
12+-fontconfig = cdll.LoadLibrary(fc)
13++fontconfig = cdll.LoadLibrary('@fontconfig@')
14+
15+ FC_FAMILY = 'family'.encode('ASCII')
16+ FC_SIZE = 'size'.encode('ASCII')
17+diff --git a/vispy/gloo/gl/gl2.py b/vispy/gloo/gl/gl2.py
18+index d5bd9c38..63350e73 100644
19+--- a/vispy/gloo/gl/gl2.py
20++++ b/vispy/gloo/gl/gl2.py
21+@@ -39,16 +39,8 @@ elif sys.platform.startswith('win'):
22+ pass
23+ else:
24+ # Unix-ish
25+- if sys.platform.startswith('darwin'):
26+- _fname = ctypes.util.find_library('OpenGL')
27+- else:
28+- _fname = ctypes.util.find_library('GL')
29+- if not _fname:
30+- logger.warning('Could not load OpenGL library.')
31+- _lib = None
32+- else:
33+- # Load lib
34+- _lib = ctypes.cdll.LoadLibrary(_fname)
35++ # Load lib
36++ _lib = ctypes.cdll.LoadLibrary("@gl@")
37+
38+
39+ def _have_context():
pkgs/top-level/python-packages.nix+4
@@ -766,6 +766,8 @@ in {
766766
767767 foxdot = callPackage ../development/python-modules/foxdot { };
768768
769+ freetype-py = callPackage ../development/python-modules/freetype-py { };
770+
769771 fsspec = callPackage ../development/python-modules/fsspec { };
770772
771773 furl = callPackage ../development/python-modules/furl { };
@@ -6242,6 +6244,8 @@ in {
62426244
62436245 virtualenv = callPackage ../development/python-modules/virtualenv { };
62446246
6247+ vispy = callPackage ../development/python-modules/vispy { };
6248+
62456249 vsts = callPackage ../development/python-modules/vsts { };
62466250
62476251 vsts-cd-manager = callPackage ../development/python-modules/vsts-cd-manager { };