Skip to content

Commit 8080b54

Browse files
committed
flake.nix: Add marigold, update dependencies
cmsis, zephyr, u-boot based on the chromium-manifest we use to build internally. Signed-off-by: Daniel Schaefer <[email protected]>
1 parent 52bed9f commit 8080b54

File tree

2 files changed

+19
-18
lines changed

2 files changed

+19
-18
lines changed

flake.lock

Lines changed: 15 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
zephyr-nix.url = github:adisbladis/zephyr-nix;
88
zephyr-nix.inputs.nixpkgs.follows = "nixpkgs";
99

10-
cmsis.url = git+https://chromium.googlesource.com/chromiumos/third_party/zephyr/cmsis?rev=4aa3ff8e4f8a21e31cd9831b943acb7a7cd56ac8;
10+
cmsis.url = git+https://chromium.googlesource.com/chromiumos/third_party/zephyr/cmsis?rev=b9d63132c1cc195464a57aad984398c41edcd3a2;
1111
cmsis.flake = false;
1212

13-
zephyr.url = github:FrameworkComputer/zephyr?ref=lotus-zephyr&name=zephyr;
13+
zephyr.url = github:FrameworkComputer/zephyr?ref=marigold&name=zephyr;
1414
zephyr.flake = false;
1515

16-
u-boot.url = git+https://chromium.googlesource.com/chromiumos/third_party/u-boot?rev=39759bf9fe3a5b6d4788164fc046f5f8aee5cbff;
16+
u-boot.url = git+https://chromium.googlesource.com/chromiumos/third_party/u-boot?ref=chromeos-v2023.10-next;
1717
u-boot.flake = false;
1818
};
1919

@@ -111,6 +111,7 @@
111111
packages.default = packages.lotus;
112112
packages.lotus = mkBuild packages "lotus";
113113
packages.azalea = mkBuild packages "azalea";
114+
packages.marigold = mkBuild packages "marigold";
114115

115116
packages.zmake = pythonPkgs.buildPythonPackage {
116117
name = "zmake";

0 commit comments

Comments
 (0)