Skip to content

Commit 4b4f419

Browse files
committed
move all pypi installs to nix shell in prep for derivation.
1 parent 68468b3 commit 4b4f419

File tree

2 files changed

+15
-4
lines changed

2 files changed

+15
-4
lines changed

commands.bash

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,12 @@ set -euxo pipefail
55
git submodule init
66
git submodule update
77

8+
# reset
9+
git submodule foreach 'git clean -ffdx; git checkout .'
10+
rm -rf venv
11+
812
python3 -m venv venv
913
source venv/bin/activate
10-
pip install -U pip
11-
pip install pyyaml pykwalify packaging pyelftools colorama setuptools==68.2.2
1214

1315
sed -e 's#"/bin:/usr/bin"#"/bin:/usr/bin:'"$(dirname "$(which gcc)"):$(dirname "$(which dtc)")"'","DYLD_LIBRARY_PATH":"'"$(dirname "$(dirname "$(which dtc)")")/lib"'"#' -i src/platform/ec/zephyr/zmake/zmake/jobserver.py
1416
pip install src/platform/ec/zephyr/zmake

flake.nix

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,23 @@
1616
}:
1717
flake-utils.lib.eachDefaultSystem (system: let
1818
pkgs = import nixpkgs {inherit system;};
19+
20+
python = pkgs.python312;
21+
pythonPkgs = pkgs.python312Packages;
1922
in {
2023
formatter = pkgs.alejandra;
2124

2225
devShells.default = pkgs.mkShell {
2326
buildInputs = with pkgs; [
2427
(zephyr-nix.packages.${system}.sdk-0_16.override {targets = ["arm-zephyr-eabi"];})
25-
python312
26-
python312Packages.libfdt # <- 311 version fails to build
28+
python
29+
pythonPkgs.pyyaml
30+
pythonPkgs.pykwalify
31+
pythonPkgs.packaging
32+
pythonPkgs.pyelftools
33+
pythonPkgs.colorama
34+
pythonPkgs.setuptools
35+
pythonPkgs.libfdt # <- 311 version fails to build; can't build with pip.
2736
dtc
2837
cmake
2938
ninja

0 commit comments

Comments
 (0)