From b37e17bc0fb6db397d6fcb26355b43ccb7a97490 Mon Sep 17 00:00:00 2001 From: arcnmx Date: Tue, 12 Mar 2024 13:17:42 -0700 Subject: [PATCH] chore: flake update --- flake.lock | 36 ++++++++++++++--------------- modules/nixos/home-assistant.nix | 3 +-- packages/androidtvremote2.nix | 39 -------------------------------- 3 files changed, 19 insertions(+), 59 deletions(-) delete mode 100644 packages/androidtvremote2.nix diff --git a/flake.lock b/flake.lock index d34210a7..90931a22 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1708971369, - "narHash": "sha256-h9WTf1c4gcxbB5ZuEpjwhiqBEfF0Z4t4o0zqGHfYoM0=", + "lastModified": 1710260676, + "narHash": "sha256-39DXtaSSqCmRmycBtH52dRoUPBKkPM366XIN8Y8xLCQ=", "owner": "arcnmx", "repo": "nixexprs", - "rev": "ec082eb1f7ed38456f0cbedc5a80b62e8469b2ce", + "rev": "c72d4a2e313972a2707cf8fdb741bdb75b3545da", "type": "github" }, "original": { @@ -102,11 +102,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1709126324, - "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "d465f4819400de7c8d874d50b982301f28a84605", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -138,11 +138,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1709703039, - "narHash": "sha256-6hqgQ8OK6gsMu1VtcGKBxKQInRLHtzulDo9Z5jxHEFY=", + "lastModified": 1709961763, + "narHash": "sha256-6H95HGJHhEZtyYA3rIQpvamMKAGoa8Yh2rFV29QnuGw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9df3e30ce24fd28c7b3e2de0d986769db5d6225d", + "rev": "3030f185ba6a4bf4f18b87f345f104e6a6961f34", "type": "github" }, "original": { @@ -154,11 +154,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1709428628, - "narHash": "sha256-//ZCCnpVai/ShtO2vPjh3AWgo8riXCaret6V9s7Hew4=", + "lastModified": 1710033658, + "narHash": "sha256-yiZiVKP5Ya813iYLho2+CcFuuHpaqKc/CoxOlANKcqM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "66d65cb00b82ffa04ee03347595aa20e41fe3555", + "rev": "b17375d3bb7c79ffc52f3538028b2ec06eb79ef8", "type": "github" }, "original": { @@ -170,11 +170,11 @@ }, "nur": { "locked": { - "lastModified": 1710019138, - "narHash": "sha256-6v+/OWVboOYiv6Eb75HEDMVXp3kyExgJPOkn3NnpGJE=", + "lastModified": 1710268474, + "narHash": "sha256-5c+7dcsXd5b3Rw5WTr8pkWhpT4fO0bAjmoz3YLhZor0=", "owner": "nix-community", "repo": "nur", - "rev": "91cc200411377bd61e63526d925a82be50dc9d7f", + "rev": "5b7b25cbbce0e39b692d98eb42bd97d01568c519", "type": "github" }, "original": { @@ -231,11 +231,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1709711091, - "narHash": "sha256-L0rSIU9IguTG4YqSj4B/02SyTEz55ACq5t8gXpzteYc=", + "lastModified": 1710195194, + "narHash": "sha256-KFxCJp0T6TJOz1IOKlpRdpsCr9xsvlVuWY/VCiAFnTE=", "owner": "Mic92", "repo": "sops-nix", - "rev": "25dd60fdd08fcacee2567a26ba6b91fe098941dc", + "rev": "e52d8117b330f690382f1d16d81ae43daeb4b880", "type": "github" }, "original": { diff --git a/modules/nixos/home-assistant.nix b/modules/nixos/home-assistant.nix index c9b2d4be..8c959441 100644 --- a/modules/nixos/home-assistant.nix +++ b/modules/nixos/home-assistant.nix @@ -202,7 +202,6 @@ in { securetar getmac # for upnp integration python-otbr-api - protobuf3 (aiogithubapi.overrideAttrs (_: {doInstallCheck = false;})) ] (mkIf cfg.homekit.enable [ @@ -210,7 +209,7 @@ in { ]) (mkIf cfg.androidTv.enable [ adb-shell - (callPackage ../../packages/androidtvremote2.nix { }) + androidtvremote2 ]) ]; extraComponents = mkMerge [ diff --git a/packages/androidtvremote2.nix b/packages/androidtvremote2.nix deleted file mode 100644 index 7d26b5e4..00000000 --- a/packages/androidtvremote2.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ buildPythonPackage -, fetchFromGitHub -, aiofiles -, cryptography -, protobuf -, setuptools -, pytestCheckHook -}: - -buildPythonPackage rec { - pname = "androidtvremote2"; - version = "0.0.13"; - format = "pyproject"; - - src = fetchFromGitHub { - owner = "tronikos"; - repo = pname; - rev = "v${version}"; - hash = "sha256-+9VVUIvM//Fxv1a/+PAKWSQE8/TgBZzeTisgMqj6KPU="; - }; - - nativeBuildInputs = [ - setuptools - ]; - - propagatedBuildInputs = [ - aiofiles - cryptography - protobuf - ]; - - checkInputs = [ - pytestCheckHook - ]; - - pythonImportsCheck = [ - "androidtvremote2" - ]; -}