mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-08-25 17:55:21 +00:00
Merge master into staging-next
This commit is contained in:
@@ -8,13 +8,13 @@ let
|
||||
mpi = hdf5.mpi;
|
||||
mpiSupport = hdf5.mpiSupport;
|
||||
in buildPythonPackage rec {
|
||||
version = "3.1.0";
|
||||
version = "3.2.1";
|
||||
pname = "h5py";
|
||||
disabled = isPy27;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1e2516f190652beedcb8c7acfa1c6fa92d99b42331cbef5e5c7ec2d65b0fc3c2";
|
||||
sha256 = "sha256-iUdL6RG/zbNMvw2YuOxItXjCeon9sa5O51E/HvjZJJ4=";
|
||||
};
|
||||
|
||||
# avoid strict pinning of numpy
|
||||
@@ -49,6 +49,7 @@ in buildPythonPackage rec {
|
||||
meta = with lib; {
|
||||
description = "Pythonic interface to the HDF5 binary data format";
|
||||
homepage = "http://www.h5py.org/";
|
||||
license = licenses.bsd2;
|
||||
license = licenses.bsd3;
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -22,13 +22,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "labgrid";
|
||||
version = "0.3.2";
|
||||
version = "0.3.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "labgrid-project";
|
||||
repo = "labgrid";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-wMYsgZXNP8kTt/x8c4e96BXrbjIZZ6RsH04BfD0zGwo=";
|
||||
sha256 = "03dg0c5vahrdj1153pmd4653hjisq3cc6niqnwayjx5pjb15ikxk";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -10,12 +10,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyturbojpeg";
|
||||
version = "1.4.1";
|
||||
version = "1.4.2";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "PyTurboJPEG";
|
||||
inherit version;
|
||||
sha256 = "09688a93331281e566569b4d313e1d1a058ca32ccae1a2473847a10e4ca2f2a7";
|
||||
sha256 = "sha256-dWmj/huCkborcShf2BT+L3ybEfgdKVIGiJnkz755xwo=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -7,11 +7,11 @@
|
||||
# required for home-assistant
|
||||
buildPythonPackage rec {
|
||||
pname = "speedtest-cli";
|
||||
version = "2.1.2";
|
||||
version = "2.1.3";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0m1fpsb318mrpliw026a7nhx8iky306rmfi565734k7r49i3h7fg";
|
||||
sha256 = "1w4h7m0isbvfy4zx6m5j4594p5y4pjbpzsr0h4yzmdgd7hip69sy";
|
||||
};
|
||||
|
||||
# tests require working internet connection
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "twitterapi";
|
||||
version = "2.6.8";
|
||||
version = "2.6.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "geduldig";
|
||||
repo = "TwitterAPI";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-X/j+3bWLQ9b4q0k/JTE984o1VZS0KTQnC0AdZpNsksY=";
|
||||
sha256 = "sha256-ylxjeIK9cjT4r71j+sULYs6yyYWfKDkpm0bESMo7s3o=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
Reference in New Issue
Block a user