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

ryujinx: archive.org tarball mirror #346694

Merged
merged 1 commit into from
Oct 5, 2024

Conversation

Nabile-Rahmani
Copy link
Contributor

@Nabile-Rahmani Nabile-Rahmani commented Oct 5, 2024

Should fix source builds by relying on our beloved archive.org to host a SHA256-matching tarball generated from a mirror of the repo.

I have only nix repl'd the fetchTarball expression for its consistency check, as I do not currently have the time nor storage to build the package locally, sorry about that.

We could also generate archives to address #345410 and the 24.05 branch.

Supersedes: #345881

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.

@Nabile-Rahmani
Copy link
Contributor Author

Nabile-Rahmani commented Oct 5, 2024

Sorry, it probably shouldn't auto-close #345758 !

I'm afraid amending the commit would re-trigger expensive CI, someone might want to abort the run (unless that's okay) :/

CI failed:

       error: access to URI 'https://archive.org/download/ryujinx-5dbba-07e-33e-83c-9047dcbb-701c-9655edbbe-89086.tar/Ryujinx-5dbba07e33e83c9047dcbb701c9655edbbe89086.tar.gz' is forbidden in restricted mode

@emilazy
Copy link
Member

emilazy commented Oct 5, 2024

CI is already unhappy, because you can’t use fetchTarball in Nixpkgs: https://gist.github.com/GrahamcOfBorg/f6b26d35518685817e6920b9fb75a280.

You want fetchzip or fetchurl (I forget which one fetchFromGitHub uses, probably the former).

@Nabile-Rahmani
Copy link
Contributor Author

CI is already unhappy, because you can’t use fetchTarball in Nixpkgs: https://gist.github.com/GrahamcOfBorg/f6b26d35518685817e6920b9fb75a280.

You want fetchzip or fetchurl (I forget which one fetchFromGitHub uses, probably the former).

Thank you ! It's indeed fetchzip; fetchurl mismatches the hash for reasons.

Should fix source builds by relying on our beloved archive.org to host a [SHA256-matching tarball generated from a mirror of the repo](https://archive.org/details/ryujinx-5dbba-07e-33e-83c-9047dcbb-701c-9655edbbe-89086.tar).

I have only `nix repl`'d the fetchTarball expression for its consistency check, as I do not currently have the time nor storage to build the package locally, sorry about that.

We could also generate archives to address NixOS#345410 and the 24.05 branch.

Supersedes: NixOS#345881
Copy link
Member

@emilazy emilazy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have confirmed that the hash matches. This seems like an improvement on the status quo even if we later decide on removal. If you could do a similar commit for 24.05 that would be great, although it’s not urgent.

@emilazy emilazy merged commit 74ba8b7 into NixOS:master Oct 5, 2024
8 of 9 checks passed
Nabile-Rahmani added a commit to Nabile-Rahmani/nixpkgs that referenced this pull request Oct 5, 2024
Fixes source builds for 24.05, as per [emilazy's request](NixOS#346694 (review)).

Like on master, fetchzip requires the hash attribute to be explicit, double check it with `nix hash to-sri --type sha256 1vf4xwn1z7bfm7c49r2yydx3dqqzqwp0qgzq12m9yskqsj898d63`.
@Nabile-Rahmani Nabile-Rahmani deleted the ryujinx-mirror-unstable branch October 5, 2024 19:01
presto8 pushed a commit to presto8/nixpkgs that referenced this pull request Oct 9, 2024
Fixes source builds for 24.05, as per [emilazy's request](NixOS#346694 (review)).

Like on master, fetchzip requires the hash attribute to be explicit, double check it with `nix hash to-sri --type sha256 1vf4xwn1z7bfm7c49r2yydx3dqqzqwp0qgzq12m9yskqsj898d63`.
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.

3 participants