M-Labs/artiq-zynq
10
1
Fork 19
Code Issues 12 Pull Requests Releases Wiki Activity

Flake support #164

Closed
mwojcik wants to merge 7 commits from mwojcik:flake_support into master
pull from: mwojcik:flake_support
merge into: M-Labs:master
Conversation 1 Commits 7 Files Changed 6 +7 -7
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 5513db9e75 - Show all commits

2
README.md
View File

@ -59,7 +59,7 @@ Notes:
- When calling make, you need to specify both the variant and firmware type. - When calling make, you need to specify both the variant and firmware type.
- Firmware type must be either ``runtime`` for DRTIO-less or DRTIO master variants, or ``satman`` for DRTIO satellite. - Firmware type must be either ``runtime`` for DRTIO-less or DRTIO master variants, or ``satman`` for DRTIO satellite.
- If the board is connected to the local machine, use the ``local_run.sh`` script. - If the board is connected to the local machine, use the ``local_run.sh`` script.
- To update ``zynq-rs``, update the cargo files as per usual for Rust projects, but also keep ``flake.nix`` in sync. - To update ``zynq-rs``, update the cargo files as per usual for Rust projects, but also keep ``flake.lock`` in sync.
sb10q commented 2022-02-04 18:46:16 +08:00
Outdated
Review
Copy Link

That would be flake.lock.

That would be ``flake.lock``.
License License
------- -------

12
flake.lock generated
View File

@ -199,17 +199,17 @@
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1643612643, "lastModified": 1643971355,
"narHash": "sha256-I6xEppSuvN3JxyYslg9U9HMoPMZtAhCpKeLZzUq8r0o=", "narHash": "sha256-kaVxTtgdoEwB+PEorp72MXcaaaAh5U/LDnF3QKjsCco=",
"ref": "flake_extra_outputs", "ref": "master",
"rev": "fe5d5694f4adac605b71fb513696775c58104d77", "rev": "e5e646f40eae3c04898266310a64c09b8c03dfbc",
"revCount": 597, "revCount": 597,
"type": "git", "type": "git",
"url": "file:///home/spaqin/m-labs/zynq-rs" "url": "https://git.m-labs.hk/m-labs/zynq-rs"
}, },
"original": { "original": {
"type": "git", "type": "git",
"url": "file:///home/spaqin/m-labs/zynq-rs" "url": "https://git.m-labs.hk/m-labs/zynq-rs"
} }
} }
}, },