Skip to content

Commit

Permalink
libxnd, pythonPackages.xnd: unstable-2018-11-27 -> unstable-2019-08-01
Browse files Browse the repository at this point in the history
this is the most recent commit to upstream's master at time of writing

includes fixes of python package for darwin
  • Loading branch information
risicle authored and Jon committed Sep 20, 2020
1 parent 044533c commit dcd6847
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 5 deletions.
16 changes: 12 additions & 4 deletions pkgs/development/libraries/libxnd/default.nix
Expand Up @@ -6,13 +6,13 @@

stdenv.mkDerivation {
pname = "libxnd";
version = "unstable-2018-11-27";
version = "unstable-2019-08-01";

src = fetchFromGitHub {
owner = "plures";
owner = "xnd-project";
repo = "xnd";
rev = "8a9f3bd1d01d872828b40bc9dbd0bc0184524da3";
sha256 = "10jh2kqvhpzwy50adayh9az7z2lm16yxy4flrh99alzzbqdyls44";
rev = "6f305cd40d90b4f3fc2fe51ae144b433d186a6cc";
sha256 = "1n31d64qwlc7m3qkzbafhp0dgrvgvkdx89ykj63kll7r1n3yk59y";
};

buildInputs = [ libndtypes ];
Expand All @@ -28,6 +28,14 @@ stdenv.mkDerivation {
"--with-libs=${libndtypes}/lib"
];

# other packages which depend on libxnd seem to expect overflow.h, but
# it doesn't seem to be included in the installed headers. for now this
# works, but the generic name of the header could produce problems
# with collisions down the line.
postInstall = ''
cp libxnd/overflow.h $out/include/overflow.h
'';

doCheck = true;

meta = {
Expand Down
13 changes: 12 additions & 1 deletion pkgs/development/python-modules/xnd/default.nix
@@ -1,4 +1,6 @@
{ buildPythonPackage
{ stdenv
, buildPythonPackage
, python
, ndtypes
, libndtypes
, libxnd
Expand All @@ -25,5 +27,14 @@ buildPythonPackage {
postInstall = ''
mkdir $out/include
cp python/xnd/*.h $out/include
'' + stdenv.lib.optionalString stdenv.isDarwin ''
install_name_tool -add_rpath ${libxnd}/lib $out/${python.sitePackages}/xnd/_xnd.*.so
'';

checkPhase = ''
pushd python
mv xnd _xnd
python test_xnd.py
popd
'';
}

0 comments on commit dcd6847

Please sign in to comment.