misc(nix): refactor -node and use 24.11

himkt · Dec 5, 2024 · bd6c80f · bd6c80f
1 parent ae6a2f1
commit bd6c80f
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 61 deletions.
diff --git a/nix/template.d/devenv-node/flake.lock b/nix/template.d/devenv-node/flake.lock
diff --git a/nix/template.d/devenv-node/flake.nix b/nix/template.d/devenv-node/flake.nix
@@ -1,24 +1,28 @@
 {
+  description = "devenv";
+
   inputs = {
-    flake-utils.url = "github:numtide/flake-utils";
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-24.11-darwin";
   };
 
-  outputs = inputs:
-    inputs.flake-utils.lib.eachDefaultSystem (system:
-      let
-        pkgs = (import (inputs.nixpkgs) { inherit system; });
-      in {
-        devShell = pkgs.mkShell {
-          buildInputs=[
-            pkgs.nodejs_22
-            pkgs.nodePackages.pnpm
-          ];
-          shellHook = ''
-            export SHELL=$(which zsh)
-            exec $SHELL
-          '';
-        };
-      }
-    );
+  outputs = { self, nixpkgs }: let
+    pkgs = import nixpkgs {
+      system = "aarch64-darwin";
+    };
+
+    shell = pkgs.mkShellNoCC {
+      packages = [
+        pkgs.nodejs_22
+        pkgs.nodePackages.pnpm
+      ];
+      shellHook = ''
+        export SHELL=$(which zsh)
+        exec $SHELL
+      '';
+    };
+  in {
+    devShells = {
+      aarch64-darwin.default = shell;
+    };
+  };
 }
diff --git a/nix/template.d/devenv-uv/flake.lock b/nix/template.d/devenv-uv/flake.lock
diff --git a/nix/template.d/devenv-uv/flake.nix b/nix/template.d/devenv-uv/flake.nix
@@ -2,7 +2,7 @@
   description = "devenv";
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-24.11-darwin";
   };
 
   outputs = { self, nixpkgs }: let