Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2022-01-08 00:02:14 +00:00 committed by GitHub
commit 6e04bffb38
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 3 deletions

View file

@ -51,7 +51,6 @@ buildPythonPackage rec {
pythonImportsCheck = [
"hydra"
>>>>>>> origin/master
];
meta = with lib; {

View file

@ -12,13 +12,13 @@
buildPythonPackage rec {
pname = "pip-tools";
version = "6.3.1";
version = "6.4.0";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "992d968df6f1a19d4d37c53b68b3d4b601b894fb3ee0926d1fa762ebc7c7e9e9";
sha256 = "65553a15b1ba34be5e43889345062e38fb9b219ffa23b084ca0d4c4039b6f53b";
};
checkInputs = [