From bfc0a3470cc52761c3ece0146be9eb4802707968 Mon Sep 17 00:00:00 2001 From: arne Date: Tue, 7 Oct 2025 22:45:41 +0200 Subject: [PATCH 1/2] update esp-idf toolchain --- flake.lock | 20 ++++++++++---------- flake.nix | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/flake.lock b/flake.lock index 63b373e..d4de143 100644 --- a/flake.lock +++ b/flake.lock @@ -6,17 +6,16 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1746690306, - "narHash": "sha256-bMp4BCrTOX7VDLVU8TzMSQj1hviBrARz9iiqNq6Vbnk=", + "lastModified": 1758247379, + "narHash": "sha256-u7LOGpRhY1MmelsdLF5BlZRtuwYD5GBfQzVOdNojhz8=", "owner": "mirrexagon", "repo": "nixpkgs-esp-dev", - "rev": "6c34f2436015eb6c107970d9b88f3d5d4600c6fa", + "rev": "f087ab9ecf5177d5bcf773b0c7467fa91b33dae7", "type": "github" }, "original": { "owner": "mirrexagon", "repo": "nixpkgs-esp-dev", - "rev": "6c34f2436015eb6c107970d9b88f3d5d4600c6fa", "type": "github" } }, @@ -40,17 +39,18 @@ }, "nixpkgs": { "locked": { - "lastModified": 1729501122, - "narHash": "sha256-tScdcYQ37kMqlyqb5yizNDTKXZASLB4zHitlHwOg+/o=", + "lastModified": 1759735786, + "narHash": "sha256-a0+h02lyP2KwSNrZz4wLJTu9ikujNsTWIC874Bv7IJ0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "56c7c4a3f5fdbef5bf81c7d9c28fbb45dc626611", + "rev": "20c4598c84a671783f741e02bf05cbfaf4907cff", "type": "github" }, "original": { - "id": "nixpkgs", - "ref": "nixpkgs-unstable", - "type": "indirect" + "owner": "NixOS", + "ref": "nixos-25.05", + "repo": "nixpkgs", + "type": "github" } }, "nixpkgs_2": { diff --git a/flake.nix b/flake.nix index 3fd24e2..a2fcff6 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs"; systems.url = "github:nix-systems/default-linux"; - esp-idf.url = "github:mirrexagon/nixpkgs-esp-dev?rev=6c34f2436015eb6c107970d9b88f3d5d4600c6fa"; + esp-idf.url = "github:mirrexagon/nixpkgs-esp-dev"; }; outputs = { nixpkgs, systems, esp-idf, ... }: let @@ -14,17 +14,17 @@ }); in { devShells = eachSystem(system: let - inherit (esp-idf.packages.${system}) esp-idf-esp32; + inherit (esp-idf.packages.${system}) esp-idf-full; pkgs = pkgsFor.${system}; in { default = pkgs.mkShell { inputsFrom = [ # for building and flashing the sketch - esp-idf-esp32 + esp-idf-full ]; packages = [ - esp-idf-esp32 + esp-idf-full # for the `fontconvert.py` script of epdiy (pkgs.python3.withPackages(ps: [ps.freetype-py])) From 36bc2d59c35e3a494d6fed279ec3ea6fb0b027ea Mon Sep 17 00:00:00 2001 From: arne Date: Tue, 7 Oct 2025 22:47:19 +0200 Subject: [PATCH 2/2] add macOS support to dev environment --- flake.lock | 10 +++++----- flake.nix | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index d4de143..b01f9fb 100644 --- a/flake.lock +++ b/flake.lock @@ -92,16 +92,16 @@ }, "systems_2": { "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default-linux", + "repo": "default", "type": "github" } } diff --git a/flake.nix b/flake.nix index a2fcff6..8f2ba5a 100644 --- a/flake.nix +++ b/flake.nix @@ -1,7 +1,7 @@ { inputs = { nixpkgs.url = "github:NixOS/nixpkgs"; - systems.url = "github:nix-systems/default-linux"; + systems.url = "github:nix-systems/default"; esp-idf.url = "github:mirrexagon/nixpkgs-esp-dev"; };