!UUYziobKGGxpovWyAN:nixos.org

Robotnix

244 Members
Build Android (AOSP) using Nix | https://github.com/danielfullmer/robotnix75 Servers

Load older messages


SenderMessageTime
5 Jun 2024
@atemu12:matrix.orgatemu12
In reply to @erahhal:matrix.org
Sorry for spamming here. Please let me know if my level of messaging is inappropriate.
Nah, 101% on topic
07:00:52
@atemu12:matrix.orgatemu12
In reply to @erahhal:matrix.org
Manually updated the vendor.json entry for cheetah setting fetchLFS to true to no effect. digging into why this is not working.
eyJhb implemented LFS support somewhereat some point. Make sure it's used
07:02:03
@eyjhb:eyjhb.dkeyJhbhttps://github.com/nix-community/robotnix/pull/22807:02:26
@atemu12:matrix.orgatemu12
In reply to @erahhal:matrix.org
Better yet, how should the update_device_dirs.py script know that a repo has LFS files? I guess that would be specifically flagged similar to other devices with special cases?
I see no reason to attempt to fetch without LFS honestly
07:02:53
@eyjhb:eyjhb.dkeyJhbI think it fixes a bunch of smaller bugs.07:03:06
@eyjhb:eyjhb.dkeyJhbhttps://github.com/nix-community/robotnix/pull/228/files#diff-d2cdd059d29643c5fe1767c6dcf5203c0dc9b382d1322e3f0a4237eda6066246R57 lets just default to True then :D07:03:30
@eyjhb:eyjhb.dkeyJhbOh nvm. that patch already defaults to true https://github.com/nix-community/robotnix/pull/228/files#diff-e9564a29073c1c722ed3d8965bd1ff8d51ba08cd780f951944aafe3c30cc498cR17307:04:04
@atemu12:matrix.orgatemu12
In reply to @erahhal:matrix.org
Perhaps this is why the google stuff was in gitlab for lineage 20
It was on Gitlab because Xiaomi DMCA'd the github repo
07:04:12
@atemu12:matrix.orgatemu12The blobs should have been in LFS from the beginning though07:04:48
@eyjhb:eyjhb.dkeyJhbWould be cool with a test for the LFS PR.07:07:13
@erahhal:matrix.orgerahhalI'm going through the code to get LFS enabled for vendor. I think I'm close. Will continue tomorrow. Late here. Thank all!08:24:00
@atemu12:matrix.orgatemu12Could you open a draft PR?08:25:24
@erahhal:matrix.orgerahhalIts very messy but sure08:27:00
@erahhal:matrix.orgerahhalhttps://github.com/nix-community/robotnix/pull/238/commits08:31:47
@jaen:matrix.orgjaen Atemu: responded to your comments on the Python fixes PR, feel free to ping me here if you would need something done on the PR from my end. 09:49:03
@jaen:matrix.orgjaen Atemu: added two commits — one for using separate files for patches and one with a potential minor improvement to get_store_path (see comments on the PR for context). Let me know if you want both commits (or just the patches one) and if you want me to leave them as is, or squash them into appropriate prior commits. After that I think the last thing would be to decide if you agree with my motivation for keeping the repo hack as–is (I'm open to trying to use the bundle feature if you think it'll be an improvement, but don't think I want to try to further patch repo to not require a git repo for it's code). Let me know if there's anything else. 16:55:54
@atemu12:matrix.orgatemu12If it works, the currently proposed repo hack is quite an improvement from the previous one 18:32:28
@eyjhb:eyjhb.dkeyJhbDo we have like.. three PRs that touch robotnix_common.py, trying to get LFS, and all fixing the same fault in the store path in their own unique way? :D18:47:22
@atemu12:matrix.orgatemu12That's what lack of maintenance will do to your project...20:40:03
@jaen:matrix.orgjaen

If it works, the currently proposed repo hack is quite an improvement from the previous one
Do you mean what is currently in the PR or do you mean I should try the bundle suggestion? If it's the latter, then just to be clear that will only change what ends up in the store (git bundle vs. unpacked git repo), I don't think any of the existing steps to massage the repo can be easily avoided (I can try, but wouldn't hold my breath). Also let me know if you'd prefer for me to squash those commits into existing ones for cleaner history or not.

all fixing the same fault in the store path in their own unique way
Sorry or my part xD Unfortunately another painful thing I'm trying to get merged is having consistent formatting in the repo with treefmt, so it will probably conflict with all other PRs [*]

22:04:32
@jaen:matrix.orgjaen *

If it works, the currently proposed repo hack is quite an improvement from the previous one

Do you mean what is currently in the PR or do you mean I should try the bundle suggestion? If it's the latter, then just to be clear that will only change what ends up in the store (git bundle vs. unpacked git repo), I don't think any of the existing steps to massage the repo can be easily avoided (I can try, but wouldn't hold my breath). Also let me know if you'd prefer for me to squash those commits into existing ones for cleaner history or not.

all fixing the same fault in the store path in their own unique way

Sorry or my part xD Unfortunately another painful thing I'm trying to get merged is having consistent formatting in the repo with treefmt, so it will probably conflict with all other PRs [*]

22:04:50
@atemu12:matrix.orgatemu12I meant the current state of your PR that I reviewed. Bundle wouldn't materially change the approach either IMV22:08:31
6 Jun 2024
@erahhal:matrix.orgerahhal Struggling to figure out why adding git-lfs to nativeBuildInputs here causes infinite recursion: https://github.com/nix-community/robotnix/blob/master/pkgs/fetchgit/default.nix#L66 07:30:17
@jaen:matrix.orgjaen Did you change the fetchLFS default to true? Because it seems git-lfs uses fetchFromGitHub for it's sources (https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/version-management/git-lfs/default.nix#L7-L12) which will then use fetchgit and since robotnix overlays it in nixpkgs, then you'll end up in the place you linked again and loop trying to evaluate git-lfs again. At least that would be my guess. But if you didn't change fetchLFS default to true I would've imagined laziness to take care of it. But maybe even then it's a good lead, you'd just have to start sprinkling lib.traceVal liberally to see where it goes wrong. 08:14:03
@eyjhb:eyjhb.dkeyJhb
In reply to @erahhal:matrix.org
Struggling to figure out why adding git-lfs to nativeBuildInputs here causes infinite recursion: https://github.com/nix-community/robotnix/blob/master/pkgs/fetchgit/default.nix#L66
https://github.com/nix-community/robotnix/pull/228/files couldn't you just use the work I made here for LFS?
11:10:33
@eyjhb:eyjhb.dkeyJhbOr is there something missing?11:10:46
@eyjhb:eyjhb.dkeyJhbIt basically just updates the prefetch-script to match the one in nixpkgs, with the added patches, and passes on fetchLFS11:11:04
@erahhal:matrix.orgerahhalNo, I haven't tried your work, I will try it today!13:50:48
@eyjhb:eyjhb.dkeyJhb
In reply to @erahhal:matrix.org
No, I haven't tried your work, I will try it today!

* I make no guarantees however. But I just remember getting such errors as you were getting :p

It might need to be modified.

14:02:14
@erahhal:matrix.orgerahhalMade it to the next step with your change!20:35:18

Show newer messages


Back to Room ListRoom Version: 6