MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 15:22:59 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #17716 from teh/master

Browse source 
Add libdynd and dynd-python
This commit is contained in:
Frederik Rietdijk 2016-08-14 13:53:59 +02:00 committed by GitHub
commit 53c6d4827b
3 changed files with 64 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
pkgs/development/libraries/libdynd/default.nix Normal file
View file

@ -0,0 +1,28 @@
{ stdenv, fetchFromGitHub, cmake }:
let version = "0.7.2"; in
stdenv.mkDerivation {
name = "libdynd-${version}";
src = fetchFromGitHub {
owner = "libdynd";
repo = "libdynd";
rev = "v${version}";
sha256 = "0fkd5rawqni1cq51fmr76iw7ll4fmbahfwv4rglnsabbkylf73pr";
};
cmakeFlags = [
"-DDYND_BUILD_BENCHMARKS=OFF"
];
buildInputs = [ cmake ];
outputs = [ "dev" "out" ];
outputDoc = "dev";
meta = with stdenv.lib; {
description = "C++ dynamic ndarray library, with Python exposure.";
homepage = http://libdynd.org;
license = licenses.bsd2;
};
}

4
pkgs/top-level/all-packages.nix
View file

@ -1530,7 +1530,7 @@ in
hangul = callPackage ../tools/inputmethods/fcitx-engines/fcitx-hangul { };
unikey = callPackage ../tools/inputmethods/fcitx-engines/fcitx-unikey { };
m17n = callPackage ../tools/inputmethods/fcitx-engines/fcitx-m17n { };
mozc = callPackage ../tools/inputmethods/fcitx-engines/fcitx-mozc {
@ -9804,6 +9804,8 @@ in
fetchurl = fetchurlBoot;
};
libdynd = callPackage ../development/libraries/libdynd { };
zlog = callPackage ../development/libraries/zlog { };
zlibStatic = lowPrio (appendToName "static" (callPackage ../development/libraries/zlib {

33
pkgs/top-level/python-packages.nix
View file

@ -14848,6 +14848,39 @@ in modules // {
};
};
dynd = buildPythonPackage rec {
version = "0.7.2";
name = "dynd-${version}";
disabled = isPyPy;
src = pkgs.fetchFromGitHub {
owner = "libdynd";
repo = "dynd-python";
rev = "v${version}";
sha256 = "19igd6ibf9araqhq9bxmzbzdz05vp089zxvddkiik3b5gb7l17nh";
};
# setup.py invokes git on build but we're fetching a tarball, so
# can't retrieve git version. We hardcode:
preConfigure = ''
substituteInPlace setup.py --replace "ver = check_output(['git', 'describe', '--dirty'," "ver = '${version}'"
substituteInPlace setup.py --replace "'--always', '--match', 'v*']).decode('ascii').strip('\n')" ""
'';
# Python 3 works but has a broken import test that I couldn't
# figure out.
doCheck = !isPy3k;
buildInputs = with pkgs; [ cmake libdynd.dev self.cython ];
propagatedBuildInputs = with self; [ numpy pkgs.libdynd ];
meta = {
homepage = http://libdynd.org;
license = licenses.bsd2;
description = "Python exposure of dynd";
maintainers = with maintainers; [ teh ];
};
};
livestreamer = buildPythonPackage rec {
version = "1.12.2";
name = "livestreamer-${version}";