From 3e0a5e93d7aa0f2b49e371fd5da75032e9465236 Mon Sep 17 00:00:00 2001 From: me-it-is <188520719+me-it-is@users.noreply.github.com> Date: Mon, 31 Aug 2026 00:12:35 -0700 Subject: [PATCH 1/4] add nix flake --- flake.lock | 27 +++++++++++++++++++++++++++ flake.nix | 20 ++++++++++++++++++++ 2 files changed, 47 insertions(+) create mode 100644 flake.lock create mode 100644 flake.nix diff --git a/flake.lock b/flake.lock new file mode 100644 index 00000000..682bf11a --- /dev/null +++ b/flake.lock @@ -0,0 +1,27 @@ +{ + "nodes": { + "nixpkgs": { + "locked": { + "lastModified": 1788039129, + "narHash": "sha256-pa4Q0qErvCvzCaaUph7Sm37RhR4xvPrYI8Lgz6k85+A=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "d2f67949798825fe853f7c5d0492b8bf016d3f88", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "nixpkgs": "nixpkgs" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flake.nix b/flake.nix new file mode 100644 index 00000000..43b27115 --- /dev/null +++ b/flake.nix @@ -0,0 +1,20 @@ +{ + description = "A flake to provide dev shells"; + + inputs = { + nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable"; + }; + + outputs = inputs: { + devShells = builtins.mapAttrs (system: pkgs: { + default = pkgs.mkShell { + packages = with pkgs; [ + nodejs_24 + pnpm_11 + ]; + }; + }) inputs.nixpkgs.legacyPackages; + + formatter = builtins.mapAttrs (system: pkgs: pkgs.nixfmt-tree) inputs.nixpkgs.legacyPackages; + }; +} From 934a5de1be13642fa960cfb374f18b975cb50e8f Mon Sep 17 00:00:00 2001 From: Jade Date: Mon, 31 Aug 2026 12:07:20 -0700 Subject: [PATCH 2/4] give the flake a better name --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 43b27115..c0b8d76e 100644 --- a/flake.nix +++ b/flake.nix @@ -1,5 +1,5 @@ { - description = "A flake to provide dev shells"; + description = "A flake to provide a dev environment for FRC/FTC Software development"; inputs = { nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable"; From 9ebe5f7d0018e911c0c160f91f59940e3c2346e5 Mon Sep 17 00:00:00 2001 From: me-it-is <188520719+me-it-is@users.noreply.github.com> Date: Mon, 31 Aug 2026 12:23:14 -0700 Subject: [PATCH 3/4] override pnpm to be 11.24.0 --- flake.nix | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/flake.nix b/flake.nix index c0b8d76e..c6b4c4e0 100644 --- a/flake.nix +++ b/flake.nix @@ -6,14 +6,26 @@ }; outputs = inputs: { - devShells = builtins.mapAttrs (system: pkgs: { - default = pkgs.mkShell { - packages = with pkgs; [ - nodejs_24 - pnpm_11 - ]; - }; - }) inputs.nixpkgs.legacyPackages; + devShells = builtins.mapAttrs ( + system: pkgs: + let + pnpm_11_24 = pkgs.pnpm_11.overrideAttrs (old: rec { + version = "11.24.0"; + src = pkgs.fetchurl { + url = "https://registry.npmjs.org/pnpm/-/pnpm-${version}.tgz"; + hash = "sha256-0eqyQzFyZhzDahjshfzpP3cdsZYnFzKcwB7JwoJMok8="; + }; + }); + in + { + default = pkgs.mkShell { + packages = [ + pkgs.nodejs_24 + pnpm_11_24 + ]; + }; + } + ) inputs.nixpkgs.legacyPackages; formatter = builtins.mapAttrs (system: pkgs: pkgs.nixfmt-tree) inputs.nixpkgs.legacyPackages; }; From 14fb994166052a8bc5cdeb3413e39a1b44e4bbb7 Mon Sep 17 00:00:00 2001 From: me-it-is <188520719+me-it-is@users.noreply.github.com> Date: Mon, 31 Aug 2026 21:22:32 -0700 Subject: [PATCH 4/4] switch to nixpkgs-unstable --- flake.lock | 8 ++++---- flake.nix | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/flake.lock b/flake.lock index 682bf11a..a7863d41 100644 --- a/flake.lock +++ b/flake.lock @@ -2,16 +2,16 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1788039129, - "narHash": "sha256-pa4Q0qErvCvzCaaUph7Sm37RhR4xvPrYI8Lgz6k85+A=", + "lastModified": 1787964612, + "narHash": "sha256-0N9nghg3nwzX6b6qc77EzjR9cu/Z+UR66FlfsCqiURs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d2f67949798825fe853f7c5d0492b8bf016d3f88", + "rev": "e8be7818e19ada32105a8af937a6a473b38167ca", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-unstable", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index c6b4c4e0..099fae2b 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "A flake to provide a dev environment for FRC/FTC Software development"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable"; + nixpkgs.url = "github:nixos/nixpkgs?ref=nixpkgs-unstable"; }; outputs = inputs: {