mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-16 23:03:40 +01:00
Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
8a5e4be6b6
12 changed files with 88 additions and 35 deletions
|
|
@ -170,6 +170,11 @@
|
|||
section of the NixOS manual</link> for more information.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
<xref linkend="opt-services.nebula.networks" /> <link xlink:href="https://github.com/slackhq/nebula">Nebula VPN</link>
|
||||
</para>
|
||||
</listitem>
|
||||
</itemizedlist>
|
||||
|
||||
</section>
|
||||
|
|
|
|||
|
|
@ -1,35 +1,28 @@
|
|||
{ lib, buildPythonPackage, fetchFromGitHub, pytestrunner, pytest, scipy }:
|
||||
{ lib, buildPythonPackage, fetchFromGitHub, pytestrunner, pytest, scipy, pytestCheckHook }:
|
||||
|
||||
buildPythonPackage {
|
||||
pname = "fastpair";
|
||||
version = "2016-07-05";
|
||||
version = "2021-05-19";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "carsonfarmer";
|
||||
repo = "fastpair";
|
||||
rev = "92364962f6b695661f35a117bf11f96584128a8d";
|
||||
sha256 = "1pv9sxycxdk567s5gs947rhlqngrb9nn9yh4dhdvg1ix1i8dca71";
|
||||
rev = "d3170fd7e4d6e95312e7e1cb02e84077a3f06379";
|
||||
sha256 = "1l8zgr8awg27lhlkpa2dsvghrb7b12jl1bkgpzg5q7pg8nizl9mx";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pytestrunner ];
|
||||
|
||||
checkInputs = [ pytest ];
|
||||
checkInputs = [ pytest pytestCheckHook ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
scipy
|
||||
];
|
||||
|
||||
# Does not support pytest 4 https://github.com/carsonfarmer/fastpair/issues/14
|
||||
doCheck = false;
|
||||
|
||||
checkPhase = ''
|
||||
pytest fastpair
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/carsonfarmer/fastpair";
|
||||
description = "Data-structure for the dynamic closest-pair problem";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ cmcdragonkai ];
|
||||
maintainers = with maintainers; [ cmcdragonkai rakesh4g ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "hatasmota";
|
||||
version = "0.2.12";
|
||||
version = "0.2.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "emontnemery";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-rf0EB9PxageMQhPzG96oWovt+5L/u68VPllzPT4yp2A=";
|
||||
sha256 = "sha256-RzBEiO8IfeMls7ssCZ2yhL78UVrpZykwDl1IUshqOu8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "karton-yaramatcher";
|
||||
version = "1.1.0";
|
||||
version = "1.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CERT-Polska";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0yb9l5z826zli5cpcj234dmjdjha2g1lcwxyvpxm95whkhapc2cf";
|
||||
sha256 = "0mv8v1gk6p21pw9kx6cxr76l6c5fxd3p6dk85cwfzz100h8mdvar";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -22,12 +22,6 @@ buildPythonPackage rec {
|
|||
yara-python
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace requirements.txt \
|
||||
--replace "karton-core==4.0.5" "karton-core" \
|
||||
--replace "yara-python==4.0.2" "yara-python" \
|
||||
'';
|
||||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
${python.interpreter} -m unittest discover
|
||||
|
|
|
|||
|
|
@ -0,0 +1,59 @@
|
|||
{ lib
|
||||
, betamax
|
||||
, buildPythonPackage
|
||||
, cachetools
|
||||
, coloredlogs
|
||||
, emoji
|
||||
, fetchPypi
|
||||
, nose
|
||||
, python
|
||||
, pythonOlder
|
||||
, pytz
|
||||
, requests
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "locationsharinglib";
|
||||
version = "4.1.6";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "092j8z01nwjqh5zr7aj8mxl1zjd3j2irhrs39dhn47bd6db2a6ij";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
coloredlogs
|
||||
requests
|
||||
cachetools
|
||||
pytz
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
betamax
|
||||
emoji
|
||||
nose
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# Tests requirements want to pull in multiple modules which we don't need
|
||||
substituteInPlace setup.py \
|
||||
--replace "tests_require=test_requirements" "tests_require=[]"
|
||||
'';
|
||||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
# Only coverage no real unit tests
|
||||
${python.interpreter} setup.py nosetests
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "locationsharinglib" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python package to retrieve coordinates from a Google account";
|
||||
homepage = "https://locationsharinglib.readthedocs.io/";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "earthly";
|
||||
version = "0.5.12";
|
||||
version = "0.5.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "earthly";
|
||||
repo = "earthly";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-jG4KaDCzx0PAJu6Hr+xnKsAdz97LmGUF0El3rSiLQPo=";
|
||||
sha256 = "sha256-XN3E1oCIlohALnaP17WOB7/1vaklmyAfVZLxrBOXhbo=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-q3dDV0eop2NxXHFrlppWsZrO2Hz1q5xhs1DnB6PvG9g=";
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "hdparm";
|
||||
version = "9.60";
|
||||
version = "9.61";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/hdparm/hdparm-${version}.tar.gz";
|
||||
sha256 = "1k1mcv7naiacw1y6bdd1adnjfiq1kkx2ivsadjwmlkg4fff775w3";
|
||||
sha256 = "sha256-2hocOIfxC4OX6OAgE8qmEULg5yyw1zmXQhyi8vTfU0M=";
|
||||
};
|
||||
|
||||
preBuild = ''
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
# Do not edit!
|
||||
|
||||
{
|
||||
version = "2021.5.4";
|
||||
version = "2021.5.5";
|
||||
components = {
|
||||
"abode" = ps: with ps; [ abodepy ];
|
||||
"accuweather" = ps: with ps; [ accuweather ];
|
||||
|
|
@ -316,7 +316,7 @@
|
|||
"google_assistant" = ps: with ps; [ aiohttp-cors ];
|
||||
"google_cloud" = ps: with ps; [ google-cloud-texttospeech ];
|
||||
"google_domains" = ps: with ps; [ ];
|
||||
"google_maps" = ps: with ps; [ ]; # missing inputs: locationsharinglib
|
||||
"google_maps" = ps: with ps; [ locationsharinglib ];
|
||||
"google_pubsub" = ps: with ps; [ google-cloud-pubsub ];
|
||||
"google_translate" = ps: with ps; [ gtts ];
|
||||
"google_travel_time" = ps: with ps; [ googlemaps ];
|
||||
|
|
|
|||
|
|
@ -155,7 +155,7 @@ let
|
|||
extraBuildInputs = extraPackages py.pkgs;
|
||||
|
||||
# Don't forget to run parse-requirements.py after updating
|
||||
hassVersion = "2021.5.4";
|
||||
hassVersion = "2021.5.5";
|
||||
|
||||
in with py.pkgs; buildPythonApplication rec {
|
||||
pname = "homeassistant";
|
||||
|
|
@ -174,7 +174,7 @@ in with py.pkgs; buildPythonApplication rec {
|
|||
owner = "home-assistant";
|
||||
repo = "core";
|
||||
rev = version;
|
||||
sha256 = "1jxbxzhcnvxf6qkik2qmpdml41q6hlkazjqaxygyw7pyj094fp8v";
|
||||
sha256 = "1vdxygjik1ay58xgyr1rk12cgy63raqi4fldnd4mlhs4i21c7ff8";
|
||||
};
|
||||
|
||||
# leave this in, so users don't have to constantly update their downstream patch handling
|
||||
|
|
|
|||
|
|
@ -14,11 +14,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "agi";
|
||||
version = "1.1.0-dev-20210513";
|
||||
version = "1.1.0-dev-20210514";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/google/agi-dev-releases/releases/download/v${version}/agi-${version}-linux.zip";
|
||||
sha256 = "sha256-epDwZpdyPreufPwiSFadmMjtZ9nq9mQsQt+Asm5rx8Y=";
|
||||
sha256 = "sha256-vYq8x5uX1MfqCRZl/564YuTAYxe36iZTO+lsyxkO2JQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "dnsproxy";
|
||||
version = "0.37.3";
|
||||
version = "0.37.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AdguardTeam";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-8lZDWvd5Lq8uHBt47gRhg0MLeJ5iRheMBUjkfaJueDI=";
|
||||
sha256 = "sha256-EV/+m7Uzf7s6+J0jdsim3UP84iK/tXlPNfkyrtrx5NQ=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
|
|
|||
|
|
@ -3973,6 +3973,8 @@ in {
|
|||
|
||||
localzone = callPackage ../development/python-modules/localzone { };
|
||||
|
||||
locationsharinglib = callPackage ../development/python-modules/locationsharinglib { };
|
||||
|
||||
locket = callPackage ../development/python-modules/locket { };
|
||||
|
||||
lockfile = callPackage ../development/python-modules/lockfile { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue