M-Labs
/
nix-scripts
9
0
Fork 8
Code Issues 6 Pull Requests 1 Releases Wiki Activity

mcu-contrib: break apart stabilizer and stabilizer-pounder #89

Closed
mwojcik wants to merge 1 commits from mwojcik/nix-scripts:pounder-schism into master
pull from: mwojcik/nix-scripts:pounder-schism
merge into: M-Labs:master
Conversation 1 Commits 1 Files Changed 3 +10 -804
mwojcik commented 2024-06-05 17:40:02 +08:00
Owner
Copy Link

Something I missed (with the classic excuse of "it builds on my machine"):

One caveat is that Cargo.lock cannot be patched in the patchPhase (nixpkgs on Rust)

and that seems required in this case... so how about we just break apart, let the normal Stabilizer dual-iir/lockin build from source without modifications, remove the patch and just keep pounder-telemetry separate, building from another repo? I could move the changes to Gitea so it's not mapped to my github account.

Something I missed (with the classic excuse of "it builds on my machine"): > One caveat is that Cargo.lock cannot be patched in the patchPhase ([nixpkgs on Rust](https://github.com/NixOS/nixpkgs/blob/master/doc/languages-frameworks/rust.section.md)) and that seems required in this case... so how about we just break apart, let the normal Stabilizer dual-iir/lockin build from source without modifications, remove the patch and just keep pounder-telemetry separate, building from another repo? I could move the changes to Gitea so it's not mapped to my github account.
mwojcik added 1 commit 2024-06-05 17:40:03 +08:00
sb10q commented 2024-06-05 17:44:30 +08:00
Owner
Copy Link

Just change cargoLock = {lockFile = "${src}/Cargo.lock"; inherit outputHashes; }; to allow patching. It may be import-from-derivation but we should be able to allow that on Hydra if it is a problem

Just change ``cargoLock = {lockFile = "${src}/Cargo.lock"; inherit outputHashes; };`` to allow patching. It may be import-from-derivation but we should be able to allow that on Hydra if it is a problem
mwojcik closed this pull request 2024-06-06 10:26:26 +08:00

Pull request closed

Please reopen this pull request to perform a merge.
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No Label
Milestone
Clear milestone
No items
No Milestone
Assignees
Clear assignees
No Assignees
2 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: M-Labs/nix-scripts#89
No description provided.
Delete Branch "mwojcik/nix-scripts:pounder-schism"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?