Bump nix deps (fixes #95)

urob · Feb 16, 2025 · 16784bd · 16784bd
1 parent 4d00a15
commit 16784bd
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 26 deletions.
diff --git a/.github/workflows/test-build-env.yml b/.github/workflows/test-build-env.yml
@@ -24,23 +24,10 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-
-      - uses: nixbuild/nix-quick-install-action@v29
-        if: ${{ matrix.system != 'aarch64-linux' }}
-
-      # https://github.com/nixbuild/nix-quick-install-action/issues/55
       - uses: cachix/install-nix-action@v30
-        if: ${{ matrix.system == 'aarch64-linux' }}
-
       - name: Set up build environment
-        run: |
-          nix develop --command just init
-
+        run: nix develop --command just init
       - name: Test build recipe
-        run: |
-          nix develop --command just build planck
-
+        run: nix develop --command just build planck
       - name: Test draw recipe
-        run: |
-          nix develop --command just draw
-        if: ${{ matrix.system != 'aarch64-linux' }}
+        run: nix develop --command just draw
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -35,6 +35,8 @@
               pkgs.just
               pkgs.yq # Make sure yq resolves to python-yq.
 
+              keymap_drawer
+
               # -- Used by just_recipes and west_commands. Most systems already have them. --
               # pkgs.gawk
               # pkgs.unixtools.column
@@ -43,10 +45,7 @@
               # pkgs.findutils # find, xargs
               # pkgs.gnugrep
               # pkgs.gnused
-            ]
-            # Temporary disable keymap_drawer on aarch64-linux due to
-            # https://github.com/NixOS/nixpkgs/issues/372375.
-            ++ nixpkgs.lib.optionals (system != "aarch64-linux") [keymap_drawer];
+            ];
 
           shellHook = ''
             export ZMK_BUILD_DIR=$(pwd)/.build;

diff --git a/nix/keymap-drawer.nix b/nix/keymap-drawer.nix
@@ -27,6 +27,12 @@ buildPythonApplication rec {
     hash = "sha256-F9lDUuqHKl2FOUsUszJrRK7/a/a1UJLw+RUg9Bv2zN0=";
   };
 
+  postPatch = ''
+    # nixos-unstable no longer bundles v23 of tree-sitter
+    substituteInPlace pyproject.toml --replace 'tree-sitter (>=0.23.2,<0.24.0)' 'tree-sitter (>=0.23.2,<0.25.0)'
+
+  '';
+
   build-system = [ poetry-core ];
 
   propagatedBuildInputs = [