Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to 24.05 #372

Closed
wants to merge 11 commits into from
Closed

Conversation

taranarmo
Copy link
Contributor

Following the update to 23.11 I updated the inputs and copyrights to 24.05 as it is considered stable now.
Also in current version nixpkgs docs input is still at 23.05, fix for that also included

@t184256
Copy link
Collaborator

t184256 commented Jun 5, 2024

Thanks for taking the time to look into this. Unfortunately, that might be just one piece of the whole 24.05 puzzle:

  1. be783dd you've linked to is just one commit out of Prerelease 23.11 #336, reading that one and also https://github.com/nix-community/nix-on-droid/projects/8 should help piece together the bigger picture of what it entails.

  2. 24.05 release might be run significantly late this time because I have several ambitious things planned for this release:

    a. make use of the am-powered integrations (sounds like a low-hanging fruit at this point, see the comments Termux-clipboard-{get,set} in termux.nix? #133)
    b. figure out DNS at last (DNS settings are not picked up from Android #2, still sounds hard to me, cause turns out I'm bad with writing NSS plugins)
    c. CI needs to be fixed. I gave up on figuring out what's wrong with downloads stalling under fakedroid, so I'm afraid I'll explore running a proper Android emulator instead

So, I was planning to do the regular release preparations after completing 2-3 of these. Though if you're not afraid of rebasing later, you can prepare a PR now and rebase it later.

Also in current version nixpkgs docs input is still at 23.05, fix for that also included

And do the docs build fine with the new version?

@taranarmo
Copy link
Contributor Author

Okay, I see.

  1. I will read, thanks for the links. Don't know why I didn't do that prior.
  2. I can try playing with CI, I wanted to get more experience in it.

Yeah, rebasing is possible. Shouldn't be too hard.

I tried to fix the docs input in current version (by linking it to my fork) and no warning or errors were faced. Though now flake based configuration throws warning that home manager is at 24.05 while its input is at 23.11 :)

@t184256
Copy link
Collaborator

t184256 commented Jun 16, 2024

As a first stepping stone towards a release, #379 should greatly rework our CI; that'd be one important point to rebase onto.

@taranarmo
Copy link
Contributor Author

I successfully rebased my branch on emulator-powered-ci

@t184256
Copy link
Collaborator

t184256 commented Jun 16, 2024

Good, now you can see what fails to build.

The first obstacle on the way to nix build ".#aarch64.bootstrapZip" is the patches to nixpkgs I had to apply last release: compiler-rt.patch and libunwind.patch. Hope the issues they have worked around have resolved themselves and the patches can be just dropped; otherwise, they'll have to be updated for new nixpkgs.

@t184256 t184256 mentioned this pull request Jun 19, 2024
@t184256
Copy link
Collaborator

t184256 commented Jul 7, 2024

if I try to unpin docs nixpkgs like you did in dbd80b4, I get

$ nix --print-build-logs --option keep-going true --show-trace build '.#manualHtml'
warning: updating lock file '/home/monk/code/nix-on-droid/prerelease-24.05/flake.lock':
• Updated input 'nixpkgs-docs':
    'github:NixOS/nixpkgs/9a333eaa80901efe01df07eade2c16d183761fa3' (2024-01-22)
  → 'github:NixOS/nixpkgs/7144d6241f02d171d25fba3edeaf15e0f2592105' (2024-07-02)
warning: Git tree '/home/monk/code/nix-on-droid/prerelease-24.05' is dirty
options.json> Traceback (most recent call last):
options.json>   File "/nix/store/0damjdjmnbf31gh3y6hvgz2v9nranaaw-docbookify-options-json.py", line 72, in <module>
options.json>     class Renderer(mistune.renderers.BaseRenderer):
options.json>                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
options.json> AttributeError: module 'mistune.renderers' has no attribute 'BaseRenderer'
error: builder for '/nix/store/0cmcr94p86q0rpawwxkvpbmf6hf5lb6j-options.json.drv' failed with exit code 1;
       last 5 log lines:
       > Traceback (most recent call last):
       >   File "/nix/store/0damjdjmnbf31gh3y6hvgz2v9nranaaw-docbookify-options-json.py", line 72, in <module>
       >     class Renderer(mistune.renderers.BaseRenderer):
       >                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
       > AttributeError: module 'mistune.renderers' has no attribute 'BaseRenderer'
       For full logs, run 'nix log /nix/store/0cmcr94p86q0rpawwxkvpbmf6hf5lb6j-options.json.drv'.
error: 1 dependencies of derivation '/nix/store/mg8ic0p68mf6bwmlcmch1wk68sckxdh1-options-db.xml.drv' failed to build
error: 1 dependencies of derivation '/nix/store/lf6x66ccp9zw9903k59z40aw1mfv3yw4-nmd-documents.drv' failed to build
error: 1 dependencies of derivation '/nix/store/ha48w4gx1zxbryi1xw3k89dv1ji4h4ab-manual-combined.drv' failed to build
error: 1 dependencies of derivation '/nix/store/ailwdc73zzdz1v1kfkk0g9b0y9fmhjji-manual-olinkdb.drv' failed to build
error: 2 dependencies of derivation '/nix/store/3spyvlli759r7lhxnvjyn05w8xpk9vfb-html-manual.drv' failed to build

so, there is a reason it was frozen =(

@t184256
Copy link
Collaborator

t184256 commented Jul 7, 2024

Amended the other commit and incorporated it into #384. Thank you.

@t184256 t184256 closed this Jul 7, 2024
@taranarmo taranarmo deleted the update-to-24.05 branch July 9, 2024 08:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants