b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge branch 'master' into staging-next

Browse source
This commit is contained in:
Jan Tojnar 2021-02-04 14:56:47 +01:00
parent 479e614f84 dc7101ddd9
commit 716fbd61d3
No known key found for this signature in database
GPG key ID: 7FAB2A15F7A607A4
17 changed files with 149 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/applications/networking/instant-messengers/element/element-desktop-package.json
View file

@ -2,7 +2,7 @@
"name": "element-desktop",
"productName": "Element",
"main": "src/electron-main.js",
"version": "1.7.19",
"version": "1.7.20",
"description": "A feature-rich client for Matrix.org",
"author": "Element",
"repository": {

4
pkgs/applications/networking/instant-messengers/element/element-desktop.nix
View file

@ -8,12 +8,12 @@
let
executableName = "element-desktop";
version = "1.7.19";
version = "1.7.20";
src = fetchFromGitHub {
owner = "vector-im";
repo = "element-desktop";
rev = "v${version}";
sha256 = "sha256-al49O13biReX1pCkmljUPLdV1uP//L3fdTLLsay0V1A=";
sha256 = "sha256-kQMswcEGsefQ8HCWxYPgvxOKP5cgvXx8oCl5Inh6sOg=";
};
in mkYarnPackage rec {
name = "element-desktop-${version}";

4
pkgs/applications/networking/instant-messengers/element/element-web.nix
View file

@ -12,11 +12,11 @@ let
in stdenv.mkDerivation rec {
pname = "element-web";
version = "1.7.19";
version = "1.7.20";
src = fetchurl {
url = "https://github.com/vector-im/element-web/releases/download/v${version}/element-v${version}.tar.gz";
sha256 = "sha256-rHxHP3KneB9SrXRMvcq0pmFj6YnLmazw/pRxMsP2o/k=";
sha256 = "sha256-8R7l/Pmymd5+/Fri7z2/TDj1h2FL0QgLICoXajePing=";
};
installPhase = ''

6
pkgs/applications/networking/seaweedfs/default.nix
View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "seaweedfs";
version = "2.14";
version = "2.23";
src = fetchFromGitHub {
owner = "chrislusf";
repo = "seaweedfs";
rev = version;
sha256 = "1sfchh5qiylxxmph0hgjfaj80mv5pnrm1s34g5lx0vj64jxr5nzb";
sha256 = "sha256-MMFVJoiVrA0zy4RM2nyhlu/JfnzIRpxrA3N1jm2R0jI=";
};
vendorSha256 = "0g344dj325d35i0myrzhg5chspqnly40qp910ml6zrmp7iszc1mw";
vendorSha256 = "sha256-UucbEBjIKRbZFd99BsnG6AAEIQ13+vzKe61k6ZPvE0A=";
subPackages = [ "weed" ];

4
pkgs/desktops/enlightenment/evisum/default.nix
View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "evisum";
version = "0.5.9";
version = "0.5.10";
src = fetchurl {
url = "https://download.enlightenment.org/rel/apps/${pname}/${pname}-${version}.tar.xz";
sha256 = "sha256-ao5b4Mhr+fhY19X1g0gupcU8LayR55/kgHSwhGUAfys=";
sha256 = "sha256-kCO55UvQnRQhXLRqeJr6SN9FiTeKkh3P7QFkJe+GXjY=";
};
nativeBuildInputs = [

4
pkgs/development/python-modules/aresponses/default.nix
View file

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "aresponses";
version = "2.1.2";
version = "2.1.4";
disabled = !isPy3k;
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "CircleUp";
repo = pname;
rev = version;
sha256 = "007wrk4wdy97a81imgzxd6sm5dly9v7abmxh9fyfi0vp1p7s75bw";
sha256 = "sha256-crMiMZ2IDuYDFt8Bixg3NRhlUa2tqmfzd7ZeHM+2Iu4=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/certbot/default.nix
View file

@ -9,13 +9,13 @@
buildPythonPackage rec {
pname = "certbot";
version = "1.11.0";
version = "1.12.0";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "sha256-IGXiIOLP/Uq6HdXAschp1jFYq52ohRK4VLtkjF4Tb44=";
sha256 = "sha256-lMQkVc2UzC5GqEy88rcaJ74CaT3+YWveNDCXql/McRM=";
};
sourceRoot = "source/${pname}";

18
pkgs/development/python-modules/pyipp/default.nix
View file

@ -6,7 +6,7 @@
, fetchFromGitHub
, pytest-asyncio
, pytestCheckHook
, pytestcov
, pytest-cov
, yarl
}:
@ -30,24 +30,10 @@ buildPythonPackage rec {
checkInputs = [
aresponses
pytest-asyncio
pytestcov
pytest-cov
pytestCheckHook
];
# Some tests are failing due to encoding issues
# https://github.com/ctalkington/python-ipp/issues/121
disabledTests = [
"test_internal_session"
"test_request_port"
"est_http_error426"
"test_unexpected_response"
"test_printer"
"test_raw"
"test_ipp_request"
"test_request_tls"
"test_ipp_error_0x0503"
];
pythonImportsCheck = [ "pyipp" ];
meta = with lib; {

46
pkgs/development/python-modules/pytest-httpserver/default.nix Normal file
View file

@ -0,0 +1,46 @@
{ lib
, buildPythonPackage
, fetchPypi
, fetchpatch
, pytest-asyncio
, pytest-cov
, pytestCheckHook
, requests
, werkzeug
}:
buildPythonPackage rec {
pname = "pytest-httpserver";
version = "0.3.6";
src = fetchPypi {
pname = "pytest_httpserver";
inherit version;
sha256 = "1wdhbzv6x2v4qsqwgsc5660c4lxplh9b61vfj1zqhbhs36y96vl9";
};
patches = [
(fetchpatch {
name = "remove-pytest-runner.patch";
url = "https://github.com/csernazs/pytest-httpserver/commit/c9752018bc2f13d141dd52c92df75c19ea388836.patch";
sha256 = "0b76ywzl2gwddbqqlb662mfv5j42l88l5hffm7jbxzvqbz94mx3k";
})
];
propagatedBuildInputs = [ werkzeug ];
checkInputs = [
pytest-cov
pytestCheckHook
requests
];
pythonImportsCheck = [ "pytest_httpserver" ];
meta = with lib; {
description = "HTTP server for pytest to test HTTP clients";
homepage = "https://www.github.com/csernazs/pytest-httpserver";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

41
pkgs/development/python-modules/solax/default.nix Normal file
View file

@ -0,0 +1,41 @@
{ lib
, aiohttp
, buildPythonPackage
, fetchPypi
, pytest-asyncio
, pytest-cov
, pytest-httpserver
, pytestCheckHook
, setuptools-scm
, voluptuous
}:
buildPythonPackage rec {
pname = "solax";
version = "0.2.5";
src = fetchPypi {
inherit pname version;
sha256 = "0h7q6y2cdkj9dqxw0k7pgz7a7vbpq1qw50pmy9rajphhv2600cbc";
};
nativeBuildInputs = [ setuptools-scm ];
propagatedBuildInputs = [ aiohttp voluptuous ];
checkInputs = [
pytest-asyncio
pytest-cov
pytest-httpserver
pytestCheckHook
];
pythonImportsCheck = [ "solax" ];
meta = with lib; {
description = "Python wrapper for the Solax Inverter API";
homepage = "https://github.com/squishykid/solax";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

31
pkgs/development/python-modules/xboxapi/default.nix Normal file
View file

@ -0,0 +1,31 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, requests
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "xboxapi";
version = "2.0.1";
src = fetchFromGitHub {
owner = "mKeRix";
repo = "xboxapi-python";
rev = version;
sha256 = "10mhvallkwf5lw91hj5rv16sziqhhjq7sgcgr28sqqnlgjnyazdd";
};
propagatedBuildInputs = [ requests ];
checkInputs = [ pytestCheckHook ];
pythonImportsCheck = [ "xboxapi" ];
meta = with lib; {
description = "Python XBOX One API wrapper";
homepage = "https://github.com/mKeRix/xboxapi-python";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

2
pkgs/development/tools/rubocop/Gemfile.lock
View file

@ -8,7 +8,7 @@ GEM
rainbow (3.0.0)
regexp_parser (2.0.3)
rexml (3.2.4)
rubocop (1.9.0)
rubocop (1.9.1)
parallel (~> 1.10)
parser (>= 3.0.0.0)
rainbow (>= 2.2.2, < 4.0)

4
pkgs/development/tools/rubocop/gemset.nix
View file

@ -66,10 +66,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1wz0prg4kx36smbk7fib4a8cdxrj5b5b31c8bavm082vgcpfk759";
sha256 = "06npybjypxsrz09z8ivxqfcwzpbgif6z3hwpp0ls8znqlgp3m922";
type = "gem";
};
version = "1.9.0";
version = "1.9.1";
};
rubocop-ast = {
dependencies = ["parser"];

4
pkgs/os-specific/linux/pcm/default.nix
View file

@ -1,14 +1,14 @@
{ lib, stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
version = "202011";
version = "202101";
pname = "pcm";
src = fetchFromGitHub {
owner = "opcm";
repo = "pcm";
rev = version;
sha256 = "09p8drp9xvvs5bahgnr9xx6987fryz27xs2zaf1mr7a9wsh5j912";
sha256 = "sha256-xiC9XDuFcAzD2lVuzBWUvHy1Z1shEXM2KPFabKvgh1Y=";
};
installPhase = ''

4
pkgs/servers/home-assistant/component-packages.nix
View file

@ -761,7 +761,7 @@
"solaredge" = ps: with ps; [ stringcase ]; # missing inputs: solaredge
"solaredge_local" = ps: with ps; [ ]; # missing inputs: solaredge-local
"solarlog" = ps: with ps; [ ]; # missing inputs: sunwatcher
"solax" = ps: with ps; [ ]; # missing inputs: solax
"solax" = ps: with ps; [ solax ];
"soma" = ps: with ps; [ pysoma ];
"somfy" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pymfy
"somfy_mylink" = ps: with ps; [ ]; # missing inputs: somfy-mylink-synergy
@ -944,7 +944,7 @@
"x10" = ps: with ps; [ ];
"xbee" = ps: with ps; [ ]; # missing inputs: xbee-helper
"xbox" = ps: with ps; [ aiohttp-cors ]; # missing inputs: xbox-webapi
"xbox_live" = ps: with ps; [ ]; # missing inputs: xboxapi
"xbox_live" = ps: with ps; [ xboxapi ];
"xeoma" = ps: with ps; [ pyxeoma ];
"xfinity" = ps: with ps; [ ]; # missing inputs: xfinity-gateway
"xiaomi" = ps: with ps; [ ha-ffmpeg ];

4
pkgs/tools/misc/youtube-dl/default.nix
View file

@ -18,11 +18,11 @@ buildPythonPackage rec {
# The websites youtube-dl deals with are a very moving target. That means that
# downloads break constantly. Because of that, updates should always be backported
# to the latest stable release.
version = "2021.01.24.1";
version = "2021.02.04.1";
src = fetchurl {
url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz";
sha256 = "001hs73fpm4nxcgn60n9wlsdmiv40f4b1k6hkl4g4wyywv9ic9fy";
sha256 = "0rn8plld2bzmwbcvxxgz3hn24kjyal5kkwbpb5nd4w84mdjkhjqa";
};
nativeBuildInputs = [ installShellFiles makeWrapper ];

6
pkgs/top-level/python-packages.nix
View file

@ -6101,6 +6101,8 @@ in {
pytest-httpbin = callPackage ../development/python-modules/pytest-httpbin { };
pytest-httpserver = callPackage ../development/python-modules/pytest-httpserver { };
pytest-instafail = callPackage ../development/python-modules/pytest-instafail { };
pytest-isort = callPackage ../development/python-modules/pytest-isort { };
@ -7268,6 +7270,8 @@ in {
softlayer = callPackage ../development/python-modules/softlayer { };
solax = callPackage ../development/python-modules/solax { };
solo-python = disabledIf (!pythonAtLeast "3.6") (callPackage ../development/python-modules/solo-python { });
somajo = callPackage ../development/python-modules/somajo { };
@ -8330,6 +8334,8 @@ in {
xattr = callPackage ../development/python-modules/xattr { };
xboxapi = callPackage ../development/python-modules/xboxapi { };
xcaplib = callPackage ../development/python-modules/xcaplib { };
xcffib = callPackage ../development/python-modules/xcffib { };