M-Labs/humpback-dds
6
0
Fork 3
Code Issues 1 Pull Requests 1 Releases Wiki Activity

Add nix flakes support #2

Merged
sb10q merged 10 commits from mwojcik/humpback-dds:nix-flakes into master 2022-01-25 10:13:35 +08:00
Conversation 11 Commits 10 Files Changed 12 +7 -5
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e38bf09c26 - Show all commits

2
Cargo.toml
View File

@ -14,7 +14,7 @@ stm32h7xx-hal = {version = "0.7.1", features = [ "stm32h743v", "rt", "unproven",
smoltcp = { version = "0.6.0", default-features = false, features = [ "ethernet", "proto-ipv4", "proto-ipv6", "socket-tcp" ] } smoltcp = { version = "0.6.0", default-features = false, features = [ "ethernet", "proto-ipv4", "proto-ipv6", "socket-tcp" ] }
nb = "1.0.0" nb = "1.0.0"
embedded-nal = "0.1.0" embedded-nal = "0.1.0"
minimq = { git = "https://github.com/quartiq/minimq.git", branch = "master" } minimq = { version = "0.1.0", git = "https://github.com/quartiq/minimq.git" }
sb10q commented 2022-01-19 17:22:51 +08:00
Outdated
Review
Copy Link

I'm surprised that this doesn't come with a corresponding change to Cargo.lock.

I'm surprised that this doesn't come with a corresponding change to Cargo.lock.
heapless = "0.5.6" heapless = "0.5.6"
nom = { version = "5.1.2", default-features = false, features = [] } nom = { version = "5.1.2", default-features = false, features = [] }
ryu = "1.0" ryu = "1.0"

10
flake.nix
View File

@ -9,8 +9,8 @@
let let
pkgs = import nixpkgs { system = "x86_64-linux"; overlays = [ (import mozilla-overlay) ]; }; pkgs = import nixpkgs { system = "x86_64-linux"; overlays = [ (import mozilla-overlay) ]; };
rustManifest = pkgs.fetchurl { rustManifest = pkgs.fetchurl {
url = "https://static.rust-lang.org/dist/2020-07-29/channel-rust-nightly.toml"; url = "https://static.rust-lang.org/dist/2020-10-30/channel-rust-nightly.toml";
sha256 = "sha256-h8Irym/tKl0cJY3DmoxRD81IYZB/xLf7/AILLDuxDKY="; sha256 = "0iygcwzh8s0lfdghj5809krvzifc1ii1wm4sd3qqn7s0rz1s14hi";
}; };
migen = pkgs.python3Packages.buildPythonPackage rec { migen = pkgs.python3Packages.buildPythonPackage rec {
@ -52,10 +52,10 @@
nativeBuildInputs = [ nativeBuildInputs = [
pkgs.llvm pkgs.llvm
(pkgs.python3.withPackages(ps: [ migen ]))
pkgs.yosys pkgs.yosys
pkgs.nextpnr pkgs.nextpnr
pkgs.icestorm pkgs.icestorm
(pkgs.python3.withPackages(ps: [ migen ]))
]; ];
buildPhase = '' buildPhase = ''
@ -70,6 +70,7 @@
echo file binary-dist $out/humpback-dds.bin >> $out/nix-support/hydra-build-products echo file binary-dist $out/humpback-dds.bin >> $out/nix-support/hydra-build-products
''; '';
doCheck = false;
dontFixup = true; dontFixup = true;
}; };
in { in {
@ -86,7 +87,8 @@
buildInputs = with pkgs; [ buildInputs = with pkgs; [
rustPlatform.rust.rustc rustPlatform.rust.rustc
rustPlatform.rust.cargo rustPlatform.rust.cargo
openocd dfu-util openocd dfu-util
sb10q commented 2022-01-21 18:07:15 +08:00
Outdated
Review
Copy Link

if nix/openocd.nix is no longer necessary, please delete the file.

if nix/openocd.nix is no longer necessary, please delete the file.
sb10q commented 2022-01-21 18:09:47 +08:00
Outdated
Review
Copy Link

same with the other files in nix/ - I think the whole directory should be deleted.

same with the other files in nix/ - I think the whole directory should be deleted.
yosys nextpnr icestorm
] ++ (with python3Packages; [ ] ++ (with python3Packages; [
numpy matplotlib migen numpy matplotlib migen
]); ]);