From cb872b00b4925b8c2d453525d24f027117c16883 Mon Sep 17 00:00:00 2001 From: Sebastian Moser Date: Wed, 1 May 2024 21:22:10 +0200 Subject: [PATCH] added phone-emulator robotnix config + flake update --- flake.lock | 77 +++++++++++++++++++++++++++--------------------------- flake.nix | 12 +++++++++ 2 files changed, 51 insertions(+), 38 deletions(-) diff --git a/flake.lock b/flake.lock index 8abdd48..f5d36f7 100644 --- a/flake.lock +++ b/flake.lock @@ -207,11 +207,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1714047754, - "narHash": "sha256-verNuAw/hw9koXE3nFmYUF4Q7pEwRQKBuxqxlnObk9M=", + "lastModified": 1714587578, + "narHash": "sha256-F7iSsbkfzNqytOlw8wkL1JsnbeIkFCuAx0TDeZzytKY=", "owner": "nix-community", "repo": "flake-firefox-nightly", - "rev": "7b90fe8fbbb2a7b2ee912fac53415d9bee4691e6", + "rev": "efd195a6a2f92602a872d47bdeebbb33918d104d", "type": "github" }, "original": { @@ -229,11 +229,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1714043889, - "narHash": "sha256-f7aben2pbfL/CzphiAAwwe5CrmSYRZv3UF7zaGkD+Pc=", + "lastModified": 1714536206, + "narHash": "sha256-pnE2Px1VlcnWDc92TUmaILRgrWBbetKhpnMu5DfntbM=", "owner": "rycee", "repo": "nur-expressions", - "rev": "fee36e584de8c0034f311b76b5da1b81dad0b17b", + "rev": "7772d48f5a728af51cd8ac85be5b124e2da0feac", "type": "gitlab" }, "original": { @@ -451,11 +451,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1713701427, - "narHash": "sha256-v6z8hz/UDaC/rbnkH+hxGFUxlNyseVntRetVpSxLU6c=", + "lastModified": 1714306226, + "narHash": "sha256-CA7bfnDt9TcFc7I8eKHf72DodYUEETDPgmBFXBRP9/E=", "owner": "nix-community", "repo": "lib-aggregate", - "rev": "3b32a98eb3053f8c8ca55497d1881443ef2996e6", + "rev": "49d9b510614b9bd137e067eb31445a8feca83313", "type": "github" }, "original": { @@ -582,11 +582,11 @@ ] }, "locked": { - "lastModified": 1713869268, - "narHash": "sha256-o3CMQeu/S8/4zU0pMtYg51rd1FWdJsI2Xohzng1Ysdg=", + "lastModified": 1714273701, + "narHash": "sha256-bmoeZ5zMSSO/e8P51yjrzaxA9uzA3SZAEFvih6S3LFo=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "dcb6ac44922858ce3a5b46f77a36d6030181460c", + "rev": "941c4973c824509e0356be455d89613611f76c8a", "type": "github" }, "original": { @@ -645,11 +645,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1713947658, - "narHash": "sha256-q3zu2D5HVphfAMZ070o/K9IPxw5DLsLkvwr7H1b5fpE=", + "lastModified": 1714355896, + "narHash": "sha256-rtv+nJJ12V7w68j8vIcGacfS1yuK1/dBgglSKWzYMTM=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "f41f95c2c187a49a4ef98b5d00fdf1a68c5f88ba", + "rev": "acb893461a4bee4e77b1a27b1410d4995b52174c", "type": "github" }, "original": { @@ -696,11 +696,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1713864415, - "narHash": "sha256-/BPDMJEkrsFAFOsQWhwm31wezlgshPFlLBn34KEUdVA=", + "lastModified": 1714465198, + "narHash": "sha256-ySkEJvS0gPz2UhXm0H3P181T8fUxvDVcoUyGn0Kc5AI=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "797f8d8082c7cc3259cba7275c699d4991b09ecc", + "rev": "68d680c1b7c0e67a9b2144d6776583ee83664ef4", "type": "github" }, "original": { @@ -711,11 +711,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1713895582, - "narHash": "sha256-cfh1hi+6muQMbi9acOlju3V1gl8BEaZBXBR9jQfQi4U=", + "lastModified": 1714253743, + "narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "572af610f6151fd41c212f897c71f7056e3fb518", + "rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994", "type": "github" }, "original": { @@ -759,11 +759,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1713660444, - "narHash": "sha256-2bVnrEGyWJhRNKspzfTJmVD/fsH9HQURD4cWpz79Ulw=", + "lastModified": 1714265296, + "narHash": "sha256-jVnKiCOoFulPT1zDdA4jfG/lnEnngdth5CT6rVDXEJ4=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "6882347415e352cfc9c277cc01f73e0f5cb7b93c", + "rev": "ade4fb7bbf04cd52bc1705734d5dc67755d77ec9", "type": "github" }, "original": { @@ -774,11 +774,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1713895582, - "narHash": "sha256-cfh1hi+6muQMbi9acOlju3V1gl8BEaZBXBR9jQfQi4U=", + "lastModified": 1714253743, + "narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "572af610f6151fd41c212f897c71f7056e3fb518", + "rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994", "type": "github" }, "original": { @@ -837,11 +837,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1713013257, - "narHash": "sha256-ZEfGB3YCBVggvk0BQIqVY7J8XF/9jxQ68fCca6nib+8=", + "lastModified": 1714272655, + "narHash": "sha256-3/ghIWCve93ngkx5eNPdHIKJP/pMzSr5Wc4rNKE1wOc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "90055d5e616bd943795d38808c94dbf0dd35abe8", + "rev": "12430e43bd9b81a6b4e79e64f87c624ade701eaf", "type": "github" }, "original": { @@ -853,11 +853,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1714082080, - "narHash": "sha256-ntuxg7lSDr6HNZ9/3fVf6qFy/FNGvEAHYM0lXgyrW5w=", + "lastModified": 1714564312, + "narHash": "sha256-+Pu+QmY5u33E+PMulmvLiyAgZDi2bgbV5LEtiVXa0c4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c8e7e76916a13361cb7761feac6175465722791b", + "rev": "60f80cff5cc3185eba37a260a06399300dfdcffd", "type": "github" }, "original": { @@ -1099,15 +1099,16 @@ "nixpkgsUnstable": "nixpkgsUnstable" }, "locked": { - "lastModified": 1712250398, - "narHash": "sha256-15RJWkQnckkU18K7vybuIbhw4d4RssMJyvFAa6XRkYk=", - "owner": "nix-community", + "lastModified": 1714590475, + "narHash": "sha256-01cSVNrC5vxIUv7qXsYmKod2ev31jD9de2NaDegfZVY=", + "owner": "c2vi", "repo": "robotnix", - "rev": "ee5091bd96788c34f1edc6036f1a512a4e135eb9", + "rev": "bd30614b3d25df4991090e0008ea404d1dc5ca90", "type": "github" }, "original": { - "owner": "nix-community", + "owner": "c2vi", + "ref": "two_lineageos_fixes", "repo": "robotnix", "type": "github" } diff --git a/flake.nix b/flake.nix index 860b370..355a909 100644 --- a/flake.nix +++ b/flake.nix @@ -321,6 +321,18 @@ robotnixConfigurations = rec { "phone" = inputs.robotnix.lib.robotnixSystem (import ./hosts/phone/default.nix); + "phone-emulator" = inputs.robotnix.lib.robotnixSystem { + productName = nixpkgs.legacyPackages.x86_64-linux.lib.mkForce "sdk_phone_x86_64"; + imports = [ + (import ./hosts/phone/default.nix) + ]; + }; + "phone-emulator-arm" = inputs.robotnix.lib.robotnixSystem { + productName = nixpkgs.legacyPackages.x86_64-linux.lib.mkForce "sdk_phone_arm64"; + imports = [ + (import ./hosts/phone/default.nix) + ]; + }; }; nixOnDroidConfigurations = rec {