From 234be397d65393c16d562fda3f397c6de6fd2510 Mon Sep 17 00:00:00 2001 From: Azat Bahawi Date: Tue, 5 Jul 2022 21:42:16 +0300 Subject: [PATCH 01/28] xprompt: init at 2.5.0 --- pkgs/tools/X11/xprompt/default.nix | 56 ++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 58 insertions(+) create mode 100644 pkgs/tools/X11/xprompt/default.nix diff --git a/pkgs/tools/X11/xprompt/default.nix b/pkgs/tools/X11/xprompt/default.nix new file mode 100644 index 000000000000..69149b3889b8 --- /dev/null +++ b/pkgs/tools/X11/xprompt/default.nix @@ -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; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c79431daf6bc..649a11abd53e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11842,6 +11842,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 {}; From 8344ddaf455818e2acfb5a9bf6114f8508c38fab Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 7 Jul 2022 07:42:04 -0300 Subject: [PATCH 02/28] bibletime: 3.0.2 -> 3.0.3 --- pkgs/applications/misc/bibletime/default.nix | 21 ++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/misc/bibletime/default.nix b/pkgs/applications/misc/bibletime/default.nix index b08c418e1e08..f5b027a9b2de 100644 --- a/pkgs/applications/misc/bibletime/default.nix +++ b/pkgs/applications/misc/bibletime/default.nix @@ -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; }; -} +}) From f62dd754333d0a113e0f51cdf7267427278023e2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Jul 2022 02:36:42 +0000 Subject: [PATCH 03/28] elmPackages.nodejs: 14.19.3 -> 14.20.0 --- pkgs/development/web/nodejs/v14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v14.nix b/pkgs/development/web/nodejs/v14.nix index 7cae7dd557a2..ab2d2c01bc18 100644 --- a/pkgs/development/web/nodejs/v14.nix +++ b/pkgs/development/web/nodejs/v14.nix @@ -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; } From 4a706341b1697868373f4ca717d2974f8541f84b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Jul 2022 03:50:06 +0000 Subject: [PATCH 04/28] bazel-remote: 2.3.7 -> 2.3.8 --- .../tools/build-managers/bazel/bazel-remote/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix b/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix index f519ce5233ef..cd5e90af73f3 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix @@ -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="; From 22c2fef365d5a1a918bfd73b7aa58defd3d1b011 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 8 Jul 2022 07:22:45 +0200 Subject: [PATCH 05/28] nvc: init at 1.6.2 --- .../science/electronics/nvc/default.nix | 67 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 69 insertions(+) create mode 100644 pkgs/applications/science/electronics/nvc/default.nix diff --git a/pkgs/applications/science/electronics/nvc/default.nix b/pkgs/applications/science/electronics/nvc/default.nix new file mode 100644 index 000000000000..3def53dbd2e4 --- /dev/null +++ b/pkgs/applications/science/electronics/nvc/default.nix @@ -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 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5092e04fe974..acd988cb519c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33986,6 +33986,8 @@ with pkgs; ngspice = callPackage ../applications/science/electronics/ngspice { }; + nvc = callPackage ../applications/science/electronics/nvc { }; + openems = callPackage ../applications/science/electronics/openems { qcsxcad = libsForQt5.qcsxcad; }; From bb6307872c4eeeb2c081576b25bbc5ade5b4687f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Jul 2022 06:14:42 +0000 Subject: [PATCH 06/28] cloud-nuke: 0.11.8 -> 0.12.2 --- pkgs/development/tools/cloud-nuke/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/cloud-nuke/default.nix b/pkgs/development/tools/cloud-nuke/default.nix index 3354b6f69371..666ddd647f36 100644 --- a/pkgs/development/tools/cloud-nuke/default.nix +++ b/pkgs/development/tools/cloud-nuke/default.nix @@ -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}" ]; From a7f7997ae667f847d7cf6ca80243d77f9abaf1fc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Jul 2022 08:00:13 +0000 Subject: [PATCH 07/28] dnsproxy: 0.43.0 -> 0.43.1 --- pkgs/tools/networking/dnsproxy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/dnsproxy/default.nix b/pkgs/tools/networking/dnsproxy/default.nix index 7fd740a9035b..15b0e23493d8 100644 --- a/pkgs/tools/networking/dnsproxy/default.nix +++ b/pkgs/tools/networking/dnsproxy/default.nix @@ -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; From c23ba198feacff9df7743f535b4609ff05450b2f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Jul 2022 08:21:41 +0000 Subject: [PATCH 08/28] nodejs-18_x: 18.4.0 -> 18.5.0 --- pkgs/development/web/nodejs/v18.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v18.nix b/pkgs/development/web/nodejs/v18.nix index a2c10d1b96b2..78cb2a687931 100644 --- a/pkgs/development/web/nodejs/v18.nix +++ b/pkgs/development/web/nodejs/v18.nix @@ -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 ]; From 115b16a2d179c951dde778ab2a5c1d2e5708644b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Jul 2022 10:57:39 +0000 Subject: [PATCH 09/28] folly: 2022.06.13.00 -> 2022.07.04.00 --- pkgs/development/libraries/folly/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix index fdda2b3a6205..8cc763f229d6 100644 --- a/pkgs/development/libraries/folly/default.nix +++ b/pkgs/development/libraries/folly/default.nix @@ -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 = [ From 45697c5a78bba609960896400459576d2e02f234 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 9 Jul 2022 00:53:40 +0200 Subject: [PATCH 10/28] python310Packages.pyxiaomigateway: 0.13.4 -> 0.14.1 --- pkgs/development/python-modules/pyxiaomigateway/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyxiaomigateway/default.nix b/pkgs/development/python-modules/pyxiaomigateway/default.nix index 1d3a83177edb..015d07be09b9 100644 --- a/pkgs/development/python-modules/pyxiaomigateway/default.nix +++ b/pkgs/development/python-modules/pyxiaomigateway/default.nix @@ -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 ]; From 51bd339361b92860e998f1a3bb037b368ee9002a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 9 Jul 2022 00:57:36 +0200 Subject: [PATCH 11/28] python310Packages.pyezviz: 0.2.0.8 -> 0.2.0.9 --- pkgs/development/python-modules/pyezviz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyezviz/default.nix b/pkgs/development/python-modules/pyezviz/default.nix index 1d01f491676e..35f8eb4bfa44 100644 --- a/pkgs/development/python-modules/pyezviz/default.nix +++ b/pkgs/development/python-modules/pyezviz/default.nix @@ -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 = [ From a3ca332d09c753d33aa6947e70989a0c9cc119f8 Mon Sep 17 00:00:00 2001 From: kilimnik Date: Sat, 9 Jul 2022 01:09:32 +0200 Subject: [PATCH 12/28] maintainers: update github for kilimnik --- maintainers/maintainer-list.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index b10c15775ed6..c54fcf2413fd 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6707,7 +6707,7 @@ }; kilimnik = { email = "mail@kilimnik.de"; - github = "killercup"; + github = "kilimnik"; githubId = 5883283; name = "Daniel Kilimnik"; }; From ca82e5b1ec33a98755ed345704a001913afa5187 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 8 Jul 2022 13:31:22 +0200 Subject: [PATCH 13/28] python3Packages.aioskybell: 22.6.1 -> 22.7.0 --- pkgs/development/python-modules/aioskybell/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioskybell/default.nix b/pkgs/development/python-modules/aioskybell/default.nix index db2573fa9599..0f3e8c041e0c 100644 --- a/pkgs/development/python-modules/aioskybell/default.nix +++ b/pkgs/development/python-modules/aioskybell/default.nix @@ -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 = [ From abb0b2f64cf59a9bada540e7ee56e4600e57408e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 8 Jul 2022 13:31:52 +0200 Subject: [PATCH 14/28] python3Packages.elkm1-lib: 2.0.0 -> 2.0.2 --- pkgs/development/python-modules/elkm1-lib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/elkm1-lib/default.nix b/pkgs/development/python-modules/elkm1-lib/default.nix index 40f9aa451b69..f0815b15c71d 100644 --- a/pkgs/development/python-modules/elkm1-lib/default.nix +++ b/pkgs/development/python-modules/elkm1-lib/default.nix @@ -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 = [ From 5baeaf5d6fdc10f1bf28147e12b98a74550f9b56 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 8 Jul 2022 13:33:43 +0200 Subject: [PATCH 15/28] home-assistant: 2022.7.0 -> 2022.7.1 https://github.com/home-assistant/core/releases/tag/2022.7.1 --- pkgs/servers/home-assistant/component-packages.nix | 2 +- pkgs/servers/home-assistant/default.nix | 4 ++-- pkgs/servers/home-assistant/frontend.nix | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 1c65fce6e7fe..37b185623760 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2022.7.0"; + version = "2022.7.1"; components = { "abode" = ps: with ps; [ abodepy diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index b343971f0442..c2ace4c663ca 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -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.1"; 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-p5Ht8poSUqaK3pluRuwmyk/tphihYI0H3XNu8YI06R4="; }; # leave this in, so users don't have to constantly update their downstream patch handling diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index f92314f83df0..0d067d7d3db2 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -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 From 44932cf74c006709fe27e380b3506af49db212e6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 9 Jul 2022 01:51:12 +0200 Subject: [PATCH 16/28] python3Packages.atomicwrites-homeassistant: init at 1.0.4 --- .../atomicwrites-homeassistant/default.nix | 35 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/development/python-modules/atomicwrites-homeassistant/default.nix diff --git a/pkgs/development/python-modules/atomicwrites-homeassistant/default.nix b/pkgs/development/python-modules/atomicwrites-homeassistant/default.nix new file mode 100644 index 000000000000..d905e590af0a --- /dev/null +++ b/pkgs/development/python-modules/atomicwrites-homeassistant/default.nix @@ -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 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index df044ef44b38..d8ed29a77d09 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -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 { }; From 9432a9cb99289a9e2718c239c5c7b1230c2ad4d5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 9 Jul 2022 01:51:33 +0200 Subject: [PATCH 17/28] python3Packages.hass-nabucasa: 0.54.0 -> 0.54.1 --- pkgs/development/python-modules/hass-nabucasa/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/hass-nabucasa/default.nix b/pkgs/development/python-modules/hass-nabucasa/default.nix index 3b0531084244..36b626e4dc02 100644 --- a/pkgs/development/python-modules/hass-nabucasa/default.nix +++ b/pkgs/development/python-modules/hass-nabucasa/default.nix @@ -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 From 623d908cc4517f53cbf8498e1d9a20511e7b78ba Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 9 Jul 2022 01:52:19 +0200 Subject: [PATCH 18/28] python3Packages.pydeconz: 96 -> 97 --- pkgs/development/python-modules/pydeconz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pydeconz/default.nix b/pkgs/development/python-modules/pydeconz/default.nix index a8e661e58d72..22793fb30f22 100644 --- a/pkgs/development/python-modules/pydeconz/default.nix +++ b/pkgs/development/python-modules/pydeconz/default.nix @@ -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 = [ From 2fe8ae2a1a9186136ef68ee9870ffbce83f4699a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 9 Jul 2022 01:52:41 +0200 Subject: [PATCH 19/28] python3Packages.regenmaschine: 2022.06.1 -> 2022.07.0 --- pkgs/development/python-modules/regenmaschine/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/regenmaschine/default.nix b/pkgs/development/python-modules/regenmaschine/default.nix index 0493459a7aa7..da13a28b67f8 100644 --- a/pkgs/development/python-modules/regenmaschine/default.nix +++ b/pkgs/development/python-modules/regenmaschine/default.nix @@ -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 = [ From 21eb9aca592511a5f95b891b4e2f6cc8ac035bdf Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 9 Jul 2022 02:19:46 +0200 Subject: [PATCH 20/28] home-assistant: 2022.7.1 -> 2022.7.2 https://github.com/home-assistant/core/releases/tag/2022.7.2 --- pkgs/servers/home-assistant/component-packages.nix | 2 +- pkgs/servers/home-assistant/default.nix | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 37b185623760..109e058b169d 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2022.7.1"; + version = "2022.7.2"; components = { "abode" = ps: with ps; [ abodepy diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index c2ace4c663ca..a6c615cc3c1d 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -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.1"; + 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-p5Ht8poSUqaK3pluRuwmyk/tphihYI0H3XNu8YI06R4="; + 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 From 7bb2af4f3268ad79b1cc7c733a06e050df50854e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Jul 2022 19:46:01 +0000 Subject: [PATCH 21/28] python310Packages.google-cloud-iam-logging: 1.0.2 -> 1.0.3 --- .../python-modules/google-cloud-iam-logging/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-iam-logging/default.nix b/pkgs/development/python-modules/google-cloud-iam-logging/default.nix index b867c40140ba..ca0db441abcf 100644 --- a/pkgs/development/python-modules/google-cloud-iam-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-iam-logging/default.nix @@ -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 = [ From 41f92265611e635847ef3c84412ff407297e708e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Jul 2022 19:51:25 +0000 Subject: [PATCH 22/28] python310Packages.google-cloud-monitoring: 2.9.2 -> 2.10.0 --- .../python-modules/google-cloud-monitoring/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-monitoring/default.nix b/pkgs/development/python-modules/google-cloud-monitoring/default.nix index b68f3b4ce4e3..3325942f04d8 100644 --- a/pkgs/development/python-modules/google-cloud-monitoring/default.nix +++ b/pkgs/development/python-modules/google-cloud-monitoring/default.nix @@ -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 = [ From 9870c00d2b349de876aad4ece48c68a84fd5588c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Jul 2022 19:35:26 +0000 Subject: [PATCH 23/28] python310Packages.google-cloud-bigquery-storage: 2.13.2 -> 2.14.0 --- .../python-modules/google-cloud-bigquery-storage/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix b/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix index e013cac9f610..4e2082ba3b55 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix @@ -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 = [ From 717d22a40fe777157d1518937042d91f6a988d8d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 8 Jul 2022 21:46:39 +0200 Subject: [PATCH 24/28] python310Packages.elastic-apm: 6.9.1 -> 6.10.1 --- .../python-modules/elastic-apm/default.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/elastic-apm/default.nix b/pkgs/development/python-modules/elastic-apm/default.nix index 0d016b92ec3a..f4fea05b4110 100644 --- a/pkgs/development/python-modules/elastic-apm/default.nix +++ b/pkgs/development/python-modules/elastic-apm/default.nix @@ -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 From ea64a0450b4066dc56cbcc7a30383099ad7fb238 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Jul 2022 19:56:28 +0000 Subject: [PATCH 25/28] python310Packages.google-cloud-os-config: 1.11.2 -> 1.12.0 --- .../python-modules/google-cloud-os-config/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-os-config/default.nix b/pkgs/development/python-modules/google-cloud-os-config/default.nix index d2235b44cf60..d18c35a464f6 100644 --- a/pkgs/development/python-modules/google-cloud-os-config/default.nix +++ b/pkgs/development/python-modules/google-cloud-os-config/default.nix @@ -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 ]; From f9bc4952ea208c14e4f8f425ba1471cbcc8d5692 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Jul 2022 20:01:27 +0000 Subject: [PATCH 26/28] python310Packages.google-cloud-pubsub: 2.13.0 -> 2.13.1 --- .../python-modules/google-cloud-pubsub/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-pubsub/default.nix b/pkgs/development/python-modules/google-cloud-pubsub/default.nix index aac222df0ac3..553a76396383 100644 --- a/pkgs/development/python-modules/google-cloud-pubsub/default.nix +++ b/pkgs/development/python-modules/google-cloud-pubsub/default.nix @@ -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 = [ From 8b051477e86e1676e36e5a941d2675541ac28a69 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 8 Jul 2022 22:27:01 +0200 Subject: [PATCH 27/28] python310Packages.rns: 0.3.9 -> 0.3.10 --- pkgs/development/python-modules/rns/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rns/default.nix b/pkgs/development/python-modules/rns/default.nix index c6e1d109fac8..4010081aeaa3 100644 --- a/pkgs/development/python-modules/rns/default.nix +++ b/pkgs/development/python-modules/rns/default.nix @@ -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 = [ From 7abecbac0c5a345721be26d1bb4ed970290c34d3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 9 Jul 2022 02:50:21 +0000 Subject: [PATCH 28/28] epiphany: 42.2 -> 42.3 --- pkgs/desktops/gnome/core/epiphany/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/epiphany/default.nix b/pkgs/desktops/gnome/core/epiphany/default.nix index 2dcd037fa500..88cbbee0d0be 100644 --- a/pkgs/desktops/gnome/core/epiphany/default.nix +++ b/pkgs/desktops/gnome/core/epiphany/default.nix @@ -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 [