diff --git a/examples/flake.lock b/examples/flake.lock index 91f91af..4b33a25 100644 --- a/examples/flake.lock +++ b/examples/flake.lock @@ -1,27 +1,5 @@ { "nodes": { - "fenix": { - "inputs": { - "nixpkgs": [ - "floresta-nix", - "nixpkgs" - ], - "rust-analyzer-src": "rust-analyzer-src" - }, - "locked": { - "lastModified": 1786005881, - "narHash": "sha256-Bj3VKIiwX1daO4vOIyAM507A65J0aaRSctc87kiT7H4=", - "owner": "nix-community", - "repo": "fenix", - "rev": "a7c3ef79859bf024cdc865a0ed8f14a4e3f31099", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "fenix", - "type": "github" - } - }, "flake-compat": { "flake": false, "locked": { @@ -43,11 +21,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1785627969, - "narHash": "sha256-4dtXQk/NMePegK/nWp5NSeuZKLATItOq61lpEvmXqGw=", + "lastModified": 1788450739, + "narHash": "sha256-glZLQlzIn1fXH6PazR2iUmTo7kzzyYSshrWhLS9TqCU=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "427bf4bd9435fdf21321c8cc628c24efc14c0f7a", + "rev": "31729ca8cbdb4fa927b34e5f4353e6a83f39e993", "type": "github" }, "original": { @@ -74,30 +52,12 @@ "type": "github" } }, - "floresta-master": { - "flake": false, - "locked": { - "lastModified": 1786032823, - "narHash": "sha256-XYH0v+4Sefzbadh7qRgIUer2lX7UamH6JoAr8xS3qeA=", - "owner": "jaoleal", - "repo": "FlorestaBA", - "rev": "010fa00ba9cf37fea5bf851d68196653af7703a3", - "type": "github" - }, - "original": { - "owner": "jaoleal", - "ref": "android_patched_bitcoinkernel", - "repo": "FlorestaBA", - "type": "github" - } - }, "floresta-nix": { "inputs": { - "fenix": "fenix", "flake-parts": "flake-parts", - "floresta-master": "floresta-master", "nixpkgs": "nixpkgs", - "pre-commit-hooks": "pre-commit-hooks" + "pre-commit-hooks": "pre-commit-hooks", + "rust-overlay": "rust-overlay" }, "locked": { "path": "../", @@ -111,11 +71,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1785989512, - "narHash": "sha256-HFQhkQcl5D1hUNoen3SGHCSFCt2Bg6uP+HgbrnA3InQ=", + "lastModified": 1790635395, + "narHash": "sha256-bNyvoIyOCu7lzoCpWKWGIsHpTtERUWzqYWFPlN++WTw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "445d861c6d31b4af0c79d8d4be2331f762a361d7", + "rev": "7fc6f2c20af09cdcaf48b92ec3121860139ec668", "type": "github" }, "original": { @@ -127,11 +87,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1785031560, - "narHash": "sha256-OmshNvn2vupOFpYinLUu+1Dnpu4n7Q5N3ggGVNHpkUI=", + "lastModified": 1788057806, + "narHash": "sha256-DTQSMxzDWmT0zhguthvegnVkn7CFqGCv4IHCzk5ZUpM=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "0e79af5e3d4dcfcd676ab5ba3f95d2e3352e078c", + "rev": "596e2e3940e09b2abbeb03f75fa1828c57fcd72c", "type": "github" }, "original": { @@ -142,11 +102,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1782918843, - "narHash": "sha256-ETYnV9U7Sr+A45dohzZdfCZKOss4qrTkO+wgNZNvEc0=", + "lastModified": 1787631388, + "narHash": "sha256-vMiXptXarfSdJb1Gkc+FYVOAibuBRj7qxGa8z68q1Uw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e8273b29fe1390ec8d4603f2477357555291432e", + "rev": "ac6b2166e7a9375683b8e98f860f273222337b16", "type": "github" }, "original": { @@ -158,11 +118,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1785989512, - "narHash": "sha256-HFQhkQcl5D1hUNoen3SGHCSFCt2Bg6uP+HgbrnA3InQ=", + "lastModified": 1790635395, + "narHash": "sha256-bNyvoIyOCu7lzoCpWKWGIsHpTtERUWzqYWFPlN++WTw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "445d861c6d31b4af0c79d8d4be2331f762a361d7", + "rev": "7fc6f2c20af09cdcaf48b92ec3121860139ec668", "type": "github" }, "original": { @@ -178,11 +138,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1784288435, - "narHash": "sha256-ReRHaLgr/uVqdD8afFSn+myXIfpHeOhP0yYe0TJqAA8=", + "lastModified": 1790500375, + "narHash": "sha256-XN3sDtn8TU9hAc9xqZ+SqRB/HHm2wjxM6aSWYLJU+oo=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "43b3c1ab9d40fb1dbb008f451988a91e375825e9", + "rev": "a0e4241b51206fbcbf52fd322eb5f0cd80f153c4", "type": "github" }, "original": { @@ -198,20 +158,24 @@ "nixpkgs": "nixpkgs_3" } }, - "rust-analyzer-src": { - "flake": false, + "rust-overlay": { + "inputs": { + "nixpkgs": [ + "floresta-nix", + "nixpkgs" + ] + }, "locked": { - "lastModified": 1785960076, - "narHash": "sha256-+Xej+akyhjZIFnsEIZLO3c6YNvlnKB3rFMzsprQCyDM=", - "owner": "rust-lang", - "repo": "rust-analyzer", - "rev": "cf3b451f47c01d76989425d1ace3f1cba70f1fdb", + "lastModified": 1790669703, + "narHash": "sha256-PA75DaxgfJSDNr1eDF/l9TDfNxSUAjPRt08fICQWOqc=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "49b6548d31019e8bfe9d4415193ac1df3c48f53a", "type": "github" }, "original": { - "owner": "rust-lang", - "ref": "nightly", - "repo": "rust-analyzer", + "owner": "oxalica", + "repo": "rust-overlay", "type": "github" } }, diff --git a/flake.lock b/flake.lock index 2da0887..1731833 100644 --- a/flake.lock +++ b/flake.lock @@ -36,11 +36,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1785989512, - "narHash": "sha256-HFQhkQcl5D1hUNoen3SGHCSFCt2Bg6uP+HgbrnA3InQ=", + "lastModified": 1790635395, + "narHash": "sha256-bNyvoIyOCu7lzoCpWKWGIsHpTtERUWzqYWFPlN++WTw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "445d861c6d31b4af0c79d8d4be2331f762a361d7", + "rev": "7fc6f2c20af09cdcaf48b92ec3121860139ec668", "type": "github" }, "original": { @@ -87,11 +87,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1790091288, - "narHash": "sha256-2dUuLTiQrf2gUFVLlayDq/hgluitplAMv6Y9bYwQQ+c=", + "lastModified": 1790500375, + "narHash": "sha256-XN3sDtn8TU9hAc9xqZ+SqRB/HHm2wjxM6aSWYLJU+oo=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "0d3997c4d3253505f77c9bcea63904bb575da3c5", + "rev": "a0e4241b51206fbcbf52fd322eb5f0cd80f153c4", "type": "github" }, "original": { @@ -115,11 +115,11 @@ ] }, "locked": { - "lastModified": 1789457514, - "narHash": "sha256-Aggle++fTyAifBy+QBPxjM+obO5iepKW/8MDxQtgGvI=", + "lastModified": 1790669703, + "narHash": "sha256-PA75DaxgfJSDNr1eDF/l9TDfNxSUAjPRt08fICQWOqc=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "89e99bf0778a8f2cd18c9360c3f19c1ee47fc739", + "rev": "49b6548d31019e8bfe9d4415193ac1df3c48f53a", "type": "github" }, "original": {