artemist/play
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

fix zephyr dev shell

Browse source
This commit is contained in:
Artemis Tosini 2024-02-23 05:45:11 +00:00
parent be5476156e
commit 52b1f3228b
Signed by: artemist
GPG key ID: EE5227935FE3FF18
3 changed files with 19 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
flake.lock
View file

@ -10,11 +10,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1700363859, "lastModified": 1708666625,
"narHash": "sha256-zT0vd5Vhd9dR3bTJpFCwtiBRkjY0+iYhvXVifIQ7vSo=", "narHash": "sha256-m/hGwXHPhUo7s/uUigA7skxg5B33X8LAOrMznE88zXY=",
"ref": "refs/heads/canon", "ref": "refs/heads/canon",
"rev": "6400d73e5f103f15550beb8bfb0315a98121dfef", "rev": "6c29e57677352cb3bd34ef4ef7665f05760bf057",
"revCount": 13, "revCount": 39,
"type": "git", "type": "git",
"url": "https://git.mildlyfunctional.gay/artemist/packages.git" "url": "https://git.mildlyfunctional.gay/artemist/packages.git"
}, },
@ -25,11 +25,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1700786208, "lastModified": 1708564076,
"narHash": "sha256-vP0WI7qNkg3teQJN5xjFcxgnBNiKCbkgw3X9HcAxWJY=", "narHash": "sha256-KKkqoxlgx9n3nwST7O2kM8tliDOijiSSNaWuSkiozdQ=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "8b8c9407844599546393146bfac901290e0ab96b", "rev": "98b00b6947a9214381112bdb6f89c25498db4959",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -66,11 +66,11 @@
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1694529238, "lastModified": 1705309234,
"narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "ff7b65b44d01cf9ba6a71320833626af21126384", "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
"type": "github" "type": "github"
}, },
"original": { "original": {

11
flake.nix
View file

@ -11,16 +11,16 @@
outputs = { self, nixpkgs, utils, artemist-packages }: outputs = { self, nixpkgs, utils, artemist-packages }:
utils.lib.eachDefaultSystem (system: utils.lib.eachDefaultSystem (system:
let pkgs = import nixpkgs { inherit system; }; let pkgs = import nixpkgs { inherit system; };
in { in rec {
devShells.zephyr = devShells.zephyr =
artemist-packages.devShells.${system}.zephyr.override { artemist-packages.devShells.${system}.zephyr.override {
toolchains = toolchains =
with artemist-packages.packages.${system}.zephyr.toolchains; [ with artemist-packages.packages.${system}.zephyrPackages.toolchains; [
arm-zephyr-eabi arm-zephyr-eabi
riscv64-zephyr-elf riscv64-zephyr-elf
]; ];
modules = modules =
with artemist-packages.packages.${system}.zephyr.modules; [ with artemist-packages.packages.${system}.zephyrPackages.modules; [
mbedtls mbedtls
hal_rpi_pico hal_rpi_pico
hal_atmel hal_atmel
@ -28,6 +28,11 @@
]; ];
extraPackages = with pkgs; [ pyocd ]; extraPackages = with pkgs; [ pyocd ];
}; };
devShells.zephyr-west = devShells.zephyr.override {
enableWest = true;
zephyrSrc = null;
modules = [ ];
};
formatter = pkgs.nixfmt; formatter = pkgs.nixfmt;
}); });

3
rp2040/shell.nix
View file

@ -7,8 +7,7 @@ let
rev = "1.4.0"; rev = "1.4.0";
sha256 = "sha256-i3IAaNcd0EfKNvU104a776O1poDAChlx1m+nP8iFn8E="; sha256 = "sha256-i3IAaNcd0EfKNvU104a776O1poDAChlx1m+nP8iFn8E=";
}; };
in in mkShell rec {
mkShell rec {
name = "pico-env"; name = "pico-env";
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];