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

antares: 0.7.24 -> 0.7.28 #335924

Merged
merged 1 commit into from
Aug 27, 2024
Merged

antares: 0.7.24 -> 0.7.28 #335924

merged 1 commit into from
Aug 27, 2024

Conversation

hatch01
Copy link
Contributor

@hatch01 hatch01 commented Aug 19, 2024

Description of changes

Bump antares to 0.7.28 which enables building using electron_30 which is necessary because electron_29 is in EOL.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.11 Release Notes (or backporting 23.11 and 24.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@emilylange
Copy link
Member

antares is currently at version 0.7.24 in nixpkgs and as such a few versions behind.

https://github.com/antares-sql/antares/releases/tag/v0.7.25 bumped electron from 29 to 30.

So I'd suggest updating the package itself to its latest version, at the time of writing https://github.com/antares-sql/antares/releases/tag/v0.7.28, first :)

@hatch01
Copy link
Contributor Author

hatch01 commented Aug 24, 2024

Vi,
I am working on it.
However I get some errors while updating the package so I will open a new PR when I fixed all of theses

@hatch01
Copy link
Contributor Author

hatch01 commented Aug 25, 2024

this commit in antares is the origin of all my errors : b7dfd5cb8c8e8825311fb49a265c7c492470b13b

@hatch01 hatch01 changed the title antares: update electron from 29 to 30 antares: 0.7.24 -> 0.7.28 Aug 25, 2024
@hatch01 hatch01 force-pushed the antares branch 4 times, most recently from 1003ac7 to 816cab7 Compare August 25, 2024 18:44
@emilazy emilazy added the backport release-24.05 Backport PR automatically label Aug 25, 2024
@hatch01 hatch01 marked this pull request as ready for review August 25, 2024 19:07
@emilylange
Copy link
Member

emilylange commented Aug 26, 2024

error: hash mismatch in fixed-output derivation '/nix/store/psm1j5l9f408k3f96bq8i2jx6qrcb1cm-antares-0.7.28-npm-deps.drv':
         specified: sha256-3EeHLtqcEnWj70N3nlPHfztzmjVbzdb9f/va4GDRckc=
            got:    sha256-ql7sJHym1QsPPtnndHFHCOeSUcYW51/5FevXGf4v/i4=

There is still a hash mismatch.
Also, it would have been better if the fetchpatch comment included a link to your unmerged antares-sql/antares#853 PR.
Just so it's clear you aren't trying to hide the fact the commit isn't /actually/ part of the repository yet (but rather GitHub's repository network).

@hatch01
Copy link
Contributor Author

hatch01 commented Aug 26, 2024

error: hash mismatch in fixed-output derivation '/nix/store/psm1j5l9f408k3f96bq8i2jx6qrcb1cm-antares-0.7.28-npm-deps.drv':
         specified: sha256-3EeHLtqcEnWj70N3nlPHfztzmjVbzdb9f/va4GDRckc=
            got:    sha256-ql7sJHym1QsPPtnndHFHCOeSUcYW51/5FevXGf4v/i4=

There is still a hash mismatch. Also, it would have been better if the fetchpatch comment included a link to your unmerged antares-sql/antares#853 PR. Just so it's clear you aren't trying to hide the fact the commit isn't /actually/ part of the repository yet (but rather GitHub's repository network).

I can't use the patch directly from the PR because the PR is going to be merged in develop branch in antares and not in master. So the patch is not applicable.

@emilazy
Copy link
Member

emilazy commented Aug 26, 2024

Best to vendor the patch in Nixpkgs in this case.

@hatch01
Copy link
Contributor Author

hatch01 commented Aug 26, 2024

ok I will try to do so.
however I face the npm cache error again

Installing dependencies
npm error code ENOTCACHED
npm error request to https://registry.npmjs.org/zip-stream failed: cache mode is 'only-if-cached' but no cached response is available.

npm error Log files were not written due to an error writing to the directory: /nix/store/pn3ar164gq31lqky1jjk1f4yga7nprh1-antares-0.7.28-npm-deps/_logs
npm error You can rerun the command with `--loglevel=verbose` to see the logs in your terminal

ERROR: npm failed to install dependencies

Here are a few things you can try, depending on the error:
1. Set `makeCacheWritable = true`
 Note that this won't help if npm is complaining about not being able to write to the logs directory -- look above that for the actual error.
2. Set `npmFlags = [ "--legacy-peer-deps" ]`

@hatch01
Copy link
Contributor Author

hatch01 commented Aug 26, 2024

My last push, build and works on my pc

@SuperSandro2000 SuperSandro2000 merged commit 730ba31 into NixOS:master Aug 27, 2024
24 of 26 checks passed
Copy link
Contributor

Backport failed for release-24.05, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin release-24.05
git worktree add -d .worktree/backport-335924-to-release-24.05 origin/release-24.05
cd .worktree/backport-335924-to-release-24.05
git switch --create backport-335924-to-release-24.05
git cherry-pick -x 5c764c21d8ee0e6a795329a6a6b4927eb0930471

@emilazy emilazy mentioned this pull request Aug 27, 2024
13 tasks
@emilazy emilazy mentioned this pull request Aug 27, 2024
13 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants