From 52b1f3228bbc6bf1673e7094f85f8c63417148ac Mon Sep 17 00:00:00 2001
From: Artemis Tosini <me@artem.ist>
Date: Fri, 23 Feb 2024 05:45:11 +0000
Subject: [PATCH] fix zephyr dev shell

---
 flake.lock       | 20 ++++++++++----------
 flake.nix        | 11 ++++++++---
 rp2040/shell.nix |  3 +--
 3 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/flake.lock b/flake.lock
index a3eef03..8439a2a 100644
--- a/flake.lock
+++ b/flake.lock
@@ -10,11 +10,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1700363859,
-        "narHash": "sha256-zT0vd5Vhd9dR3bTJpFCwtiBRkjY0+iYhvXVifIQ7vSo=",
+        "lastModified": 1708666625,
+        "narHash": "sha256-m/hGwXHPhUo7s/uUigA7skxg5B33X8LAOrMznE88zXY=",
         "ref": "refs/heads/canon",
-        "rev": "6400d73e5f103f15550beb8bfb0315a98121dfef",
-        "revCount": 13,
+        "rev": "6c29e57677352cb3bd34ef4ef7665f05760bf057",
+        "revCount": 39,
         "type": "git",
         "url": "https://git.mildlyfunctional.gay/artemist/packages.git"
       },
@@ -25,11 +25,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1700786208,
-        "narHash": "sha256-vP0WI7qNkg3teQJN5xjFcxgnBNiKCbkgw3X9HcAxWJY=",
+        "lastModified": 1708564076,
+        "narHash": "sha256-KKkqoxlgx9n3nwST7O2kM8tliDOijiSSNaWuSkiozdQ=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "8b8c9407844599546393146bfac901290e0ab96b",
+        "rev": "98b00b6947a9214381112bdb6f89c25498db4959",
         "type": "github"
       },
       "original": {
@@ -66,11 +66,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1694529238,
-        "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
+        "lastModified": 1705309234,
+        "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
+        "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index d3f5341..ab73fbb 100644
--- a/flake.nix
+++ b/flake.nix
@@ -11,16 +11,16 @@
   outputs = { self, nixpkgs, utils, artemist-packages }:
     utils.lib.eachDefaultSystem (system:
       let pkgs = import nixpkgs { inherit system; };
-      in {
+      in rec {
         devShells.zephyr =
           artemist-packages.devShells.${system}.zephyr.override {
             toolchains =
-              with artemist-packages.packages.${system}.zephyr.toolchains; [
+              with artemist-packages.packages.${system}.zephyrPackages.toolchains; [
                 arm-zephyr-eabi
                 riscv64-zephyr-elf
               ];
             modules =
-              with artemist-packages.packages.${system}.zephyr.modules; [
+              with artemist-packages.packages.${system}.zephyrPackages.modules; [
                 mbedtls
                 hal_rpi_pico
                 hal_atmel
@@ -28,6 +28,11 @@
               ];
             extraPackages = with pkgs; [ pyocd ];
           };
+        devShells.zephyr-west = devShells.zephyr.override {
+          enableWest = true;
+          zephyrSrc = null;
+          modules = [ ];
+        };
         formatter = pkgs.nixfmt;
       });
 
diff --git a/rp2040/shell.nix b/rp2040/shell.nix
index 3ce5c98..0a3fdcd 100644
--- a/rp2040/shell.nix
+++ b/rp2040/shell.nix
@@ -7,8 +7,7 @@ let
     rev = "1.4.0";
     sha256 = "sha256-i3IAaNcd0EfKNvU104a776O1poDAChlx1m+nP8iFn8E=";
   };
-in
-mkShell rec {
+in mkShell rec {
   name = "pico-env";
 
   nativeBuildInputs = [ pkg-config ];