Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2022-07-09 06:01:57 +00:00 committed by GitHub
commit 72c9a2a647
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
31 changed files with 227 additions and 71 deletions

View file

@ -6707,7 +6707,7 @@
};
kilimnik = {
email = "mail@kilimnik.de";
github = "killercup";
github = "kilimnik";
githubId = 5883283;
name = "Daniel Kilimnik";
};

View file

@ -1,4 +1,5 @@
{ lib, mkDerivation
{ lib
, stdenv
, fetchFromGitHub
, cmake
, docbook_xml_dtd_45
@ -14,15 +15,15 @@
, sword
}:
mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "bibletime";
version = "3.0.2";
version = "3.0.3";
src = fetchFromGitHub {
owner = "bibletime";
repo = "bibletime";
rev = "v${version}";
hash = "sha256-8X5LkquALFnG0yRayZYjeymHDcOzINBv0MXeVBsOnfI=";
repo = finalAttrs.pname;
rev = "v${finalAttrs.version}";
hash = "sha256-4O8F5/EyoJFJBEWOAs9lzN3TKuu/CEdKfPaOF8gNqps=";
};
nativeBuildInputs = [
@ -55,10 +56,10 @@ mkDerivation rec {
];
meta = with lib; {
description = "A powerful cross platform Bible study tool";
homepage = "http://www.bibletime.info/";
platforms = platforms.linux;
description = "A powerful cross platform Bible study tool";
license = licenses.gpl2Plus;
maintainers = [ ];
maintainers = with maintainers; [ AndersonTorres ];
platforms = platforms.linux;
};
}
})

View file

@ -0,0 +1,67 @@
{ lib
, stdenv
, fetchFromGitHub
, autoreconfHook
, check
, flex
, pkg-config
, which
, elfutils
, libelf
, llvm
, zlib
}:
stdenv.mkDerivation rec {
pname = "nvc";
version = "1.6.2";
src = fetchFromGitHub {
owner = "nickg";
repo = pname;
rev = "r${version}";
sha256 = "sha256-BtUMpT1MKRFGRlIbCEGo4OBZ/r9es1VRmJdgmk1oZFQ=";
};
nativeBuildInputs = [
autoreconfHook
check
flex
pkg-config
which
];
buildInputs = [
llvm
zlib
] ++ [
(if stdenv.isLinux then elfutils else libelf)
];
# TODO: remove me on 1.7.0
postPatch = ''
sed -i "/vests22/d;/vhpi4/d" test/regress/testlist.txt
'';
preConfigure = ''
mkdir build
cd build
'';
configureScript = "../configure";
configureFlags = [
"--enable-vhpi"
"--disable-lto"
];
doCheck = true;
meta = with lib; {
description = "VHDL compiler and simulator";
homepage = "https://www.nickg.me.uk/nvc/";
license = licenses.gpl3Plus;
platforms = platforms.unix;
maintainers = with maintainers; [ wegank ];
};
}

View file

