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

Commit Cargo.lock #5

Merged
merged 3 commits into from
Nov 1, 2024
Merged

Commit Cargo.lock #5

merged 3 commits into from
Nov 1, 2024

Conversation

tennox
Copy link
Contributor

@tennox tennox commented Nov 24, 2023

The original PR was from the wrong branch and mingled with other changes, so I created this clean one.

For reference, here's the gist:

This is recommended for binaries (as opposed to libraries)
-> see https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html

Also, I want to submit this to nixpkgs, and for that also helps 😋

I have submitted the nixpkgs PR with a manually added Cargo.lock:
NixOS/nixpkgs#236516
but I'd still recommend that & like if this gets merged, as it creates fragmentation :)

@tennox tennox mentioned this pull request Nov 24, 2023
tennox added a commit to tennox/nixpkgs that referenced this pull request Nov 24, 2023
Also:
- moved back to my fork
  (until the PR is merged: linux-china/task-keeper#5)
- removed the Cargo.lock, which is now part of the repo
- set `meta.mainProgram` correctly
tennox added a commit to tennox/task-keeper that referenced this pull request Nov 1, 2024
BLOCKED by linux-china#5 (nix naersk build requires Cargo.lock to be comitted - so a reproducible build is possible)
@tennox
Copy link
Contributor Author

tennox commented Nov 1, 2024

@linux-china I've merged your latest master & had to update rust toolchain, thus this PR now also updates the devenv to rust v1.84.0-nightly

Would be great if you could merge it, as it enables both:

@linux-china linux-china merged commit 8b6d543 into linux-china:master Nov 1, 2024
7 checks passed
tennox added a commit to tennox/nixpkgs that referenced this pull request Nov 1, 2024
tennox added a commit to tennox/nixpkgs that referenced this pull request Nov 1, 2024
tennox added a commit to tennox/nixpkgs that referenced this pull request Nov 1, 2024
tennox added a commit to tennox/nixpkgs that referenced this pull request Nov 1, 2024
tennox added a commit to tennox/nixpkgs that referenced this pull request Nov 1, 2024
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