Merge master into staging-next

This commit is contained in:
Frederik Rietdijk
2020-02-29 15:29:11 +01:00
124 changed files with 14588 additions and 19752 deletions
@@ -25,11 +25,11 @@ let
package = buildPythonPackage rec {
pname = "buildbot";
version = "2.6.0";
version = "2.7.0";
src = fetchPypi {
inherit pname version;
sha256 = "1l3ajhy68jddbgbizaa5hq65lgqkll6389hss4p2j36cbxbn7hiv";
sha256 = "0jj8fh611n7xc3vsfbgpqsllp38cfj3spkr2kz3ara2x7jvh3406";
};
propagatedBuildInputs = [
@@ -1,7 +1,7 @@
{ stdenv, buildPythonPackage, pythonOlder, fetchFromGitHub, pyparsing, pytest }:
buildPythonPackage rec {
version = "0.9";
version = "0.11";
pname = "ezdxf";
disabled = pythonOlder "3.5";
@@ -10,7 +10,7 @@ buildPythonPackage rec {
owner = "mozman";
repo = "ezdxf";
rev = "v${version}";
sha256 = "1ggimjd9060b696sgzgxy9j9sl45wh9qbxnf0035qclafshprlzl";
sha256 = "167iw1j1c6195bwv6i8z1m7s0i27r0y0acxd2w76hvnq3a72jbsd";
};
checkInputs = [ pytest ];
@@ -20,7 +20,7 @@ buildPythonPackage rec {
meta = with stdenv.lib; {
description = "Python package to read and write DXF drawings (interface to the DXF file format)";
homepage = https://github.com/mozman/ezdxf/;
homepage = "https://github.com/mozman/ezdxf/";
license = licenses.mit;
maintainers = with maintainers; [ hodapp ];
platforms = platforms.unix;
@@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "gphoto2";
version = "2.0.0";
version = "2.1.0";
src = fetchPypi {
inherit pname version;
sha256 = "01vcbjsy5zpfd9rzshk2d6150vhb66m5n420j0wd0k0i0p74ya98";
sha256 = "1fdmlyy3lbc6ggfn60fjizaz5icxd676y7gz9nzfy3l4id7mfyk4";
};
nativeBuildInputs = [ pkgconfig ];
@@ -19,7 +19,7 @@ buildPythonPackage rec {
meta = with stdenv.lib; {
description = "Python interface to libgphoto2";
homepage = https://github.com/jim-easterbrook/python-gphoto2;
homepage = "https://github.com/jim-easterbrook/python-gphoto2";
license = licenses.gpl3;
maintainers = with maintainers; [ jfrankenau ];
};