@ -40,11 +40,11 @@
stdenv.mkDerivation rec {
pname = "epiphany";
version = "42.2";
version = "42.3";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
sha256 = "ksAs+IbRDSzP9d5ljhpCDqsx0gu1DnRtQw6VNbSFGS0=";
sha256 = "cxbTxlAOgl2OVyk/pYBHxWcnvuFs1rasgE/+XZsilWA=";
};
patches = lib.optionals withPantheon [

View file

@ -21,13 +21,13 @@
stdenv.mkDerivation rec {
pname = "folly";
version = "2022.06.13.00";
version = "2022.07.04.00";
src = fetchFromGitHub {
owner = "facebook";
repo = "folly";
rev = "v${version}";
sha256 = "sha256-30Fzk97wVK0JR/6YllyBjW9KlYrFj+GJpuV+V2bKXL8=";
sha256 = "sha256-TUtqwFBxYMnjXpygwXYWK7FNvTPL4a7T+rn1TMtUIPc=";
};
nativeBuildInputs = [

View file

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "aioskybell";
version = "22.6.1";
version = "22.7.0";
format = "setuptools";
disabled = pythonOlder "3.9";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "tkdrob";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-VaG8r4ULbjI7LkIPCit3bILZgOi9k7ddRQXwVzplaCM=";
hash = "sha256-aBT1fDFtq1vasTvCnAXKV2vmZ6LBLZqRCiepv1HDJ+Q=";
};
propagatedBuildInputs = [

View file

@ -0,0 +1,35 @@
{ lib
, buildPythonPackage
, fetchPypi
, pytestCheckHook
}:
let
pname = "atomicwrites-homeassistant";
version = "1.4.1";
in
buildPythonPackage {
inherit pname version;
format = "setuptools";
src = fetchPypi {
inherit pname version;
hash = "sha256-JWpnIQbxZ0VEUijZZiQLd7VfRqCW0gMFkBpXql0fTC8=";
};
pythonImportsCheck = [
"atomicwrites"
];
checkInputs = [
pytestCheckHook
];
meta = with lib; {
description = "Atomic file writes";
homepage = "https://pypi.org/project/atomicwrites-homeassistant/";
license = licenses.mit;
maintainers = with maintainers; [ hexa ];
};
}

View file

@ -6,7 +6,6 @@
, certifi
, ecs-logging
, fetchFromGitHub
, fetchpatch
, httpx
, jinja2
, jsonschema
@ -29,7 +28,7 @@
buildPythonPackage rec {
pname = "elastic-apm";
version = "6.9.1";
version = "6.10.1";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -38,17 +37,9 @@ buildPythonPackage rec {
owner = "elastic";
repo = "apm-agent-python";
rev = "v${version}";
sha256 = "sha256-IaCl39rhsFLQwvQdPcqKruV/Mo3f7WH91UVgMG/cnOc=";
hash = "sha256-ql6qBnZXa0JL1qEXj2OzzP3onjYrMx6+Be6K3SDuWf4=";
};
patches = [
(fetchpatch {
# fix tests with sanic>=22.3.0
url = "https://github.com/elastic/apm-agent-python/commit/114ee6ca998b4d6a5cb075a289af39cb963cf08a.patch";
hash = "sha256-M6yEHjThKDCRQOmR0L94KEt8tUun1tPRULI6PNIlE/8=";
})
];
propagatedBuildInputs = [
aiohttp
blinker

View file

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "elkm1-lib";
version = "2.0.0";
version = "2.0.2";
format = "pyproject";
disabled = pythonOlder "3.9";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "gwww";
repo = "elkm1";
rev = version;
hash = "sha256-o0RQgAP38W7paVJonrfj54y2OhMmTihT9xiipEyNVaM=";
hash = "sha256-2UneQL8LT/zm0iusKay9SxeJClGrDi6yL0lRA8ugUms=";
};
nativeBuildInputs = [

View file

@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "google-cloud-bigquery-storage";
version = "2.13.2";
version = "2.14.0";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-rEznNOgFrKfnOmlhexTTHmkKETRGE26SKSp04diz47I=";
sha256 = "sha256-udzLm/aYwXjeyBV70J/NjjhUMLHJ7wXHMS8OSlnrrZU=";
};
propagatedBuildInputs = [

View file

@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "google-cloud-iam-logging";
version = "1.0.2";
version = "1.0.3";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
hash = "sha256-f5ZETn1zLrC+1Gil47zzJGanx7cFBisdoFPoDe1FFwo=";
hash = "sha256-JUrzCSON1oMVH0U1d4tfl1nGDc+IyIMOSL4PxEflDAU=";
};
propagatedBuildInputs = [

View file

@ -14,14 +14,14 @@
buildPythonPackage rec {
pname = "google-cloud-monitoring";
version = "2.9.2";
version = "2.10.0";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
hash = "sha256-ePJGEBzo5lXBnCDMuZQPVoU9gT4yfDs8YZB50x4xb90=";
hash = "sha256-hnDzNkFluRjq/Bxk6NIXezGLDEMAcW4MLQG7F5U9Ez8=";
};
propagatedBuildInputs = [

View file

@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "google-cloud-os-config";
version = "1.11.2";
version = "1.12.0";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-n3bCKr+fszqHsi6uDmOXSfzoPP8JfpZRAGXIzE3gOVU=";
sha256 = "sha256-k68hDx0D2b59PJpUjMcwDtIqnwhrQxEpxDZCo5JQuXc=";
};
propagatedBuildInputs = [ google-api-core libcst proto-plus ];

View file

@ -15,14 +15,14 @@
buildPythonPackage rec {
pname = "google-cloud-pubsub";
version = "2.13.0";
version = "2.13.1";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
hash = "sha256-pcLgXIPWC7F6FS5Znn9DJMn/tsjNpE/7YlCxYoDDg+Y=";
hash = "sha256-P5x5cUxSKYueJJpGZgwb8NRX9nkovOzw2Ox6BrzGzFQ=";
};
propagatedBuildInputs = [

View file

@ -2,7 +2,7 @@
, acme
, aiohttp
, asynctest
, atomicwrites
, atomicwrites-homeassistant
, attrs
, buildPythonPackage
, fetchFromGitHub
@ -15,13 +15,13 @@
buildPythonPackage rec {
pname = "hass-nabucasa";
version = "0.54.0";
version = "0.54.1";
src = fetchFromGitHub {
owner = "nabucasa";
repo = pname;
rev = version;
sha256 = "sha256-UL7HPmii65p+WO22y0qv8zq3yICKarRORqE+FK1u7OE=";
sha256 = "sha256-usxyONJZQOfLWtfuGUOOHL/Js2ROo7nODqgw++LgTis=";
};
postPatch = ''
@ -35,7 +35,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [
acme
aiohttp
atomicwrites
atomicwrites-homeassistant
attrs
pycognito
snitun

View file

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "pydeconz";
version = "96";
version = "97";
format = "setuptools";
disabled = pythonOlder "3.9";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "Kane610";
repo = "deconz";
rev = "refs/tags/v${version}";
hash = "sha256-6W8GPsIvFlbgXkkN5tJEXyGKsjLfdJzgP8VS07lYZn4=";
hash = "sha256-amocjnusTYXkAx1XN+qiMQUQBs97bqVK0wnqy5cIZ9E=";
};
propagatedBuildInputs = [

View file

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "pyezviz";
version = "0.2.0.8";
version = "0.2.0.9";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "baqs";
repo = "pyEzviz";
rev = version;
sha256 = "sha256-W2JtqRyNVUo74esmCvCQygIMB1+v77OW/ll48IMVj/Y=";
sha256 = "sha256-HdtyERk2Af+O7/ei7S1+JO6zQxNXrSX95k9707SQuwE=";
};
propagatedBuildInputs = [

View file

@ -6,13 +6,13 @@
buildPythonPackage rec {
pname = "pyxiaomigateway";
version = "0.13.4";
version = "0.14.1";
src = fetchFromGitHub {
owner = "Danielhiversen";
repo = "PyXiaomiGateway";
rev = version;
sha256 = "1xg89sdds04wgil88ihs84cjr3df6lajjbkyb1aymj638ibdyqns";
sha256 = "sha256-e/FqqUl90VFDJD6ZFbFqXKH3s2sBaDjSFEvaKJhDlGg=";
};
propagatedBuildInputs = [ cryptography ];

View file

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "regenmaschine";
version = "2022.06.1";
version = "2022.07.0";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "bachya";
repo = pname;
rev = "refs/tags/${version}";
sha256 = "sha256-Q29e2f/6r0QFN5EPL8Gs1Z4CcvKXrZaYcEMgCJ9uuW8=";
sha256 = "sha256-zUef2AMC+vNINUi78xv3rSfBJ9peG7dlDVVmn+WFAsk=";
};
nativeBuildInputs = [

View file

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "rns";
version = "0.3.9";
version = "0.3.10";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "markqvist";
repo = "Reticulum";
rev = "refs/tags/${version}";
hash = "sha256-dueVAX6/83OeOyVpBnXOYpS0U/4CQvZfq5ivj+HvG48=";
hash = "sha256-CFPbVjmvf8iB7RIT9eLLw1Q5MEp4TBxcjtUwbh8OrxQ=";
};
propagatedBuildInputs = [

View file

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "bazel-remote";
version = "2.3.7";
version = "2.3.8";
src = fetchFromGitHub {
owner = "buchgr";
repo = pname;
rev = "v${version}";
sha256 = "sha256-5VxPCfartTRYCmjwNrH7SM0o7IQ4+Tq8Q2IM8hFWyVc=";
sha256 = "sha256-iMVBkmZmjk4w5WN1sPBJQWC5Ktbl3Y6g62IpyGuM0Xg=";
};
vendorSha256 = "sha256-wXgW7HigMIeUZAcZpm5TH9thfCHmpz+M42toWHgwIYo=";

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "cloud-nuke";
version = "0.11.8";
version = "0.12.2";
src = fetchFromGitHub {
owner = "gruntwork-io";
repo = pname;
rev = "v${version}";
sha256 = "sha256-0GP7T/OspaJVATd0dYNVniDh0XAiL09dopNnOQrLpCs=";
sha256 = "sha256-ZBhuRv5IF2VmbvGtXLzVnY3eSso+TSCS05UvCbjtSZ0=";
};
vendorSha256 = "sha256-4BUKUDr0bcd4AcMGIDC7HIhDI7pdTu2efkLqRD7Piw0=";
vendorSha256 = "sha256-N4oyyWY/ANuRFxnfBBAGwacofaYR5/ZH867W/2sm+Gk=";
ldflags = [ "-s" "-w" "-X main.VERSION=${version}" ];

View file

@ -7,7 +7,7 @@ let
in
buildNodejs {
inherit enableNpm;
version = "14.19.3";
sha256 = "sha256-XPRbHxrKd1I6zzYkDB1TqZknkHCncR6r8jNG+IsMyZQ=";
version = "14.20.0";
sha256 = "0slrcgiwwn8isp2ih5i2v1d6lsafz7bg6qwxf2lydlc9i14rhl1b";
patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff;
}

View file

@ -7,8 +7,8 @@ let
in
buildNodejs {
inherit enableNpm;
version = "18.4.0";
sha256 = "sha256-lNbxmpcDYfjIrRdFBgQJU4n1HKagDc3lnCHzc+lau7U=";
version = "18.5.0";
sha256 = "0c50y6c52pmbxc8x1zhkzq608bwvcma4fj39cd1mvc40wfa5d2rn";
patches = [
./disable-darwin-v8-system-instrumentation.patch
];

View file

@ -2,7 +2,7 @@
# Do not edit!
{
version = "2022.7.0";
version = "2022.7.2";
components = {
"abode" = ps: with ps; [
abodepy

View file

@ -190,7 +190,7 @@ let
extraPackagesFile = writeText "home-assistant-packages" (lib.concatMapStringsSep "\n" (pkg: pkg.pname) extraBuildInputs);
# Don't forget to run parse-requirements.py after updating
hassVersion = "2022.7.0";
hassVersion = "2022.7.2";
in python.pkgs.buildPythonApplication rec {
pname = "homeassistant";
@ -208,7 +208,7 @@ in python.pkgs.buildPythonApplication rec {
owner = "home-assistant";
repo = "core";
rev = version;
hash = "sha256-DDRut+3wJutXcQVOf2KU+XuHs5XuKkd5R7dQIXwOIrU=";
hash = "sha256-POOt5SjDa9jnBqxhD0LUopfAmZ9lpnb7mj7SSVoqTr0=";
};
# leave this in, so users don't have to constantly update their downstream patch handling
@ -245,7 +245,7 @@ in python.pkgs.buildPythonApplication rec {
aiohttp
astral
async-timeout
atomicwrites
atomicwrites-homeassistant
attrs
awesomeversion
bcrypt

View file

@ -4,7 +4,7 @@ buildPythonPackage rec {
# the frontend version corresponding to a specific home-assistant version can be found here
# https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json
pname = "home-assistant-frontend";
version = "20220706.0";
version = "20220707.0";
format = "wheel";
src = fetchPypi {
@ -12,7 +12,7 @@ buildPythonPackage rec {
pname = "home_assistant_frontend";
dist = "py3";
python = "py3";
sha256 = "sha256-hTdfe+S9D6Grtku5AkRJpCNBvYv2JspSPmXRHHfEPrA=";
sha256 = "sha256-ZNaa+YyY77b8Pg462tVewUe+K7ePTflESjZ+ar1cFc4=";
};
# there is nothing to strip in this package

View file

@ -0,0 +1,56 @@
{ lib
, stdenv
, fetchFromGitHub
, writeText
, fontconfig
, libX11
, libXft
, libXinerama
, conf ? null
, nix-update-script
}:
stdenv.mkDerivation rec {
pname = "xprompt";
version = "2.5.0";
src = fetchFromGitHub {
owner = "phillbush";
repo = "xprompt";
rev = "v${version}";
sha256 = "sha256-pOayKngUlrMY3bFsP4Fi+VsOLKCUQU3tdkZ+0OY1SCo=";
};
buildInputs = [
fontconfig
libX11
libXft
libXinerama
];
postPatch = with lib;
let
configFile =
if isDerivation conf || builtins.isPath conf
then conf else writeText "config.h" conf;
in
optionalString (conf != null) "cp ${configFile} config.h";
makeFlags = [ "PREFIX=$(out)" ];
passthru.updateScript = nix-update-script {
attrPath = pname;
};
meta = with lib; {
description = "A dmenu rip-off with contextual completion";
longDescription = ''
XPrompt is a prompt for X. XPrompt features a text input field where the
user can type in a text subject to tab-completion.
'';
homepage = "https://github.com/phillbush/xprompt";
license = licenses.mit;
maintainers = with maintainers; [ azahi ];
platforms = platforms.unix;
};
}

View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "dnsproxy";
version = "0.43.0";
version = "0.43.1";
src = fetchFromGitHub {
owner = "AdguardTeam";
repo = pname;
rev = "v${version}";
sha256 = "sha256-rhhfXdtPxNnHqMgkLfm9ZMXWbKHMAPnFzeyMxt3LbeA=";
sha256 = "sha256-q+MLFdZTn14FhJ+gV3j5gVusL19lR7Cpd1BGxGvi848=";
};
vendorSha256 = null;

View file

@ -11856,6 +11856,8 @@ with pkgs;
xfstests = callPackage ../tools/misc/xfstests { };
xprompt = callPackage ../tools/X11/xprompt { };
xprintidle = callPackage ../tools/X11/xprintidle {};
xprintidle-ng = callPackage ../tools/X11/xprintidle-ng {};
@ -34019,6 +34021,8 @@ with pkgs;
ngspice = callPackage ../applications/science/electronics/ngspice { };
nvc = callPackage ../applications/science/electronics/nvc { };
openems = callPackage ../applications/science/electronics/openems {
qcsxcad = libsForQt5.qcsxcad;
};

View file

@ -771,6 +771,8 @@ in {
atomicwrites = callPackage ../development/python-modules/atomicwrites { };
atomicwrites-homeassistant = callPackage ../development/python-modules/atomicwrites-homeassistant { };
atomman = callPackage ../development/python-modules/atomman { };
atpublic = callPackage ../development/python-modules/atpublic { };