Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2021-06-19 18:04:26 +00:00 committed by GitHub
commit 593a9cc7a3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 70 additions and 23 deletions

View file

@ -5,7 +5,7 @@ on:
jobs:
backport:
name: Backport Pull Request
if: github.repository_owner == 'NixOS' && github.event.pull_request.merged == true
if: github.repository_owner == 'NixOS' && github.event.pull_request.merged == true && (github.event_name != 'labeled' || startsWith('backport', github.event.label.name))
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2

View file

@ -17,6 +17,9 @@ jobs:
run: |
ISMERGE=$(curl -H 'Accept: application/vnd.github.groot-preview+json' -H "authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" https://api.github.com/repos/${{ env.GITHUB_REPOSITORY }}/commits/${{ env.GITHUB_SHA }}/pulls | jq -r '.[] | select(.merge_commit_sha == "${{ env.GITHUB_SHA }}") | any')
echo "::set-output name=ismerge::$ISMERGE"
# github events are eventually consistent, so wait until changes propagate to thier DB
- run: sleep 60
if: steps.ismerge.outputs.ismerge != 'true'
- name: Warn if the commit was a direct push
if: steps.ismerge.outputs.ismerge != 'true'
uses: peter-evans/commit-comment@v1

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "hugo";
version = "0.83.1";
version = "0.84.0";
src = fetchFromGitHub {
owner = "gohugoio";
repo = pname;
rev = "v${version}";
sha256 = "sha256-c9T3a6J78uLumBTy/DgE4gbxCmEXVGKd9JyF9dyrL6g=";
sha256 = "sha256-BRp4iboiaoB6zFwleFSJ7oVAd3o6OiR5BB4VRQilExc=";
};
vendorSha256 = "sha256-ddCyMmZ5RIZWzT2RYNnSW795oR7PIRudl3QTjsXtBGk=";
vendorSha256 = "sha256-jY/g92ON5OxjuZzPHJNduXYMgPU8/0ioAYvp4iqjGnU=";
doCheck = false;

View file

@ -1,15 +1,15 @@
{ lib, buildPythonPackage, fetchPypi, flask, ldapdomaindump, pycryptodomex, pyasn1, pyopenssl }:
{ lib, buildPythonPackage, fetchPypi, flask, ldapdomaindump, pycryptodomex, pyasn1, pyopenssl, chardet }:
buildPythonPackage rec {
pname = "impacket";
version = "0.9.22";
version = "0.9.23";
src = fetchPypi {
inherit pname version;
sha256 = "4bf7e7b595356585599b4b2773b8a463d7b9765c97012dcd5a44eb6d547f6a1d";
sha256 = "113isxb9rd2n761nnh3skg3vqa0v5dalz9kbavyczqyv1jjyh6qw";
};
propagatedBuildInputs = [ flask ldapdomaindump pycryptodomex pyasn1 pyopenssl ];
propagatedBuildInputs = [ flask ldapdomaindump pycryptodomex pyasn1 pyopenssl chardet ];
# fail with:
# RecursionError: maximum recursion depth exceeded
@ -18,7 +18,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Network protocols Constructors and Dissectors";
homepage = "https://github.com/CoreSecurity/impacket";
homepage = "https://github.com/SecureAuthCorp/impacket";
# Modified Apache Software License, Version 1.1
license = licenses.free;
maintainers = with maintainers; [ SuperSandro2000 ];

View file

@ -16,14 +16,14 @@
buildPythonPackage rec {
pname = "minio";
version = "7.0.3";
version = "7.0.4";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "minio";
repo = "minio-py";
rev = version;
sha256 = "14symk7b3i9xzfc2wkcnqmfsvh9j3jx2ijz7dgy1xyrbjwb7yzhc";
sha256 = "sha256-4O6WhBoMNpqv1OEewkbA5a8hYH56liF7GrfxkooQ6Fo=";
};
propagatedBuildInputs = [

View file

@ -0,0 +1,37 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pytest-asyncio
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "pyheos";
version = "0.7.2";
src = fetchFromGitHub {
owner = "andrewsayre";
repo = "pyheos";
rev = version;
sha256 = "0rgzg7lnqzzqrjp73c1hj1hq8p0j0msyih3yr4wa2rj81s8ihmby";
};
checkInputs = [
pytest-asyncio
pytestCheckHook
];
disabledTests = [
# accesses network
"test_connect_timeout"
];
pythonImportsCheck = [ "pyheos" ];
meta = with lib; {
description = "Async python library for controlling HEOS devices through the HEOS CLI Protocol";
homepage = "https://github.com/andrewsayre/pyheos";
license = licenses.asl20;
maintainers = with maintainers; [ dotlambda ];
};
}

View file

@ -10,16 +10,16 @@
rustPlatform.buildRustPackage rec {
pname = "texlab";
version = "3.1.0";
version = "3.2.0";
src = fetchFromGitHub {
owner = "latex-lsp";
repo = pname;
rev = "v${version}";
hash = "sha256-h08RRcuQG1IjuCA6Xk71+MXKprZ/w5+H2edbG3rtVSY=";
hash = "sha256-iXsV7zt190GH0kTMpdmf8xHk4cqtCVwq6LDICmhe5qU=";
};
cargoHash = "sha256-78S9Bmq6TIMiAV3HpMC8jK9fH+0Y+jXAW9V1Druyfg8=";
cargoHash = "sha256-Yqn6VpAKw93QvkxuwNcYvrQm0C4TfisRDcmFy95/yw8=";
outputs = [ "out" "man" ];

View file

@ -1,18 +1,18 @@
{ lib, fetchFromGitHub, rustPlatform, cmake }:
rustPlatform.buildRustPackage rec {
pname = "unused";
version = "0.2.1";
version = "0.2.2";
src = fetchFromGitHub {
owner = "unused-code";
repo = pname;
rev = version;
sha256 = "06r6m7k570rdm9szghnp3g4r6ij0vp8apfanqzzxv2hd7gf8v62b";
sha256 = "0igpf0y45rrdrwq8bznq0d5nnph0vijvn6fw96mqxhbffz0csbi9";
};
nativeBuildInputs = [ cmake ];
cargoSha256 = "0y7vsba4r4v2lwf02i2dxwicnhknajbbzsdlnn5srvg6nvl3kspi";
cargoSha256 = "1fngn9mmvx7jw8305w465z0nf9acc2cdl7314p77c2rz25z6rlin";
meta = with lib; {
description = "A tool to identify potentially unused code";

View file

@ -344,7 +344,7 @@
"hddtemp" = ps: with ps; [ ];
"hdmi_cec" = ps: with ps; [ pycec ];
"heatmiser" = ps: with ps; [ ]; # missing inputs: heatmiserV3
"heos" = ps: with ps; [ ]; # missing inputs: pyheos
"heos" = ps: with ps; [ pyheos ];
"here_travel_time" = ps: with ps; [ ]; # missing inputs: herepy
"hikvision" = ps: with ps; [ ]; # missing inputs: pyhik
"hikvisioncam" = ps: with ps; [ ]; # missing inputs: hikvision

View file

@ -440,6 +440,7 @@ in with py.pkgs; buildPythonApplication rec {
"harmony"
"hassio"
"hddtemp"
"heos"
"history"
"history_stats"
"home_connect"

View file

@ -1,16 +1,20 @@
{ fetchFromGitHub, python3Packages, lib }:
{ lib
, python3
, fetchFromGitHub
}:
python3Packages.buildPythonApplication rec {
python3.pkgs.buildPythonApplication rec {
pname = "getmail6";
version = "6.16";
version = "6.17";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "1y373nzbffjjjs43441cn3wrb0yq1mw2vqixhizbzdacrs45xbfa";
sha256 = "sha256-pPf+98zoS1t59RoqbmS4V0OsTLMR37Wcsl9BSWuvc0k=";
};
# needs a Docker setup
doCheck = false;
pythonImportsCheck = [ "getmailcore" ];
@ -26,6 +30,6 @@ python3Packages.buildPythonApplication rec {
homepage = "https://getmail6.org";
updateWalker = true;
license = licenses.gpl2Plus;
maintainers = with maintainers; [ abbe ];
maintainers = with maintainers; [ abbe dotlambda ];
};
}

View file

@ -5266,6 +5266,8 @@ in {
pyflick = callPackage ../development/python-modules/pyflick { };
pyheos = callPackage ../development/python-modules/pyheos { };
pynndescent = callPackage ../development/python-modules/pynndescent { };
pynobo = callPackage ../development/python-modules/pynobo { };