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

hyperswarm: 4.7.3 -> 4.11.1 #717

Closed
wants to merge 11 commits into from

Conversation

victor-ok
Copy link

@victor-ok victor-ok commented Apr 5, 2025

Updated the hyperswarm to version 4.11.1

Closes: #705

@eljamm
Copy link
Contributor

eljamm commented Apr 7, 2025

Nice, could you please squash all commits into 1 and change the commit and PR titles to hyperswarm: 4.7.3 -> 4.11.1 to fit the commit conventions?

Also, please format the files by running nix fmt.

@victor-ok victor-ok changed the title Updated hyperswarm to 4.11.1 hyperswarm: 4.7.3 -> 4.11.1 Apr 7, 2025
@eljamm
Copy link
Contributor

eljamm commented Apr 8, 2025

Would you like me to help you with this, @victor-ok?

@victor-ok
Copy link
Author

Hi @eljamm, Thank you for suggesting I help, but I can handle it. The reason for the delay is that my PC crashed, and I had to set up a new one. I have installed nixOS, so I will pick up where I stopped earlier. Thank you!

@victor-ok
Copy link
Author

Hi @eljamm I am also having a hard time running nix fmt I have tried the command nix --extra-experimental-features 'nix-command flakes' --verbose run .#x86_64-linux.formatter
Got error:flake 'git+file:///home/victor/ngipkgs' does not provide attribute 'apps.x86_64-linux.x86_64-linux.formatter', 'packages.x86_64-linux.x86_64-linux.formatter', 'legacyPackages.x86_64-linux.x86_64-linux.formatter' or 'x86_64-linux.formatter'
I would appreciate your help at this point please

@eljamm
Copy link
Contributor

eljamm commented Apr 8, 2025

Oh, you don't have to call the formatter package, you can just do:

nix --extra-experimental-features 'nix-command flakes' fmt

@victor-ok
Copy link
Author

Thanks @eljamm I already did that and it works, correctly, thank you for you help, I am pushing the latest changes.

themadbit and others added 9 commits April 8, 2025 14:55
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/e34066f045ecb393b587caf821fbdb7a2dae90dd?narHash=sha256-k5v3XmcApRhfRSxZkAjv7YN1mazBG0Y/E1cxLthtzSU%3D' (2025-04-01)
  → 'github:NixOS/nixpkgs/250b695f41e0e2f5afbf15c6b12480de1fe0001b?narHash=sha256-drDyYyUmjeYGiHmwB9eOPTQRjmrq3Yz26knwmMPLZFk%3D' (2025-04-05)
• Updated input 'nixpkgs-stable':
    'github:NixOS/nixpkgs/7ffe0edc685f14b8c635e3d6591b0bbb97365e6c?narHash=sha256-sOos1jZGKmT6xxPvxGQyPTApOunXvScV4lNjBCXd/CI%3D' (2025-03-30)
  → 'github:NixOS/nixpkgs/7819a0d29d1dd2bc331bec4b327f0776359b1fa6?narHash=sha256-BgkBz4NpV6Kg8XF7cmHDHRVGZYnKbvG0Y4p%2BjElwxaM%3D' (2025-04-05)
• Updated input 'sops-nix':
    'github:Mic92/sops-nix/8e873886bbfc32163fe027b8676c75637b7da114?narHash=sha256-Ux/UohNtnM5mn9SFjaHp6IZe2aAnUCzklMluNtV6zFo%3D' (2025-03-30)
  → 'github:Mic92/sops-nix/523f58a4faff6c67f5f685bed33a7721e984c304?narHash=sha256-zr2jmWeWyhCD8WmO2aWov2g0WPPuZfcJDKzMJZYGq3Y%3D' (2025-04-06)
@victor-ok victor-ok force-pushed the update-hyperswarm branch from c1d7671 to bd567b4 Compare April 8, 2025 14:26
@victor-ok
Copy link
Author

victor-ok commented Apr 8, 2025

Please can you delete the PR so I can start again @eljamm or please can you direct me on how to fix?

@eljamm
Copy link
Contributor

eljamm commented Apr 8, 2025

It's alright @victor-ok, we can fix things here:

  1. Rebase the last 11 commits: git rebase -i HEAD~11

    All of them will have pick by default, but change them to the following:

    pick 39b5d29 Updated hyperswarm to 4.11.1
    drop 0b7bbba hyperbeam: 3.0.1 -> 3.0.2
    drop 03bd490 corestore: 7.0.23 -> 7.1.0
    drop 2d9913f hypercore: 10.28.11 -> 11.1.2 (#710)
    drop e7dd2a3 Update project metadata template (#588)
    drop 653c773 Galene: add project (#716)
    drop 746531c flake.lock: Update
    drop b079bdc libresoc-nmigen: use fetchCargoVendor
    squash f11d600 updated hyperswarm to v4.11.1 and pushed necessary files
    squash 53f988f hyperswarm: 4.7.3 -> 4.11.1
    drop b87321f proximity-matcher: init at 0-unstable-2023-12-23
    drop 30f5757 proximity-matcher: Add project
    drop 3d56762 docs: add instructions for exposing a project
    squash bd567b4 updated hyperswarm to v4.11.1 and pushed necessary files
    
    • drop: commits will be removed
    • squash: the hyperswarm commits will be merged with the non-dropped ones above them (older changes are on the top)
  2. An editor window will open up, letting you choose the commit title you want to keep, among the squashed commits. Choose hyperswarm: 4.7.3 -> 4.11.1 and delete the rest.

  3. Save your editor and exit, then everything should be good.

  4. Delete the pkgs/by-name/hyperswarm/package.json file and commit.

  5. git rebase -i and squash that commit.

  6. Force push your changes: git push -f

@victor-ok victor-ok closed this Apr 8, 2025
@victor-ok victor-ok deleted the update-hyperswarm branch April 8, 2025 17:16
@github-project-automation github-project-automation bot moved this to Done in Nix@NGI Apr 8, 2025
@victor-ok victor-ok restored the update-hyperswarm branch April 8, 2025 17:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

Update hyperswarm to 4.11.1
5 participants