Merge remote-tracking branch 'upstream/master' into staging

Keep the dontCheck because the test suite fails, get rid of the LDFLAGS
hack because we don't need it!
This commit is contained in:
John Ericson
2018-05-16 15:16:08 -04:00
78 changed files with 2125 additions and 1081 deletions

View File

@@ -27,11 +27,11 @@
buildPythonPackage rec {
pname = "ipython";
version = "5.6.0";
version = "5.7.0";
src = fetchPypi {
inherit pname version;
sha256 = "00g696r9rk1c4p3sycnv7by55cp9mm7r6zkkdqbiw9l0mk8k58wb";
sha256 = "0g1jm06qriq48m58311cs7askp83ipq3yq96hv4kg431nxzkmd4d";
};
prePatch = stdenv.lib.optionalString stdenv.isDarwin ''

View File

@@ -0,0 +1,22 @@
{lib, fetchPypi, buildPythonPackage, numpy}:
buildPythonPackage rec {
pname = "uproot";
version = "2.8.23";
src = fetchPypi {
inherit pname version;
sha256 = "121ggyl5s0q66yrbdfznvzrc793zq1w2xnr3baadlzfvqdlkhgj7";
};
propagatedBuildInputs = [
numpy
];
meta = with lib; {
homepage = https://github.com/scikit-hep/uproot;
description = "ROOT I/O in pure Python and Numpy";
license = licenses.bsd3;
maintainers = with maintainers; [ ktf ];
};
}