diff --git a/pkgs/applications/emulators/rpcs3/default.nix b/pkgs/applications/emulators/rpcs3/default.nix index 38890ce6e38b..b9efcaaf4f6e 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"; 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; { 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}" diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index ec486127924c..428fc225e1b5 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=", @@ -821,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=" }, @@ -1091,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 }, @@ -1228,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 }, 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 ]; 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; }; } 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"; } 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 = '' 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 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/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"; 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; 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 = [ 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 = { 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 ]; 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" '' 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 = [ "." ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 94ab3ab5b509..921a6dccbc1b 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -249,8 +249,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; 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"; 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 ]; 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/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/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/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; }; 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 0f55458e4808..220431b4c8b0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9515,6 +9515,8 @@ with pkgs; linuxquota = callPackage ../tools/misc/linuxquota { }; + lipl = callPackage ../tools/misc/lipl { }; + liquidctl = with python3Packages; toPythonApplication liquidctl; lmp = callPackage ../tools/security/lmp { }; @@ -9895,6 +9897,8 @@ with pkgs; mubeng = callPackage ../tools/networking/mubeng { }; + muffet = callPackage ../tools/networking/muffet { }; + multipass = libsForQt5.callPackage ../tools/virtualization/multipass { }; multitime = callPackage ../tools/misc/multitime { }; @@ -13741,6 +13745,8 @@ with pkgs; zplug = callPackage ../shells/zsh/zplug { }; + zps = callPackage ../tools/system/zps { }; + zi = callPackage ../shells/zsh/zi {}; zinit = callPackage ../shells/zsh/zinit {} ; @@ -22625,6 +22631,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 { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cf7d7643e03f..cfbb687af4c5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8958,6 +8958,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 { };