Merge staging-next into staging (b5a68e6d) · Commits · mdf / nixpkgs

pkgs/applications/networking/cluster/bosh-cli/default.nix

0 → 100644

+43 −0

Original line number	Diff line number	Diff line
		{ lib
		, fetchFromGitHub
		, buildGoModule
		, makeWrapper
		, openssh
		}:

		buildGoModule rec {
		pname = "bosh-cli";

		version = "6.4.3";

		src = fetchFromGitHub {
		owner = "cloudfoundry";
		repo = pname;
		rev = "v${version}";
		sha256 = "1glxwk0fv52rjim7ihcxkjx19fsn9k7gzg9zmwxgx8wpsjrdcq3f";
		};
		vendorSha256 = null;

		postPatch = ''
		substituteInPlace cmd/version.go --replace '[DEV BUILD]' '${version}'
		'';

		nativeBuildInputs = [ makeWrapper ];

		subPackages = [ "." ];

		doCheck = false;

		postInstall = ''
		mv $out/bin/bosh-cli $out/bin/bosh
		wrapProgram $out/bin/bosh --prefix PATH : '${lib.makeBinPath [ openssh ]}'
		'';

		meta = with lib; {
		description = "A command line interface to CloudFoundry BOSH";
		homepage = "https://bosh.io";
		changelog = "https://github.com/cloudfoundry/bosh-cli/releases/tag/v${version}";
		license = licenses.asl20;
		maintainers = with maintainers; [ ris ];
		};
		}

+9 −9

Original line number	Diff line number	Diff line
		@@ -2,7 +2,7 @@
		, buildPythonPackage
		, cryptography
		, fetchFromGitHub
		, poetry
		, poetry-core
		, pytest-aiohttp
		, pytestCheckHook
		, pythonAtLeast
		@@ -11,7 +11,7 @@

		buildPythonPackage rec {
		pname = "aiohomekit";
		version = "0.2.62";
		version = "0.2.67";
		format = "pyproject";
		disabled = pythonAtLeast "3.9";

		@@ -19,10 +19,12 @@ buildPythonPackage rec {
		owner = "Jc2k";
		repo = pname;
		rev = version;
		sha256 = "sha256-01IzeR0iukPTkz8I7h93wZkgjz6flRAJN8unEX6d+cs=";
		sha256 = "04421p0dq7xh7rhx8ip177g2b91lhlc2yziqxbs9yxd1qyzwiqj1";
		};

		nativeBuildInputs = [ poetry ];
		nativeBuildInputs = [
		poetry-core
		];

		propagatedBuildInputs = [
		cryptography
		@@ -34,11 +36,9 @@ buildPythonPackage rec {
		pytestCheckHook
		];

		# Some test requires network access
		disabledTests = [
		"test_remove_pairing"
		"test_pair"
		"test_add_and_remove_pairings"
		disabledTestPaths = [
		# Tests require network access
		"tests/test_ip_pairing.py"
		];

		pythonImportsCheck = [ "aiohomekit" ];

+2 −2

Original line number	Diff line number	Diff line
		@@ -6,11 +6,11 @@

		buildPythonPackage rec {
		pname = "aiohue";
		version = "2.3.1";
		version = "2.5.0";

		src = fetchPypi {
		inherit pname version;
		sha256 = "1qxvqqsflcn263yg7r8vvfc2c2fl3rh4dkzwzh926ijnbc2sk4nm";
		sha256 = "sha256-4q5JvkUmEoOomcwblXhvB/5Qdr6aMR0lDb4t4bjDjw8=";
		};

		propagatedBuildInputs = [

+2 −2

Original line number	Diff line number	Diff line
		@@ -8,14 +8,14 @@

		buildPythonPackage rec {
		pname = "aiolyric";
		version = "1.0.6";
		version = "1.0.7";
		disabled = pythonOlder "3.7";

		src = fetchFromGitHub {
		owner = "timmo001";
		repo = pname;
		rev = "v${version}";
		sha256 = "1lnzsdw6kvgk0762f3vyw4xfzn7qkvsff16q61gm0ryjqg9j8whx";
		sha256 = "sha256-3UyWUsamluJclwrQD+MuUPLhNJoNU4/8w1m92OLWyrg=";
		};

		propagatedBuildInputs = [ aiohttp ];

+2 −2

Original line number	Diff line number	Diff line
		@@ -12,14 +12,14 @@

		buildPythonPackage rec {
		pname = "aiorecollect";
		version = "1.0.4";
		version = "1.0.5";
		format = "pyproject";

		src = fetchFromGitHub {
		owner = "bachya";
		repo = pname;
		rev = version;
		sha256 = "sha256-A4qk7eo4maCRP4UmtWrRCPvG6YrLVSOiOcfN8pEj5Po=";
		sha256 = "0h76l0pahnmls0radknzm8dw79qx9dv0xhxqnn6011j9fwyviyqm";
		};

		nativeBuildInputs = [