Nix Flake Maintainance

doc.nix

@@ -1,36 +1,27 @@
-{ lib
-, stdenv
-, west2nixHook
-, pythonEnv
-, cmake
-, ninja
-, doxygen
-, mscgen
-, graphviz
-, git
-, zephyr
-, bridle
+{
+  lib,
+  stdenv,
+  west2nixHook,
+  pythonEnv,
+  cmake,
+  ninja,
+  doxygen,
+  mscgen,
+  graphviz,
+  git,
+  zephyr,
+  bridle,
+  bridleHook,
 }:
 
 stdenv.mkDerivation {
 
   name = "bridle-doc";
   src = bridle;
-  unpackPhase = ''
-    cp -r ${bridle} bridle
-    chmod +w -R bridle
-    cd bridle
-    git init
-    git config user.email "[email protected]"
-    git config user.name "Foo"
-    git checkout -b fake-branch
-    git add -A
-    git commit -m "Fake Commnit"
-    cd ..
-  '';
 
   nativeBuildInputs = [
     west2nixHook
+    bridleHook
     pythonEnv
     cmake
     ninja

flake.nix

@@ -4,6 +4,8 @@
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11";
 
+    nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
+
     zephyr = {
       type = "github";
       owner = "tiacsys";
@@ -27,40 +29,54 @@
     pyproject-nix.url = "github:nix-community/pyproject.nix";
 
     python-deps = {
-      url = "github:irockasingranite/bridle-python-deps";
+      type = "github";
+      owner = "Irockasingranite";
+      repo = "bridle-python-deps";
+      ref = "main";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
   };
 
-  outputs = { self, nixpkgs, flake-utils, ... }@inputs:
-    (flake-utils.lib.eachDefaultSystem (system:
+  outputs =
+    {
+      self,
+      nixpkgs,
+      nixpkgs-unstable,
+      flake-utils,
+      ...
+    }@inputs:
+    (flake-utils.lib.eachDefaultSystem (
+      system:
       let
         pkgs = nixpkgs.legacyPackages.${system};
+        pkgs-unstable = nixpkgs-unstable.legacyPackages.${system};
         inherit (nixpkgs) lib;
 
         west2nix = callPackage inputs.west2nix.lib.mkWest2nix { };
 
-        callPackage = pkgs.newScope (pkgs // {
-          bridle = self;
-          zephyr = inputs.zephyr;
-          zephyr-nix = inputs.zephyr-nix.packages.${system};
-          pyproject-nix = inputs.pyproject-nix;
-          pythonEnv = callPackage ./python.nix {
-            python-deps = inputs.python-deps.packages.${system};
-          };
-          west2nixHook = west2nix.mkWest2nixHook {
-            manifest = ./west2nix.toml;
-          };
-        });
+        callPackage = pkgs.newScope (
+          pkgs
+          // {
+            bridle = self;
+            zephyr = inputs.zephyr;
+            zephyr-nix = inputs.zephyr-nix.packages.${system};
+            pyproject-nix = inputs.pyproject-nix;
+            pythonEnv = callPackage ./python.nix { python-deps = inputs.python-deps.packages.${system}; };
+            west2nixHook = west2nix.mkWest2nixHook { manifest = ./west2nix.toml; };
+            bridleHook = callPackage ./hook.nix { };
+          }
+        );
 
-      in {
-        formatter = pkgs.nixfmt;
+      in
+      {
+        formatter = pkgs-unstable.nixfmt-rfc-style;
 
         packages.west2nix = inputs.west2nix.packages.${system}.default;
 
         devShells.default = callPackage ./shell.nix { };
 
         packages.doc = callPackage ./doc.nix { };
-      }));
+      }
+    ));
 }

hook.nix

@@ -0,0 +1,15 @@
+{
+  lib,
+  makeSetupHook,
+  gitMinimal,
+  bridle,
+}:
+
+makeSetupHook {
+  name = "nix-bridle-hook.sh";
+  propagatedBuildInputs = [ gitMinimal ];
+  substitutions = {
+    git = lib.getExe gitMinimal;
+    inherit bridle;
+  };
+} ./nix-bridle-hook.sh

nix-bridle-hook.sh

@@ -0,0 +1,16 @@
+function _bridleUnpackPhase {
+    runHook preUnpack
+    cp -r @bridle@ bridle
+    chmod +w -R bridle
+    cd bridle
+    @git@ init
+    @git@ config user.email "[email protected]"
+    @git@ config user.name "Foo"
+    @git@ checkout -b fake-branch
+    @git@ add -A
+    @git@ commit -m "Fake Commnit"
+    cd ..
+    runHook postUnpack
+}
+
+unpackPhase=(_bridleUnpackPhase)

python.nix

@@ -1,11 +1,12 @@
-{ python3
-, zephyr
-, bridle
-, python-deps
-, pyproject-nix
-, clang-tools
-, gitlint
-, lib
+{
+  python3,
+  zephyr,
+  bridle,
+  python-deps,
+  pyproject-nix,
+  clang-tools,
+  gitlint,
+  lib,
 }:
 
 let
@@ -26,9 +27,11 @@ let
         pyedbglib
         pykitinfo
         pymcuprog
+        python-can
         sphinx-tsn-theme
         sphinxcontrib-svg2pdfconverter
-        sphinx-csv-filter;
+        sphinx-csv-filter
+        ;
     };
   };
 
@@ -43,23 +46,29 @@ let
 
   # Can't validate the combined packages sets, but we can at least check for
   # conflicts within each subset
-  invalidConstraints = zephyr-project.validators.validateVersionConstraints { inherit python; }
+  invalidConstraints =
+    zephyr-project.validators.validateVersionConstraints { inherit python; }
     // bridle-project.validators.validateVersionConstraints { inherit python; };
 
 in
-lib.warnIf
-  (invalidConstraints != { })
+lib.warnIf (invalidConstraints != { })
   "pythonEnv: Found invalid Python constraints for: ${builtins.toJSON (lib.attrNames invalidConstraints)}"
-  (python.buildEnv.override {
-    extraLibs = (bridle-project.renderers.withPackages {
-      inherit python;
-      # Nest one project's withPackages within the other to get a combined package
-      # set. If we want more than two, we should name these lambdas to reduce
-      # indentation.
-      extraPackages = (zephyr-project.renderers.withPackages {
-        inherit python;
-        extraPackages = ps: [ ps.west ];
-      });
-    }) python.pkgs;
-    ignoreCollisions = true;
-  })
+  (
+    python.buildEnv.override {
+      extraLibs =
+        (bridle-project.renderers.withPackages {
+          inherit python;
+          # Nest one project's withPackages within the other to get a combined package
+          # set. If we want more than two, we should name these lambdas to reduce
+          # indentation.
+          extraPackages = (
+            zephyr-project.renderers.withPackages {
+              inherit python;
+              extraPackages = ps: [ ps.west ];
+            }
+          );
+        })
+          python.pkgs;
+      ignoreCollisions = true;
+    }
+  )

shell.nix

@@ -1,13 +1,14 @@
-{ lib
-, callPackage
-, pythonEnv
-, mkShell
-, zephyr
-, zephyr-nix
-, bridle
-, cmake
-, ninja
-, git
+{
+  lib,
+  callPackage,
+  pythonEnv,
+  mkShell,
+  zephyr,
+  zephyr-nix,
+  bridle,
+  cmake,
+  ninja,
+  git,
 }:
 
 mkShell {