From b376ec113b8bab7b4dbae054bd2805e501e1a6f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yannik=20R=C3=B6del?= Date: Tue, 19 Jul 2022 13:25:52 +0200 Subject: [PATCH 01/28] home-assistant: fix packageOverrides ordering As documented by lib.composeManyExtensions, overrides intended to be applied later should come last in the list. This commit switches the order to make sure that custom overrides are in fact evaluated after the default ones. Also, since the previous version was basically a reimplementation of composeManyExtensions anyway, switching to that makes it a bit cleaner. --- pkgs/servers/home-assistant/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 5dd4d60cbde7..369c859db51b 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -155,8 +155,7 @@ let }; python = python3.override { - # Put packageOverrides at the start so they are applied after defaultOverrides - packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) ([ packageOverrides ] ++ defaultOverrides); + packageOverrides = lib.composeManyExtensions (defaultOverrides ++ [ packageOverrides ]); }; componentPackages = import ./component-packages.nix; From 307918ba5e1f9792794a4fabff45a29a5bfa816f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 6 Feb 2023 20:59:05 +0000 Subject: [PATCH 02/28] python310Packages.bitarray: 2.6.1 -> 2.7.0 --- pkgs/development/python-modules/bitarray/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bitarray/default.nix b/pkgs/development/python-modules/bitarray/default.nix index a9bbef0e4325..30a5b338617b 100644 --- a/pkgs/development/python-modules/bitarray/default.nix +++ b/pkgs/development/python-modules/bitarray/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "bitarray"; - version = "2.6.1"; + version = "2.7.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-hEClSTIh9u1sTg2csrpuTmAKX7Y59mAD6vFbcVCkkjA="; + hash = "sha256-ALtyPPcFnjCzKLZWizt1wPZS7JIo2VnVTpl4UqMaMaI="; }; checkPhase = '' From 48deb111694549bdbfbe5796a86842150e900d57 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Feb 2023 16:24:41 +0000 Subject: [PATCH 03/28] buttercup-desktop: 2.17.0 -> 2.18.2 --- pkgs/tools/security/buttercup-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/buttercup-desktop/default.nix b/pkgs/tools/security/buttercup-desktop/default.nix index 27cf191018e4..4c00f41919c9 100644 --- a/pkgs/tools/security/buttercup-desktop/default.nix +++ b/pkgs/tools/security/buttercup-desktop/default.nix @@ -2,10 +2,10 @@ let pname = "buttercup-desktop"; - version = "2.17.0"; + version = "2.18.2"; src = fetchurl { url = "https://github.com/buttercup/buttercup-desktop/releases/download/v${version}/Buttercup-linux-x86_64.AppImage"; - sha256 = "sha256-JD3ZFRWGCJq5VDGkTgIZuZPScQrNF4vsuCavBD3pigA="; + sha256 = "sha256-1WLhT94FNZ7be58uov/0vtvB7ET/WNY/tPSIuaW5zfc="; }; appimageContents = appimageTools.extractType2 { inherit pname src version; }; From b30dd1b8b5ab52b7aac49b8f394a1c5d6ed04fc6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Feb 2023 21:45:15 +0000 Subject: [PATCH 04/28] rpcs3: 0.0.26-14684-8652b7d35 -> 0.0.26-14702-cfb788941 --- pkgs/applications/emulators/rpcs3/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/emulators/rpcs3/default.nix b/pkgs/applications/emulators/rpcs3/default.nix index d3d5f1e11f5f..41d82a120499 100644 --- a/pkgs/applications/emulators/rpcs3/default.nix +++ b/pkgs/applications/emulators/rpcs3/default.nix @@ -9,10 +9,10 @@ let # Keep these separate so the update script can regex them - rpcs3GitVersion = "14684-8652b7d35"; - rpcs3Version = "0.0.26-14684-8652b7d35"; - rpcs3Revision = "8652b7d358fe975242dd2c51c91fd2968e6bcb82"; - rpcs3Sha256 = "08cd082cih9pcppipkhid1x1s7bq4grsz0zfa1rlxkzw3lajxnrf"; + rpcs3GitVersion = "14702-cfb788941"; + rpcs3Version = "0.0.26-14702-cfb788941"; + rpcs3Revision = "cfb788941ce73ebf41060baf0867861dd6bd3e13"; + rpcs3Sha256 = "0kwd3x043x3gsqlax3jcb5g1w2v7v7gghmqgbrn3vimcc47x62vn"; ittapi = fetchFromGitHub { owner = "intel"; From 469a7b73899f89e5d3e890555b158a58e0ab7be1 Mon Sep 17 00:00:00 2001 From: figsoda Date: Thu, 9 Feb 2023 18:37:54 -0500 Subject: [PATCH 05/28] zps: init at 1.2.8 --- pkgs/tools/system/zps/default.nix | 36 +++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/tools/system/zps/default.nix diff --git a/pkgs/tools/system/zps/default.nix b/pkgs/tools/system/zps/default.nix new file mode 100644 index 000000000000..f4003ed934d6 --- /dev/null +++ b/pkgs/tools/system/zps/default.nix @@ -0,0 +1,36 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +}: + +stdenv.mkDerivation rec { + pname = "zps"; + version = "1.2.8"; + + src = fetchFromGitHub { + owner = "orhun"; + repo = "zps"; + rev = version; + hash = "sha256-t0kVMrJn+eqUUD98pp3iIK28MoLwOplLk0sYgRJkO4c="; + }; + + nativeBuildInputs = [ + cmake + ]; + + postInstall = '' + mkdir -p $out/share/applications + substitute ../.application/zps.desktop $out/share/applications/zps.desktop \ + --replace Exec=zps Exec=$out/zps \ + ''; + + meta = with lib; { + description = "A small utility for listing and reaping zombie processes on GNU/Linux"; + homepage = "https://github.com/orhun/zps"; + changelog = "https://github.com/orhun/zps/releases/tag/${version}"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ figsoda ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 345252b22a5a..8c0961167b63 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13737,6 +13737,8 @@ with pkgs; zplug = callPackage ../shells/zsh/zplug { }; + zps = callPackage ../tools/system/zps { }; + zi = callPackage ../shells/zsh/zi {}; zinit = callPackage ../shells/zsh/zinit {} ; From cd85cbf7e3022ac2d41fe583eeb91e32653ccb1c Mon Sep 17 00:00:00 2001 From: figsoda Date: Thu, 9 Feb 2023 22:02:56 -0500 Subject: [PATCH 06/28] lipl: init at 0.1.3 --- pkgs/tools/misc/lipl/default.nix | 25 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/tools/misc/lipl/default.nix diff --git a/pkgs/tools/misc/lipl/default.nix b/pkgs/tools/misc/lipl/default.nix new file mode 100644 index 000000000000..b24fcaa3d2d1 --- /dev/null +++ b/pkgs/tools/misc/lipl/default.nix @@ -0,0 +1,25 @@ +{ lib +, rustPlatform +, fetchFromGitHub +}: + +rustPlatform.buildRustPackage rec { + pname = "lipl"; + version = "0.1.3"; + + src = fetchFromGitHub { + owner = "yxdunc"; + repo = "lipl"; + rev = "v${version}"; + hash = "sha256-ZeYz9g06vMsOk3YDmy0I+8e6BtLfweXqVH5uRt+mtes="; + }; + + cargoHash = "sha256-hcvC12dd6KDi7kYilXtBtyDQQG62YPMvSZA5trFqwWc="; + + meta = with lib; { + description = "A command line tool to analyse the output over time of custom shell commands"; + homepage = "https://github.com/yxdunc/lipl"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 345252b22a5a..ebbfd065961b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9512,6 +9512,8 @@ with pkgs; linuxquota = callPackage ../tools/misc/linuxquota { }; + lipl = callPackage ../tools/misc/lipl { }; + liquidctl = with python3Packages; toPythonApplication liquidctl; lmp = callPackage ../tools/security/lmp { }; From d5335155887fc5a098d63f602e4fccea02efb0e6 Mon Sep 17 00:00:00 2001 From: figsoda Date: Thu, 9 Feb 2023 22:17:24 -0500 Subject: [PATCH 07/28] muffet: init at 2.7.0 --- pkgs/tools/networking/muffet/default.nix | 26 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/tools/networking/muffet/default.nix diff --git a/pkgs/tools/networking/muffet/default.nix b/pkgs/tools/networking/muffet/default.nix new file mode 100644 index 000000000000..71c32ae7ad7d --- /dev/null +++ b/pkgs/tools/networking/muffet/default.nix @@ -0,0 +1,26 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "muffet"; + version = "2.7.0"; + + src = fetchFromGitHub { + owner = "raviqqe"; + repo = "muffet"; + rev = "v${version}"; + hash = "sha256-Kk0HRs4mzpEI9URFIegAVWejBZLGWW08vdsjw9ZHLxU="; + }; + + vendorHash = "sha256-auTDSL3J+LuW6M5LRAWJCvL1xAiyqluPt6EQpFztYpA="; + + meta = with lib; { + description = "A website link checker which scrapes and inspects all pages in a website recursively"; + homepage = "https://github.com/raviqqe/muffet"; + changelog = "https://github.com/raviqqe/muffet/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 345252b22a5a..8fc9217be5c4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9892,6 +9892,8 @@ with pkgs; mubeng = callPackage ../tools/networking/mubeng { }; + muffet = callPackage ../tools/networking/muffet { }; + multipass = libsForQt5.callPackage ../tools/virtualization/multipass { }; multitime = callPackage ../tools/misc/multitime { }; From 5dffbc4dd935ea7c46f855255d94173d9556a3d0 Mon Sep 17 00:00:00 2001 From: figsoda Date: Thu, 9 Feb 2023 22:49:25 -0500 Subject: [PATCH 08/28] pkgtop: init at 2.4.1 --- pkgs/tools/misc/pkgtop/default.nix | 30 ++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/tools/misc/pkgtop/default.nix diff --git a/pkgs/tools/misc/pkgtop/default.nix b/pkgs/tools/misc/pkgtop/default.nix new file mode 100644 index 000000000000..1d2f0c048f26 --- /dev/null +++ b/pkgs/tools/misc/pkgtop/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "pkgtop"; + version = "2.4.1"; + + src = fetchFromGitHub { + owner = "orhun"; + repo = "pkgtop"; + rev = version; + hash = "sha256-Skk7Zur2UMxNjrJmcp+FvUuNvbh9HmzuZ5mWcvhxcKk="; + }; + + vendorHash = "sha256-dlDbNym7CNn5088znMNgGAr2wBM3+nYv3q362353aLs="; + + postInstall = '' + mv $out/bin/{cmd,pkgtop} + ''; + + meta = with lib; { + description = "Interactive package manager and resource monitor designed for the GNU/Linux"; + homepage = "https://github.com/orhun/pkgtop"; + changelog = "https://github.com/orhun/pkgtop/releases/tag/${version}"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 345252b22a5a..4cfcbc7d7f03 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22633,6 +22633,8 @@ with pkgs; pkgdiff = callPackage ../tools/misc/pkgdiff { }; + pkgtop = callPackage ../tools/misc/pkgtop { }; + place-cursor-at = haskell.lib.compose.justStaticExecutables haskellPackages.place-cursor-at; platform-folders = callPackage ../development/libraries/platform-folders { }; From 4648012ed8aeddda993d660299a137c52ec9a92f Mon Sep 17 00:00:00 2001 From: figsoda Date: Fri, 10 Feb 2023 10:21:09 -0500 Subject: [PATCH 09/28] cargo-zigbuild: 0.15.0 -> 0.16.0 Diff: https://github.com/messense/cargo-zigbuild/compare/v0.15.0...v0.16.0 Changelog: https://github.com/messense/cargo-zigbuild/releases/tag/v0.16.0 --- pkgs/development/tools/rust/cargo-zigbuild/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-zigbuild/default.nix b/pkgs/development/tools/rust/cargo-zigbuild/default.nix index 79822a7735e5..02b2ea5430b1 100644 --- a/pkgs/development/tools/rust/cargo-zigbuild/default.nix +++ b/pkgs/development/tools/rust/cargo-zigbuild/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-zigbuild"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "messense"; repo = pname; rev = "v${version}"; - sha256 = "sha256-4Sp3PVhUvXn7FzPHHyyRBUHY5TQYEPLFdoI4ARQ4V0k="; + sha256 = "sha256-ITevZv/4Q21y3o9N4WSqD2vONQfNEXKHE/Af/f6T8vw="; }; - cargoSha256 = "sha256-QplcedhsqFiAwcqBrEe2ns4DdZ+R/IuoKtkx8eGk19g="; + cargoSha256 = "sha256-e5MIaX4R/z41x11SyZaiOERokCllC10J+rLra2I1N9c="; nativeBuildInputs = [ makeWrapper ]; From 1dad98b003f262e3fed3a2878d15a28f898e9780 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 10 Feb 2023 19:30:55 +0000 Subject: [PATCH 10/28] python310Packages.pymodbus: 3.1.2 -> 3.1.3 --- pkgs/development/python-modules/pymodbus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pymodbus/default.nix b/pkgs/development/python-modules/pymodbus/default.nix index a6e3f5eb9a74..e9cf439d36c1 100644 --- a/pkgs/development/python-modules/pymodbus/default.nix +++ b/pkgs/development/python-modules/pymodbus/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "pymodbus"; - version = "3.1.2"; + version = "3.1.3"; format = "setuptools"; src = fetchFromGitHub { owner = "pymodbus-dev"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-kae/TADu23NnCrXkJ/dkDBNIgBm/+BxXf+lh8uMxz/s="; + hash = "sha256-GHyDlt046v4KP9KQRnXH6F+3ikoCjbhVHEQuSdm99a8="; }; # Twisted asynchronous version is not supported due to a missing dependency From 057adb42c7d2edc2d6cf3ea66f8f9ff8e9bfcd9e Mon Sep 17 00:00:00 2001 From: Paolo Stivanin Date: Fri, 10 Feb 2023 10:37:24 +0100 Subject: [PATCH 11/28] otpclient: 2.5.1 -> 3.1.4 Lots of changes between these two releases. Everything that changed can be found here: https://github.com/paolostivanin/OTPClient/releases --- pkgs/applications/misc/otpclient/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/otpclient/default.nix b/pkgs/applications/misc/otpclient/default.nix index 9f416ff75a3c..bb1c725dff8b 100644 --- a/pkgs/applications/misc/otpclient/default.nix +++ b/pkgs/applications/misc/otpclient/default.nix @@ -10,21 +10,26 @@ , libzip , libpng , libcotp +, protobuf +, protobufc +, qrencode +, libsecret +, libuuid , zbar }: stdenv.mkDerivation rec { pname = "otpclient"; - version = "2.5.1"; + version = "3.1.4"; src = fetchFromGitHub { owner = "paolostivanin"; repo = pname; rev = "v${version}"; - sha256 = "sha256-VUrLbGaDfPE+Ak20ZCJDmO/sgBzdf4S+SqvyQ7F6SQU="; + sha256 = "sha256-Cz3fxmtpSe7GMGmmSLDG9kDifmIMgCBlBRjX/qardXA="; }; - buildInputs = [ gtk3 jansson libgcrypt libzip libpng libcotp zbar ]; + buildInputs = [ gtk3 jansson libgcrypt libzip libpng libcotp zbar protobuf protobufc libsecret qrencode libuuid ]; nativeBuildInputs = [ cmake pkg-config wrapGAppsHook ]; meta = with lib; { From 2323698c942ca1d7bd17b673f08235558444c7a4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 10 Feb 2023 19:49:53 +0000 Subject: [PATCH 12/28] kubelogin: 0.0.25 -> 0.0.26 --- pkgs/applications/networking/cluster/kubelogin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubelogin/default.nix b/pkgs/applications/networking/cluster/kubelogin/default.nix index 45f0ee66f61e..9726edcf5f09 100644 --- a/pkgs/applications/networking/cluster/kubelogin/default.nix +++ b/pkgs/applications/networking/cluster/kubelogin/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubelogin"; - version = "0.0.25"; + version = "0.0.26"; src = fetchFromGitHub { owner = "Azure"; repo = pname; rev = "v${version}"; - sha256 = "sha256-28snlCqvQ0aF7DHjeHWyjOYuy2wHd2EqEDqmst9MQLc="; + sha256 = "sha256-FDcNrtdAMiSvY84I4zdVEEfOf48n7vE26yQf3IZ69xg="; }; - vendorSha256 = "sha256-mjIB0ITf296yDQJP46EI6pLYkZfyU3yzD9iwP0iIXvQ="; + vendorHash = "sha256-mjIB0ITf296yDQJP46EI6pLYkZfyU3yzD9iwP0iIXvQ="; ldflags = [ "-X main.version=${version}" From 7b3bd00a19bd4c6640b81de366dcbd0b2e79038c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 10 Feb 2023 20:24:31 +0000 Subject: [PATCH 13/28] flyctl: 0.0.451 -> 0.0.456 --- pkgs/development/web/flyctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index e12230f4531b..b19e2e7a288c 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "flyctl"; - version = "0.0.451"; + version = "0.0.456"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - sha256 = "sha256-Tm05vO1mdeTGLpz++rahUubb69ajw04eK57VKZFUoDo="; + sha256 = "sha256-RKdw8Yk7G1QhtxYyQtaYS1iKECXxD8kEavzRcvPtmdM="; }; - vendorHash = "sha256-oJa+HUuv8RG4ldAe/cS8iR6QcWdPl8BgHE4sRASauRM="; + vendorHash = "sha256-57Ccqiuu2KQWdNqzqrmVXf7KnvjUjB9S1TMnDYu6b/I="; subPackages = [ "." ]; From ada4e200eeac8a341d6b897be7425a4a27bb2f78 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 10 Feb 2023 20:32:11 +0000 Subject: [PATCH 14/28] zef: 0.15.0 -> 0.16.0 --- pkgs/development/interpreters/rakudo/zef.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/rakudo/zef.nix b/pkgs/development/interpreters/rakudo/zef.nix index efd08f7d85b7..6602a6484f73 100644 --- a/pkgs/development/interpreters/rakudo/zef.nix +++ b/pkgs/development/interpreters/rakudo/zef.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zef"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "ugexe"; repo = "zef"; rev = "v${version}"; - sha256 = "sha256-MJKG/8b8l2RqWec5JoWcYLYrEKI9zrhJMyLqVcvAY+g="; + sha256 = "sha256-p8BihjMB0y8jcoFP/pxJNkwF3vEacMywV6W1Znv2fyo="; }; nativeBuildInputs = [ makeWrapper ]; From 65b9a4a973663069a9d23311cfe94a458c12efa3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 10 Feb 2023 21:06:35 +0000 Subject: [PATCH 15/28] afterburn: 5.4.0 -> 5.4.1 --- pkgs/tools/admin/afterburn/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/afterburn/default.nix b/pkgs/tools/admin/afterburn/default.nix index ddbcaf051825..f0aa3edd8a69 100644 --- a/pkgs/tools/admin/afterburn/default.nix +++ b/pkgs/tools/admin/afterburn/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "afterburn"; - version = "5.4.0"; + version = "5.4.1"; src = fetchFromGitHub { owner = "coreos"; repo = "afterburn"; rev = "v${version}"; - sha256 = "sha256-Y9Z2PdQU7yHTlEXW+/C6v9k+5TkeQMagbC/gGG+JssQ="; + sha256 = "sha256-QsdTrd9p89SiLCmvNlsLk9ET2BVeaJncDyWzycn5CLw="; }; - cargoHash = "sha256-ZDyB/s2ig3aklEeB1JzNHat+roQniKrMcw4rvy9Z5pk="; + cargoHash = "sha256-lCtG7UmXJegGVbjyYn9YJWSynikOK4qPmLS1XNesMUk="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; From 54cb9661f3b74931695524cf25078c23d9784d02 Mon Sep 17 00:00:00 2001 From: Jason Yundt Date: Wed, 8 Feb 2023 15:04:22 -0500 Subject: [PATCH 16/28] =?UTF-8?q?godot=5F4:=204.0-beta16=20->=204.0-rc1=20?= =?UTF-8?q?&=20use=20=E2=80=9Chash=20=3D=E2=80=9D=20instead=20of=20?= =?UTF-8?q?=E2=80=9Csha256=20=3D=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Changelog: When you use the sha256 attribute, using a “sha256-” prefix is redundant, so this commit uses the hash attribute instead. Co-authored-by: Artturin --- pkgs/development/tools/godot/4/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/godot/4/default.nix b/pkgs/development/tools/godot/4/default.nix index 5732b8f44f62..d0c85be47336 100644 --- a/pkgs/development/tools/godot/4/default.nix +++ b/pkgs/development/tools/godot/4/default.nix @@ -53,13 +53,13 @@ let in stdenv.mkDerivation rec { pname = "godot"; - version = "4.0-beta16"; + version = "4.0-rc1"; src = fetchFromGitHub { owner = "godotengine"; repo = "godot"; - rev = "518b9e5801a19229805fe837d7d0cf92920ad413"; - sha256 = "sha256-45x4moHOn/PWRazuJ/CBb3WYaPZqv4Sn8ZIugUSaVjY="; + rev = "c4fb119f03477ad9a494ba6cdad211b35a8efcce"; + hash = "sha256-YJrm3or4QSzs+MDc06gY6TvUtWRgLST8RkdsomY8lZk="; }; nativeBuildInputs = [ From 13504907e0d2a9e3bf9f848ef3574bdae29e3d6b Mon Sep 17 00:00:00 2001 From: fleaz Date: Fri, 10 Feb 2023 17:17:09 +0100 Subject: [PATCH 17/28] python310Packages.pytapo: init at 2.9.2 --- .../python-modules/pytapo/default.nix | 40 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 42 insertions(+) create mode 100644 pkgs/development/python-modules/pytapo/default.nix diff --git a/pkgs/development/python-modules/pytapo/default.nix b/pkgs/development/python-modules/pytapo/default.nix new file mode 100644 index 000000000000..1a8ee768fb65 --- /dev/null +++ b/pkgs/development/python-modules/pytapo/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchPypi + +# propagates +, pycryptodome +, requests +, urllib3 +}: + +buildPythonPackage rec { + pname = "pytapo"; + version = "2.9.2"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-LW14uDQBqIVsigOzO0bNTpjY7Fk0IWAeDMPEuWM/nOo="; + }; + + propagatedBuildInputs = [ + pycryptodome + requests + urllib3 + ]; + + pythonImportsCheck = [ + "pytapo" + ]; + + # Tests require actual hardware + doCheck = false; + + meta = with lib; { + description = "Python library for communication with Tapo Cameras "; + homepage = "https://github.com/JurajNyiri/pytapo"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fleaz ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 511fea250077..a70dfe8ba3b2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8772,6 +8772,8 @@ self: super: with self; { pytap2 = callPackage ../development/python-modules/pytap2 { }; + pytapo = callPackage ../development/python-modules/pytapo { }; + pytautulli = callPackage ../development/python-modules/pytautulli { }; pyte = callPackage ../development/python-modules/pyte { }; From 0b8e02e744aa8cfa504d516035d4f070895a1621 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 10 Feb 2023 22:34:53 +0000 Subject: [PATCH 18/28] plasma5Packages.kguiaddons: use a better homepage Otherwise, it defaults to https://kde.org/, which doesn't have anything on it specific to kguiaddons. --- pkgs/development/libraries/kde-frameworks/kguiaddons.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/kde-frameworks/kguiaddons.nix b/pkgs/development/libraries/kde-frameworks/kguiaddons.nix index 98f7e178fb64..9254043117ae 100644 --- a/pkgs/development/libraries/kde-frameworks/kguiaddons.nix +++ b/pkgs/development/libraries/kde-frameworks/kguiaddons.nix @@ -11,4 +11,6 @@ mkDerivation { propagatedBuildInputs = [ qtbase ]; outputs = [ "out" "dev" ]; + + meta.homepage = "https://invent.kde.org/frameworks/kguiaddons"; } From 63a2b2278f7556cfa092cd1b9429c121168c4693 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 10 Feb 2023 22:35:59 +0000 Subject: [PATCH 19/28] extra-cmake-modules: use a better homepage Otherwise, it defaults to https://kde.org/, which doesn't have anything on it specific to extra-cmake-modules. --- .../libraries/kde-frameworks/extra-cmake-modules/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix index ac7f75f5e742..dcd7a76acb33 100644 --- a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix +++ b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix @@ -19,7 +19,7 @@ mkDerivation { meta = with lib; { platforms = platforms.linux ++ platforms.darwin; - homepage = "http://www.kde.org"; + homepage = "https://invent.kde.org/frameworks/extra-cmake-modules"; license = licenses.bsd2; }; } From 3d23945d491f2605fa0d3a7699304988cf77b2ed Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 10 Feb 2023 23:04:02 +0000 Subject: [PATCH 20/28] bun: 0.5.5 -> 0.5.6 --- pkgs/development/web/bun/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/web/bun/default.nix b/pkgs/development/web/bun/default.nix index 5bcdc410289b..3b294c4c80bd 100644 --- a/pkgs/development/web/bun/default.nix +++ b/pkgs/development/web/bun/default.nix @@ -12,7 +12,7 @@ }: stdenvNoCC.mkDerivation rec { - version = "0.5.5"; + version = "0.5.6"; pname = "bun"; src = passthru.sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}"); @@ -33,19 +33,19 @@ stdenvNoCC.mkDerivation rec { sources = { "aarch64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-aarch64.zip"; - sha256 = "n7OfH93qXfu8608mMJ1tMoe9rAngu0cSHflwJZlKPYU="; + sha256 = "0LEoOwsZrEV819UpdwHaIRk9vT14JMDiXghUMf3fEoY="; }; "aarch64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-aarch64.zip"; - sha256 = "YPX5+wfXumYSvdjSOgb0rc/RrIU9vMYEqQmhObsg3ak="; + sha256 = "sE6DnfyPIj/Rpo9+pME87TcBvdxKFP4B7UXPvq4Rars="; }; "x86_64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-x64.zip"; - sha256 = "yiCpnO9Y8+m4fGIVyKyxeXMBe0e8qxoTAgOB8HHH4Nw="; + sha256 = "VJyv92H18wsp9F3zwu1KwwjNE1qGBCHVj7vnmnb2RbI="; }; "x86_64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64.zip"; - sha256 = "4eziS6QRQzg/KyKrgAmyOrMxXb+YH2pNX1RX4dL/zhM="; + sha256 = "Sdj/hdGaMvqN35N7tnAgvPQPELeW2IHA3uCVyTLYPw0="; }; }; updateScript = writeShellScript "update-bun" '' From 2f5623dda2c0ada35a86ba0e075f77dcdb3cd6d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20He=C3=9Felmann?= Date: Sat, 11 Feb 2023 01:39:08 +0100 Subject: [PATCH 21/28] jira-cli-go: fix darwin build --- pkgs/development/tools/jira-cli-go/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/tools/jira-cli-go/default.nix b/pkgs/development/tools/jira-cli-go/default.nix index 31d6d281ba5f..a64fab3353fe 100644 --- a/pkgs/development/tools/jira-cli-go/default.nix +++ b/pkgs/development/tools/jira-cli-go/default.nix @@ -20,6 +20,8 @@ buildGoModule rec { "-X github.com/ankitpokhrel/jira-cli/internal/version.Version=${version}" ]; + __darwinAllowLocalNetworking = true; + nativeCheckInputs = [ less more ]; # Tests expect a pager in $PATH passthru = { From 2f431d194940bcced4469187ee3e031b276f0542 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 11 Feb 2023 01:29:10 +0000 Subject: [PATCH 22/28] jackett: 0.20.3004 -> 0.20.3017 --- pkgs/servers/jackett/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index ae8b8eacabe4..cebf1249e59a 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -9,13 +9,13 @@ buildDotnetModule rec { pname = "jackett"; - version = "0.20.3004"; + version = "0.20.3017"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha512-UNGkcCQeeMxonJ9Kf1SDMTgSC8uTM2gD377qA+ViSfpWoOGQCY003EZ0c3c0q6oSGVbiIma1wvyW/T/ILLi5yw=="; + hash = "sha512-Hc4EzHqydcBGbiQkr4Hhnfjly9CwaCJXau7WwBb/T+qYdCkOKwrGeuNr3UEMP2x4dth+713HQRrgXviQo+jJlw=="; }; projectFile = "src/Jackett.Server/Jackett.Server.csproj"; From e44cac10e95dc9898e8e3bda11ae8f820c161c2a Mon Sep 17 00:00:00 2001 From: Alex Martens Date: Fri, 10 Feb 2023 19:38:06 -0800 Subject: [PATCH 23/28] biodiff: 1.0.4 -> 1.1.0 --- pkgs/development/tools/biodiff/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/biodiff/default.nix b/pkgs/development/tools/biodiff/default.nix index 610b991ec52a..819cccf95c61 100644 --- a/pkgs/development/tools/biodiff/default.nix +++ b/pkgs/development/tools/biodiff/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "biodiff"; - version = "1.0.4"; + version = "1.1.0"; src = fetchFromGitHub { owner = "8051Enthusiast"; repo = "biodiff"; rev = "v${version}"; - sha256 = "sha256-anGiqTiZVm6q8BII1Ahg2ph7OwX5isCa16orEcf4aFE="; + hash = "sha256-IrIRBozW2nNqt3/643jQ9sHT/YIpYhWeG749bTR4+60="; }; - cargoSha256 = "sha256-uyATu6M04IRFtzFb2ox0xUYFXjkW+t+71Iy58TuqCko="; + cargoHash = "sha256-EkvZk5l2Jw/6Ejrz4gYFWz9IZLjz0Op/1z3BGBV07dA="; meta = with lib; { description = "Hex diff viewer using alignment algorithms from biology"; From 58006feb6fd891dd284ecd65868d0cc0c476fa80 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 11 Feb 2023 04:10:05 +0000 Subject: [PATCH 24/28] flyway: 9.12.0 -> 9.14.1 --- pkgs/development/tools/flyway/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/flyway/default.nix b/pkgs/development/tools/flyway/default.nix index 2921a7b39445..2f111370d222 100644 --- a/pkgs/development/tools/flyway/default.nix +++ b/pkgs/development/tools/flyway/default.nix @@ -1,10 +1,10 @@ { lib, stdenv, fetchurl, jre_headless, makeWrapper }: stdenv.mkDerivation rec{ pname = "flyway"; - version = "9.12.0"; + version = "9.14.1"; src = fetchurl { url = "mirror://maven/org/flywaydb/flyway-commandline/${version}/flyway-commandline-${version}.tar.gz"; - sha256 = "sha256-8Zx+0lWaPAgPhxcvb84FzT2z58yAwDDLHegtXpRTr5M="; + sha256 = "sha256-a4wApae08oQBVOSvLJFfU0ZB8mOJbjsnD/SgpCq6IYc="; }; nativeBuildInputs = [ makeWrapper ]; dontBuild = true; From 681319eba7389c2b95037c0606a7b9991be91f69 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 11 Feb 2023 03:07:19 +0000 Subject: [PATCH 25/28] =?UTF-8?q?terraform-providers.equinix:=201.11.1=20?= =?UTF-8?q?=E2=86=92=201.12.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index ec486127924c..2f41a5cd4995 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -355,14 +355,13 @@ "vendorHash": "sha256-oVTanZpCWs05HwyIKW2ajiBPz1HXOFzBAt5Us+EtTRw=" }, "equinix": { - "hash": "sha256-hU0mqMuB3yvLWJ6ggDvATQeSFdpsEfs/hmvLV6A2Md4=", + "hash": "sha256-aah3f/5Bd+IgXbyJpDhcyklIYHlK3yy16UkYlOprh0c=", "homepage": "https://registry.terraform.io/providers/equinix/equinix", "owner": "equinix", - "proxyVendor": true, "repo": "terraform-provider-equinix", - "rev": "v1.11.1", + "rev": "v1.12.0", "spdx": "MIT", - "vendorHash": "sha256-NLvw606QxUwCDViLbR5LjoWGZnk48/zG0NownEATYKM=" + "vendorHash": "sha256-Zi2e/Vg9iKTrU8Mb37Y8xHYIBL+IfDnWMUUg5Vqrbfo=" }, "exoscale": { "hash": "sha256-48msmXj7SFmi5TA0/QYm66oIETymWi5ayF+yExyp+hk=", From b137d166fa8ff4d9b8bd67ad7bbaa688a5575abc Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 11 Feb 2023 03:09:10 +0000 Subject: [PATCH 26/28] =?UTF-8?q?terraform-providers.okta:=203.41.0=20?= =?UTF-8?q?=E2=86=92=203.42.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 2f41a5cd4995..65d450853132 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -820,11 +820,11 @@ "vendorHash": null }, "okta": { - "hash": "sha256-wKs5XRyyCda6pljtuo8ukAQl5ZZxeDSyt0CQWe8eXqY=", + "hash": "sha256-UMQ1YEXYdaLwYZBhGzbikhExW/HT/u4QSNk08vhmbwA=", "homepage": "https://registry.terraform.io/providers/okta/okta", "owner": "okta", "repo": "terraform-provider-okta", - "rev": "v3.41.0", + "rev": "v3.42.0", "spdx": "MPL-2.0", "vendorHash": "sha256-KWSHVI51YHHF3HXpyd1WB5Za721ak+cFhwDIfvC/ax4=" }, From 663a1894ee08d94785528376cadbbab060049671 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 11 Feb 2023 03:11:39 +0000 Subject: [PATCH 27/28] =?UTF-8?q?terraform-providers.vultr:=202.12.0=20?= =?UTF-8?q?=E2=86=92=202.12.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 65d450853132..c230ab561cb7 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1227,11 +1227,11 @@ "vendorHash": "sha256-guUjkk7oW+Gvu015LUAxGqUwZF4H+4xmmOaMqKixZaI=" }, "vultr": { - "hash": "sha256-DfiJgN1R7qW3c13hBabsMizY3mYamIq8AGms1q9kdVU=", + "hash": "sha256-5pI/jLG8UdMxgubvp5SJDW49C6iHKXOtlnr3EuzwtsQ=", "homepage": "https://registry.terraform.io/providers/vultr/vultr", "owner": "vultr", "repo": "terraform-provider-vultr", - "rev": "v2.12.0", + "rev": "v2.12.1", "spdx": "MPL-2.0", "vendorHash": null }, From 59101f53e21ed7e5db5ab566701936bf426015bc Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 11 Feb 2023 03:13:43 +0000 Subject: [PATCH 28/28] =?UTF-8?q?terraform-providers.tencentcloud:=201.79.?= =?UTF-8?q?8=20=E2=86=92=201.79.9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index c230ab561cb7..428fc225e1b5 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1090,11 +1090,11 @@ "vendorHash": "sha256-2wPmLpjhG6QgG+BUCO0oIzHjBOWIOYuptgdtSIm9TZw=" }, "tencentcloud": { - "hash": "sha256-yVI1f86Gpkwl3jCAs5d54rZS8lM7cjbwWq+HUXwi8EU=", + "hash": "sha256-NglAzuZr3OqLHunMbmLm7Cnh24otQXRP1y3ZaDFrXAc=", "homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud", "owner": "tencentcloudstack", "repo": "terraform-provider-tencentcloud", - "rev": "v1.79.8", + "rev": "v1.79.9", "spdx": "MPL-2.0", "vendorHash": null },