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

fractal: fix build due to git dependencies in Cargo.lock #224093

Merged
merged 1 commit into from
Apr 1, 2023

Conversation

Philipp-M
Copy link
Member

Description of changes

Due to 4329de1
fractal failed to build, this PR should fix the issue.

@L911P, @LostAttractor, @NickCao, can you test if this fixes the issue (I'm not sure how to get rid of cached dependencies, as it still compiled for me without this, I guess I would need to do a garbage collect or something)?

Btw. I have first used something like this to avoid putting to much bloat (Cargo.lock) into nixpkgs:

rec {
# src = ...;
  cargoDeps = rustPlatform.importCargoLock {
    lockFile = "${src}/Cargo.lock";
    # ...
  };
# ...
}

but due to to --no-allow-import-from-derivation in nixpkgs-review it fails, as eval depends on a derivation that has to be build. Is there a better way to do this instead of including the Cargo.lock directly, without having to depend on a build (e.g. builtins.fetchers)?

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • 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/)
  • 23.05 Release Notes (or backporting 22.11 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.

@NickCao
Copy link
Member

NickCao commented Mar 31, 2023

It's ok to include the Cargo.lock in nixpkgs (and we have no better choice yet, check #217084 for context).

Copy link
Member

@NickCao NickCao left a comment

Choose a reason for hiding this comment

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

Tested building locally, waiting for ofborg to double check. And another concern: does the updateScript still work?

Edit: nix-update seems to have support for this.

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.

2 participants