From da9b000e6aff7d1e6823c3184bc997d3243aa9b0 Mon Sep 17 00:00:00 2001 From: macronova Date: Sat, 26 Jul 2025 18:39:30 -0500 Subject: [PATCH] Update flake --- .envrc | 1 + flake.lock | 158 +++++++++++++++++++++++++---------------------------- flake.nix | 3 +- 3 files changed, 77 insertions(+), 85 deletions(-) diff --git a/.envrc b/.envrc index 820888e..52b5cdf 100644 --- a/.envrc +++ b/.envrc @@ -1,2 +1,3 @@ +dotenv export CARGO_HOME=$(pwd)/.cargo use flake . --no-pure-eval diff --git a/flake.lock b/flake.lock index c852b2a..5d91cb2 100644 --- a/flake.lock +++ b/flake.lock @@ -38,14 +38,14 @@ "flake-compat": "flake-compat", "git-hooks": "git-hooks", "nix": "nix", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1751047748, - "narHash": "sha256-KaS77WfbcLkLdqzeWP7GMgU5LltjOyjVxSzRhZbxPCc=", + "lastModified": 1757257819, + "narHash": "sha256-YJMXP05JX2eS5sCy+/vfOP+52AEawTOYyWorW98f+bA=", "owner": "cachix", "repo": "devenv", - "rev": "0350732a6725a550e4d2d69070774480dce86620", + "rev": "21d0c09bb318e14c9596344c57273bd457b76f53", "type": "github" }, "original": { @@ -57,14 +57,14 @@ "espkgs": { "inputs": { "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1746690306, - "narHash": "sha256-bMp4BCrTOX7VDLVU8TzMSQj1hviBrARz9iiqNq6Vbnk=", + "lastModified": 1755587617, + "narHash": "sha256-l7Fd30IhWnSfbXYETAPA9tl7PjMgadnrAM70DltxbEI=", "owner": "mirrexagon", "repo": "nixpkgs-esp-dev", - "rev": "6c34f2436015eb6c107970d9b88f3d5d4600c6fa", + "rev": "52a23afb15a1643a3dbeeb963097945a3f35b0fb", "type": "github" }, "original": { @@ -75,15 +75,15 @@ }, "fenix": { "inputs": { - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_3", "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1751092526, - "narHash": "sha256-vmbu97JXqr9/sTWR5XRh646jkp8a0J9m0o6JIQTdjE4=", + "lastModified": 1757313768, + "narHash": "sha256-HWd3/TgXubNWsGB9EgDocxSy2VR7k1kh97c3eAw/GDw=", "owner": "nix-community", "repo": "fenix", - "rev": "6643d56d9a78afa157b577862c220298c09b891d", + "rev": "7a988bb002e235030492c94666f46737d583fad1", "type": "github" }, "original": { @@ -111,11 +111,11 @@ "flake-compat_2": { "flake": false, "locked": { - "lastModified": 1733328505, - "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", + "lastModified": 1747046372, + "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", "owner": "edolstra", "repo": "flake-compat", - "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", + "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", "type": "github" }, "original": { @@ -151,11 +151,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -195,10 +195,11 @@ ] }, "locked": { - "lastModified": 1749636823, + "lastModified": 1750779888, + "narHash": "sha256-wibppH3g/E2lxU43ZQHC5yA/7kIKLGxVEnsnVK1BtRg=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "623c56286de5a3193aa38891a6991b28f9bab056", + "rev": "16ec914f6fb6f599ce988427d9d94efddf25fe6d", "type": "github" }, "original": { @@ -217,6 +218,7 @@ }, "locked": { "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", "owner": "hercules-ci", "repo": "gitignore.nix", "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", @@ -239,7 +241,10 @@ "devenv", "git-hooks" ], - "nixpkgs": "nixpkgs", + "nixpkgs": [ + "devenv", + "nixpkgs" + ], "nixpkgs-23-11": [ "devenv" ], @@ -248,11 +253,11 @@ ] }, "locked": { - "lastModified": 1750955511, - "narHash": "sha256-IDB/oh/P63ZTdhgSkey2LZHzeNhCdoKk+4j7AaPe1SE=", + "lastModified": 1755029779, + "narHash": "sha256-3+GHIYGg4U9XKUN4rg473frIVNn8YD06bjwxKS1IPrU=", "owner": "cachix", "repo": "nix", - "rev": "afa41b08df4f67b8d77a8034b037ac28c71c77df", + "rev": "b0972b0eee6726081d10b1199f54de6d2917f861", "type": "github" }, "original": { @@ -264,31 +269,31 @@ }, "nixpkgs": { "locked": { - "lastModified": 1747179050, - "narHash": "sha256-qhFMmDkeJX9KJwr5H32f1r7Prs7XbQWtO0h3V0a0rFY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "adaa24fbf46737f3f1b5497bf64bae750f82942e", + "lastModified": 1750441195, + "narHash": "sha256-yke+pm+MdgRb6c0dPt8MgDhv7fcBbdjmv1ZceNTyzKg=", + "owner": "cachix", + "repo": "devenv-nixpkgs", + "rev": "0ceffe312871b443929ff3006960d29b120dc627", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", + "owner": "cachix", + "ref": "rolling", + "repo": "devenv-nixpkgs", "type": "github" } }, "nixpkgs-python": { "inputs": { "flake-compat": "flake-compat_2", - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1749760516, - "narHash": "sha256-koLwnVjVrR4yS2ea1owMj6ps2sOhH67ObTIld9H27Yo=", + "lastModified": 1755249745, + "narHash": "sha256-lDIbUfJ8xK62ekG+qojTlA1raHpKdScBTx8IFlQYx9U=", "owner": "cachix", "repo": "nixpkgs-python", - "rev": "908dbb466af5955ea479ac95953333fd64387216", + "rev": "b6632af2db9f47c79dac8f4466388c7b1b6c3071", "type": "github" }, "original": { @@ -299,46 +304,47 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1746807397, - "narHash": "sha256-zU2z0jlkJGWLhdNr/8AJSxqK8XD0IlQgHp3VZcP56Aw=", - "owner": "cachix", - "repo": "devenv-nixpkgs", - "rev": "c5208b594838ea8e6cca5997fbf784b7cca1ca90", + "lastModified": 1753749649, + "narHash": "sha256-+jkEZxs7bfOKfBIk430K+tK9IvXlwzqQQnppC2ZKFj4=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "1f08a4df998e21f4e8be8fb6fbf61d11a1a5076a", "type": "github" }, "original": { - "owner": "cachix", - "ref": "rolling", - "repo": "devenv-nixpkgs", + "owner": "NixOS", + "ref": "nixos-25.05", + "repo": "nixpkgs", "type": "github" } }, "nixpkgs_3": { "locked": { - "lastModified": 1729501122, - "narHash": "sha256-tScdcYQ37kMqlyqb5yizNDTKXZASLB4zHitlHwOg+/o=", - "owner": "NixOS", + "lastModified": 1757068644, + "narHash": "sha256-NOrUtIhTkIIumj1E/Rsv1J37Yi3xGStISEo8tZm3KW4=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "56c7c4a3f5fdbef5bf81c7d9c28fbb45dc626611", + "rev": "8eb28adfa3dc4de28e792e3bf49fcf9007ca8ac9", "type": "github" }, "original": { - "id": "nixpkgs", - "ref": "nixpkgs-unstable", - "type": "indirect" + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" } }, "nixpkgs_4": { "locked": { - "lastModified": 1750776420, - "narHash": "sha256-/CG+w0o0oJ5itVklOoLbdn2dGB0wbZVOoDm4np6w09A=", - "owner": "nixos", + "lastModified": 1757068644, + "narHash": "sha256-NOrUtIhTkIIumj1E/Rsv1J37Yi3xGStISEo8tZm3KW4=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "30a61f056ac492e3b7cdcb69c1e6abdcf00e39cf", + "rev": "8eb28adfa3dc4de28e792e3bf49fcf9007ca8ac9", "type": "github" }, "original": { - "owner": "nixos", + "owner": "NixOS", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" @@ -346,37 +352,21 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1751011381, - "narHash": "sha256-krGXKxvkBhnrSC/kGBmg5MyupUUT5R6IBCLEzx9jhMM=", + "lastModified": 1753345091, + "narHash": "sha256-CdX2Rtvp5I8HGu9swBmYuq+ILwRxpXdJwlpg8jvN4tU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "30e2e2857ba47844aa71991daa6ed1fc678bcbb7", + "rev": "3ff0e34b1383648053bba8ed03f201d3466f90c9", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixos-25.05", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_6": { - "locked": { - "lastModified": 1743367904, - "narHash": "sha256-sOos1jZGKmT6xxPvxGQyPTApOunXvScV4lNjBCXd/CI=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "7ffe0edc685f14b8c635e3d6591b0bbb97365e6c", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_7": { "locked": { "lastModified": 1744536153, "narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=", @@ -398,7 +388,7 @@ "espkgs": "espkgs", "fenix": "fenix", "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_4", "nixpkgs-python": "nixpkgs-python", "rust-overlay": "rust-overlay" } @@ -406,11 +396,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1750871759, - "narHash": "sha256-hMNZXMtlhfjQdu1F4Fa/UFiMoXdZag4cider2R9a648=", + "lastModified": 1757042294, + "narHash": "sha256-JMLa0ZsbEd3+3E0/PQj/igVi9+pb98TgxaOEEw+t1bo=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "317542c1e4a3ec3467d21d1c25f6a43b80d83e7d", + "rev": "a53b44412d4643cdec41005129735b38737eb296", "type": "github" }, "original": { @@ -422,14 +412,14 @@ }, "rust-overlay": { "inputs": { - "nixpkgs": "nixpkgs_7" + "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1751078221, - "narHash": "sha256-/SRmXIPxL7ixFLZgcDdgZDuIwt8eWQAamMYer0ODwbM=", + "lastModified": 1757298987, + "narHash": "sha256-yuFSw6fpfjPtVMmym51ozHYpJQ7SzVOTkk7tUv2JA0U=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "1712a6d3430ca75353d366b7ddd1c79d6b243efc", + "rev": "cfd63776bde44438ff2936f0c9194c79dd407a5f", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index aef9e3f..65cd1fb 100644 --- a/flake.nix +++ b/flake.nix @@ -60,8 +60,9 @@ }; packages = with pkgs; [ espflash - espPkgs.esp-idf-esp32c6 + espPkgs.esp-idf-full ldproxy + opencode sops ]; }