Merge master into staging-next

This commit is contained in:
github-actions[bot]
2022-03-17 12:01:28 +00:00
committed by GitHub
32 changed files with 154 additions and 105 deletions
@@ -2,7 +2,7 @@
"name": "element-desktop",
"productName": "Element",
"main": "lib/electron-main.js",
"version": "1.10.6",
"version": "1.10.7",
"description": "A feature-rich client for Matrix.org",
"author": "Element",
"repository": {
@@ -1,6 +1,6 @@
{
"version": "1.10.6",
"desktopSrcHash": "TJGYavawLDLbP9Sg7HxIcOkr7hcTfAwk4fyOOEv4KhI=",
"version": "1.10.7",
"desktopSrcHash": "HkGny9t8dNzVGyyqgr4tABbFZgWV4xqGZt9xH4ejkew=",
"desktopYarnHash": "038rqg26dn8chzscck5mlhnw2viy6gr8pjb7zrcmi7ipx9h038a0",
"webHash": "1wax4h5gfcq4giyq1igsix748cngky487kwvf69zb1gz95hjds9r"
"webHash": "0gim79a1zpfc56ca5fndp2whmlv9jz1s32z666i268xppn4z53k1"
}
@@ -17,10 +17,10 @@ in
mkFranzDerivation' rec {
pname = "ferdi";
name = "Ferdi";
version = "5.7.0";
version = "5.8.0";
src = fetchurl {
url = "https://github.com/getferdi/ferdi/releases/download/v${version}/ferdi_${version}_amd64.deb";
sha256 = "sha256-WwtnYNjXHk80o1wMsEBoaT9j0+4TWTfWhuVpGHaZB7c=";
sha256 = "sha256-Dd/iH9dtr4WvM++bSURF8kI6BsF6uBiSFviC/ik2H+o=";
};
extraBuildInputs = [ xorg.libxshmfence ];
meta = with lib; {
+3 -3
View File
@@ -25,13 +25,13 @@
stdenv.mkDerivation rec {
pname = "monitor";
version = "0.12.0";
version = "0.13.0";
src = fetchFromGitHub {
owner = "stsdc";
repo = "monitor";
rev = version;
sha256 = "1fv98yz9393ddp0k96bwbgccy6x9dmmg8g1pjd3xs6m4c1bnvfc7";
sha256 = "sha256-qwx60cp3Q6PL1iwRP+M9Rtmxcis0EByi8fk13H4cXfc=";
fetchSubmodules = true;
};
@@ -90,7 +90,7 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/stsdc/monitor";
maintainers = with maintainers; [ xiorcale ] ++ teams.pantheon.members;
platforms = platforms.linux;
license = licenses.gpl3;
license = licenses.gpl3Plus;
mainProgram = "com.github.stsdc.monitor";
};
}
@@ -16,12 +16,12 @@ with lib;
buildGoPackage rec {
pname = "gitea";
version = "1.16.3";
version = "1.16.4";
# not fetching directly from the git repo, because that lacks several vendor files for the web UI
src = fetchurl {
url = "https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz";
sha256 = "sha256-kT87CV/P1MUBLRetzYdIsIGVDjp9F6zmD2ovmcmy4Ys=";
sha256 = "sha256-7zlreX05pkhn381FMgQ8Nj3OP+BUr6o3u5f4ouo/Khg=";
};
unpackPhase = ''
@@ -15,13 +15,13 @@
buildGoModule rec {
pname = "cri-o";
version = "1.23.1";
version = "1.23.2";
src = fetchFromGitHub {
owner = "cri-o";
repo = "cri-o";
rev = "v${version}";
sha256 = "sha256-A59Bgt0u8jzpTijT5vcO8JREL7Elx1mWnwddAuRHn5c=";
sha256 = "sha256-sjeYWBcal6RtoUZd6orQ+237Fz80vQKx5vocFMq4l7U=";
};
vendorSha256 = null;
@@ -120,15 +120,6 @@ with pkgs;
};
sources = {
python38 = {
sourceVersion = {
major = "3";
minor = "8";
patch = "12";
suffix = "";
};
sha256 = "1si8hw2xpagh4iji89zdx69p3dv5mjqwwbx2x2sl6lrp41jaglxi";
};
python39 = {
sourceVersion = {
major = "3";
@@ -169,19 +160,26 @@ in {
sourceVersion = {
major = "3";
minor = "7";
patch = "12";
patch = "13";
suffix = "";
};
sha256 = "041jqjl5wf7gsw84zd3jgvg91skq20l2fy5zbhz237w38zxzfyzp";
sha256 = "sha256-mfEGJ134iZw+jLnXwBzmhsIC7ydZUzAUJxlGk95b74Q=";
inherit (darwin) configd;
inherit passthruFun;
};
python38 = callPackage ./cpython ({
python38 = callPackage ./cpython {
self = python38;
sourceVersion = {
major = "3";
minor = "8";
patch = "13";
suffix = "";
};
sha256 = "sha256-bzCQdwEgQKo5/o8MYduMD6HEUTZ2MpnTdcnldW8Jz1c=";
inherit (darwin) configd;
inherit passthruFun;
} // sources.python38);
};
python39 = callPackage ./cpython ({
self = python39;
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "cfitsio";
version = "4.0.0";
version = "4.1.0";
src = fetchurl {
url = "https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/cfitsio-${version}.tar.gz";
sha256 = "sha256-sqjvugufhtPhvWGfZipHbsGBErTyfMRBzGgKTjd3Ql4=";
sha256 = "sha256-s2fGldKDGVjnFmkhw7NW1d+lGx7O5QW5dBa6OdG2wXo=";
};
buildInputs = [ bzip2 zlib ];
@@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "adb-enhanced";
version = "2.5.12";
version = "2.5.14";
disabled = pythonOlder "3.4";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "ashishb";
repo = pname;
rev = version;
sha256 = "sha256-OZSLk5qXX6rEclo6JC8o/7Mz0Y2sJqUsLhnrVK4gkVI=";
sha256 = "sha256-GaPOYBQEGI40MutjjY8exABqGge2p/buk9v+NcZ5oJs=";
};
propagatedBuildInputs = [
@@ -0,0 +1,40 @@
{ lib
, aiohttp
, buildPythonPackage
, fetchFromGitHub
, pythonOlder
}:
buildPythonPackage rec {
pname = "aioairzone";
version = "0.1.0";
format = "setuptools";
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "Noltari";
repo = pname;
rev = version;
hash = "sha256-QruXxC/+61P2Mi0UILUIKp4S3wS1+E+WmzBbiUqlVe4=";
};
propagatedBuildInputs = [
aiohttp
];
# Module has no tests
doCheck = false;
pythonImportsCheck = [
"aioairzone"
];
meta = with lib; {
description = "Module to control AirZone devices";
homepage = "https://github.com/Noltari/aioairzone";
license = with licenses; [ asl20 ];
maintainers = with maintainers; [ fab ];
};
}
@@ -14,13 +14,13 @@
}:
buildPythonPackage rec {
version = "20.7.1";
version = "22.3.2";
pname = "BoltzTraP2";
disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
sha256 = "41caa32e5778323471d87033f23537f6178a7aea64fba894c7f2b2579b51f7ed";
sha256 = "sha256-Yo37xdXxCQKkA+lrFEZp1DxjJy216Q6aYYT68PEx9JU=";
};
dontUseCmakeConfigure = true;
@@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "check-manifest";
version = "0.47";
version = "0.48";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
hash = "sha256-VtrdJgqcfVULFZeW0olLbQvMF2qUy8Qm2buT5eSNEs4=";
hash = "sha256-O1dfHa3nvrMHjvS/M6lFGYNEV8coHbxyaxXFRmtVxlc=";
};
propagatedBuildInputs = [
@@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "hahomematic";
version = "0.36.3";
version = "0.37.1";
format = "setuptools";
disabled = pythonOlder "3.9";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "danielperna84";
repo = pname;
rev = version;
sha256 = "sha256-S5KWyW7aeR2qdBzXQ4ka2nuxGPt69LHyq2CUdRPG9ig=";
sha256 = "sha256-ZENCcNppXOl0OHQDdybJV+SxOgtVzF2PPN0gAPIMjXM=";
};
propagatedBuildInputs = [
@@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "identify";
version = "2.4.11";
version = "2.4.12";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "pre-commit";
repo = pname;
rev = "v${version}";
sha256 = "sha256-Q86n2uAjmA05h+0NE77TBkbPiKoRYqB1b2H3MbOVmMY=";
sha256 = "sha256-kXhUlt+lcqK3ohOA8eziFcrm4U/FAYWpie4rH5xRejI=";
};
checkInputs = [
@@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "intellifire4py";
version = "1.0.1";
version = "1.0.2";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "jeeftor";
repo = pname;
rev = version;
hash = "sha256-hKe9sDn5t2qQ0THqFQypAGgr7cJXaZs8562NpPR/iJU=";
hash = "sha256-t3wJQ7dXX65yqxMYsFggViqqGvLCdASw1QLc5DJBn+4=";
};
propagatedBuildInputs = [
@@ -0,0 +1,39 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pythonOlder
, requests
}:
buildPythonPackage rec {
pname = "meilisearch";
version = "0.18.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "meilisearch";
repo = "meilisearch-python";
rev = "v${version}";
hash = "sha256-iIFTZKORCXr4mNeWBtbOPWXwORuTV/IKhLYkqFgd3Hw=";
};
propagatedBuildInputs = [
requests
];
pythonImportsCheck = [
"meilisearch"
];
# Tests spin up a local server and are not mocking the requests
doCheck = false;
meta = with lib; {
description = "Client for the Meilisearch API";
homepage = "https://github.com/meilisearch/meilisearch-python";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}
@@ -6,12 +6,12 @@
buildPythonPackage rec {
pname = "pex";
version = "2.1.71";
version = "2.1.72";
format = "flit";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-jJ7J4upDL1X1Eut1kUWdJu3Ih2mheNFt0wI+QTZMKow=";
sha256 = "sha256-0hhnBkbgt4bSlqjvYKX2Mhty/T1vBGm91HhKmyvVzmA=";
};
nativeBuildInputs = [
@@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "pygmt";
version = "0.5.0";
version = "0.6.0";
disabled = pythonOlder "3.6";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "GenericMappingTools";
repo = "pygmt";
rev = "v${version}";
sha256 = "1mazljxwh162df971cvv7cwnqr300r17qfs7k09s6yd6hajyhz49";
sha256 = "sha256-QzqQKnANReSHIsDbiKSZ1ZgMgbj3NAfq4bmRQktnRjQ=";
};
postPatch = ''
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "pymavlink";
version = "2.4.27";
version = "2.4.29";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-DzW1jB7L7sD9WAhk/3/0UD8PW7Nw/bHTI527NmMV6CY=";
sha256 = "sha256-0k6DKkb/Izk15JKrSOC0u5wL3vT4x2CelZt112vc/p0=";
};
propagatedBuildInputs = [ future lxml ];
@@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "pypandoc";
version = "1.7.2";
version = "1.7.3";
src = fetchPypi {
inherit pname version;
sha256 = "1wk8jxnysb7sa55zhxx5brylv00ivamqbk1b4lbzi58ziij08p03";
sha256 = "sha256-Tv0vqKN9AAXdfQRMt/QuqeFB3wNTh1DsWu0XNZukTUc=";
};
patches = [
@@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "python-box";
version = "6.0.0";
version = "6.0.1";
format = "setuptools";
disabled = pythonOlder "3.6";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "cdgriffith";
repo = "Box";
rev = version;
hash = "sha256-YOYcI+OAuTumNtTylUc6dSY9shOE6eTr8M3rVbcy5hs=";
hash = "sha256-kH8qHAFuYDXO5Dsl6BpTYCIqh0Xi8Rbwmia+y3sTn6Y=";
};
propagatedBuildInputs = [
@@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "renault-api";
version = "0.1.9";
version = "0.1.10";
format = "pyproject";
disabled = pythonOlder "3.7";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "hacf-fr";
repo = pname;
rev = "v${version}";
sha256 = "sha256-CZDxJ5vgk9I1cRDXoqcrUHu+buPWYVrEcHaRXcyts7I=";
sha256 = "sha256-PXycRRUrKIkU/MgQbW4BjvBhpEi6InY5jZHPw4Nyv2s=";
};
nativeBuildInputs = [
@@ -6,12 +6,12 @@
buildPythonPackage rec {
pname = "types-requests";
version = "2.27.12";
version = "2.27.13";
format = "setuptools";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-/ROC+i4o6shI+u2wMyhAIE8G8MtRcAjjx7goLKU+VtI=";
sha256 = "sha256-zwZGAx3WMHETs3gU90PATwcHozVzeMK7Eyb4SEEvW6k=";
};
propagatedBuildInputs = [
@@ -5,12 +5,12 @@
buildPythonPackage rec {
pname = "types-setuptools";
version = "57.4.10";
version = "57.4.11";
format = "setuptools";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-mhNRNnnGQPZhbi2atQ1DHJnKiumEipckP4h8gP1c8pQ=";
sha256 = "sha256-Ji90BuDH1wWta7RSa1t2H6UAv5nqt03oWsNZIYfWKTU=";
};
# Module doesn't have tests
@@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "yalexs";
version = "1.1.22";
version = "1.1.23";
format = "setuptools";
disabled = pythonOlder "3.6";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "bdraco";
repo = pname;
rev = "v${version}";
sha256 = "sha256-qtJSGvvYcdGYUUHnRnKe+z+twFqLGAn1Zl47F4CGnvc=";
sha256 = "sha256-CnAVkwCOADBNY0cUvq9Dt6JR+fIr4LiZVMzJIIFqzG0=";
};
propagatedBuildInputs = [
@@ -32,13 +32,13 @@ with py.pkgs;
buildPythonApplication rec {
pname = "checkov";
version = "2.0.962";
version = "2.0.968";
src = fetchFromGitHub {
owner = "bridgecrewio";
repo = pname;
rev = version;
hash = "sha256-hpoOOU1Z8xVqoJJdGcSoWujm3amiPkZ1Qjiqh66J+ZM=";
hash = "sha256-F+SMgNCL6qOOhfpZi0Gg/OWPjxzMDVVvXTrPOZCfrLU=";
};
nativeBuildInputs = with py.pkgs; [
@@ -1,24 +0,0 @@
From eb39954acf73096d65ba1e9575cbeb3d4307d5df Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 29 Nov 2020 20:55:17 +0100
Subject: [PATCH 2/2] Don't depend on pytest-runner
---
setup.py | 1 -
1 file changed, 1 deletion(-)
diff --git a/setup.py b/setup.py
index 95dbf89..89ea2a7 100644
--- a/setup.py
+++ b/setup.py
@@ -57,7 +57,6 @@ setuptools.setup(
]
},
- setup_requires=["pytest-runner"],
tests_require=["pytest", "pytest-asyncio", "pytest-mock"],
classifiers=[
--
2.28.0
+4 -9
View File
@@ -6,11 +6,11 @@ let
python = python3.override {
packageOverrides = self: super: {
tulir-telethon = self.telethon.overridePythonAttrs (oldAttrs: rec {
version = "1.25.0a3";
version = "1.25.0a5";
pname = "tulir-telethon";
src = oldAttrs.src.override {
inherit pname version;
sha256 = "sha256-/kau9Q2+7giVx52tmjvYIbcDcY1/om31X9BlRvZipuk=";
sha256 = "sha256-WFiWczuw6eVVid2Z1LsnGE6BCEhqeCuiQ/p0d2Ahbi8=";
};
});
};
@@ -25,22 +25,17 @@ let
in python.pkgs.buildPythonPackage rec {
pname = "mautrix-telegram";
version = "0.11.1";
version = "0.11.2";
disabled = python.pythonOlder "3.7";
src = fetchFromGitHub {
owner = "mautrix";
repo = "telegram";
rev = "v${version}";
sha256 = "sha256-Df+v1Q+5Iaa9GKcwIabMKjJwmVd5Qub8M54jEEiAPFc=";
sha256 = "sha256-ZECTHAP5l9tAk9Ies8XuPpH9jqYDJSRSHVKz1lA6Sjg=";
};
patches = [ ./0001-Re-add-entrypoint.patch ];
postPatch = ''
substituteInPlace requirements.txt \
--replace "telethon>=1.22,<1.23" "telethon"
'';
propagatedBuildInputs = with python.pkgs; ([
Mako
+3 -3
View File
@@ -2,18 +2,18 @@
buildGoModule rec {
pname = "mautrix-whatsapp";
version = "0.2.4";
version = "0.3.0";
src = fetchFromGitHub {
owner = "mautrix";
repo = "whatsapp";
rev = "v${version}";
sha256 = "lBAnMrU292URrZIxPvPIAO50GAFvvZHfUjKMYxZwGb8=";
sha256 = "M44APMnpQU+9TTJu4NF528o0JvGvWja4H7XUcAHtxrA=";
};
buildInputs = [ olm ];
vendorSha256 = "KiNABUZ92gYprTdNAKKMjygr0BzQGVYVPRPMxvYi1VQ=";
vendorSha256 = "o3KTcnMd6Tqt9QIfW29wvN8POIFThNg8AdeGDF5wbVc=";
doCheck = false;
+2 -2
View File
@@ -5,13 +5,13 @@
python3.pkgs.buildPythonApplication rec {
pname = "cfripper";
version = "1.5.2";
version = "1.5.3";
src = fetchFromGitHub {
owner = "Skyscanner";
repo = pname;
rev = version;
hash = "sha256-tl0g08nnY1CZ4SNcMFPARIRquiO9SCen9VWeNalLHds=";
hash = "sha256-5TjKn7yE3g8/SyD2dVJeHnaLOTyyKpxeAeGuXbkGCeo=";
};
propagatedBuildInputs = with python3.pkgs; [
+4 -7
View File
@@ -5,19 +5,16 @@
buildGoModule rec {
pname = "zdns";
version = "20210327-${lib.strings.substring 0 7 rev}";
rev = "8c53210f0b9a4fe16c70a5d854e9413c3d0c1ba2";
version = "2022-03-14-unstable";
src = fetchFromGitHub {
owner = "zmap";
repo = pname;
inherit rev;
sha256 = "0pdfz1489ynpw72flalnlkwybp683v826icjx7ljys45xvagdvck";
rev = "d659a361f6d5165462c10e1c1243f420175e066b";
hash = "sha256-856O6H03me3IM39/+6n56KJIetL+v4on6+lJx5D2Pcw=";
};
vendorSha256 = "0b8h5n01xmhar1a09svb35ah48k9zdy1mn5balq0h2l0jxr05z78";
subPackages = [ "zdns" ];
vendorSha256 = "sha256-5kZ0voyicnqK/0yrMYW+gR1vVDyptW6I1HgyG4zleX8=";
meta = with lib; {
description = "CLI DNS lookup tool";
+4
View File
@@ -244,6 +244,8 @@ in {
aio-georss-gdacs = callPackage ../development/python-modules/aio-georss-gdacs { };
aioairzone = callPackage ../development/python-modules/aioairzone { };
aioambient = callPackage ../development/python-modules/aioambient { };
aioapns = callPackage ../development/python-modules/aioapns { };
@@ -5045,6 +5047,8 @@ in {
mediafile = callPackage ../development/python-modules/mediafile { };
meilisearch = callPackage ../development/python-modules/meilisearch { };
meinheld = callPackage ../development/python-modules/meinheld { };
meld3 = callPackage ../development/python-modules/meld3 { };