From fd4ce6522a9001240a1326ed0358c75b974f5990 Mon Sep 17 00:00:00 2001 From: Samuel McBroom Date: Mon, 26 Jan 2026 06:57:05 -0800 Subject: [PATCH] Update versions. --- .github/actions/setup-nix/action.yml | 4 +- flake.lock | 91 ++++++++++++++++++++-------- flake.nix | 8 +-- 3 files changed, 72 insertions(+), 31 deletions(-) diff --git a/.github/actions/setup-nix/action.yml b/.github/actions/setup-nix/action.yml index 9836dc3..bb0a10e 100644 --- a/.github/actions/setup-nix/action.yml +++ b/.github/actions/setup-nix/action.yml @@ -3,9 +3,9 @@ description: Installs a specified version of nix runs: using: composite steps: - - uses: nixbuild/nix-quick-install-action@63ca48f939ee3b8d835f4126562537df0fee5b91 # v30 + - uses: nixbuild/nix-quick-install-action@2c9db80fb984ceb1bcaa77cdda3fdf8cfba92035 # v34 with: - nix_version: 2.29.1 + nix_version: 2.31.2 - uses: nix-community/cache-nix-action@135667ec418502fa5a3598af6fb9eb733888ce6a # v6.1.3 with: primary-key: nix-${{ runner.os }}-${{ hashFiles('**/*.nix', '**/flake.lock') }} diff --git a/flake.lock b/flake.lock index bfee37e..f1fd21d 100644 --- a/flake.lock +++ b/flake.lock @@ -67,18 +67,41 @@ "rust-analyzer-src": "rust-analyzer-src_2" }, "locked": { - "lastModified": 1759301100, - "narHash": "sha256-hmiTEoVAqLnn80UkreCNunnRKPucKvcg5T4/CELEtbw=", - "rev": "0956bc5d1df2ea800010172c6bc4470d9a22cb81", - "revCount": 2408, + "lastModified": 1767250179, + "narHash": "sha256-PnQdWvPZqHp+7yaHWDFX3NYSKaOy0fjkwpR+rIQC7AY=", + "rev": "a3eaf682db8800962943a77ab77c0aae966f9825", + "revCount": 2511, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/nix-community/fenix/0.1.2408%2Brev-0956bc5d1df2ea800010172c6bc4470d9a22cb81/01999edc-854f-7714-9439-7c9ee1181398/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/nix-community/fenix/0.1.2511%2Brev-a3eaf682db8800962943a77ab77c0aae966f9825/019b78a8-f9ad-7faf-9a11-350b6ae3fcd9/source.tar.gz" }, "original": { "type": "tarball", "url": "https://flakehub.com/f/nix-community/fenix/0" } }, + "fenix_3": { + "inputs": { + "nixpkgs": [ + "flake-checker", + "naersk", + "nixpkgs" + ], + "rust-analyzer-src": "rust-analyzer-src_3" + }, + "locked": { + "lastModified": 1752475459, + "narHash": "sha256-z6QEu4ZFuHiqdOPbYss4/Q8B0BFhacR8ts6jO/F/aOU=", + "owner": "nix-community", + "repo": "fenix", + "rev": "bf0d6f70f4c9a9cf8845f992105652173f4b617f", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "fenix", + "type": "github" + } + }, "flake-checker": { "inputs": { "easy-template": "easy-template", @@ -89,17 +112,17 @@ ] }, "locked": { - "lastModified": 1764610770, - "narHash": "sha256-/hwcRsaVdLvjKnCjFzy4T/zdvWjWAMBtfgJX/cNpmOc=", + "lastModified": 1767628555, + "narHash": "sha256-0ftHzqFpFkKZKByWJ49/YySrXBU4lCxvcpbTuMY8ZXs=", "owner": "DeterminateSystems", "repo": "flake-checker", - "rev": "9eecc66959dde5efc621cd7063538971177d303c", + "rev": "1d9e9f37224ff2904b7dbca5cad576725ee814e5", "type": "github" }, "original": { "owner": "DeterminateSystems", "repo": "flake-checker", - "rev": "9eecc66959dde5efc621cd7063538971177d303c", + "rev": "1d9e9f37224ff2904b7dbca5cad576725ee814e5", "type": "github" } }, @@ -108,34 +131,35 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1765835352, - "narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=", + "lastModified": 1768135262, + "narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "a34fae9c08a15ad73f295041fec82323541400a9", + "rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac", "type": "github" }, "original": { "owner": "hercules-ci", "repo": "flake-parts", - "rev": "a34fae9c08a15ad73f295041fec82323541400a9", + "rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac", "type": "github" } }, "naersk": { "inputs": { + "fenix": "fenix_3", "nixpkgs": [ "flake-checker", "nixpkgs" ] }, "locked": { - "lastModified": 1752491160, - "narHash": "sha256-2a6LNUE0QW8AszyHduvwOriis2Me/nFhr5jf/aKsUXs=", - "rev": "b11bd3e2d433f5bfb1c4f06128edcfc7adfaaa22", - "revCount": 366, + "lastModified": 1763384566, + "narHash": "sha256-r+wgI+WvNaSdxQmqaM58lVNvJYJ16zoq+tKN20cLst4=", + "rev": "d4155d6ebb70fbe2314959842f744aa7cabbbf6a", + "revCount": 381, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/nix-community/naersk/0.1.366%2Brev-b11bd3e2d433f5bfb1c4f06128edcfc7adfaaa22/01980a05-638f-7c5c-b035-d017e3e3b4e0/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/nix-community/naersk/0.1.381%2Brev-d4155d6ebb70fbe2314959842f744aa7cabbbf6a/019b3a44-9ce1-7d8e-9d0c-f07a28444fd1/source.tar.gz" }, "original": { "type": "tarball", @@ -144,17 +168,17 @@ }, "nixpkgs": { "locked": { - "lastModified": 1766252174, - "narHash": "sha256-GdBSKpWHQXHY38cEPL5kzpL9hjFFPfGUXfR1NfAk7Q0=", + "lastModified": 1769438365, + "narHash": "sha256-Mb/zNg3dhilyYd3Ool9d5Yvs5Nm77rkGrZe+YPtLKy0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3e2dc72078e0299abcc0af8d4cba5b7c64be6f7c", + "rev": "a425ddc3158912fd0bc7bf650d5b752df0087566", "type": "github" }, "original": { "owner": "NixOS", "repo": "nixpkgs", - "rev": "3e2dc72078e0299abcc0af8d4cba5b7c64be6f7c", + "rev": "a425ddc3158912fd0bc7bf650d5b752df0087566", "type": "github" } }, @@ -200,11 +224,28 @@ "rust-analyzer-src_2": { "flake": false, "locked": { - "lastModified": 1759245522, - "narHash": "sha256-H4Hx/EuMJ9qi1WzPV4UG2bbZiDCdREtrtDvYcHr0kmk=", + "lastModified": 1767191410, + "narHash": "sha256-cCZGjubgDWmstvFkS6eAw2qk2ihgWkycw55u2dtLd70=", + "owner": "rust-lang", + "repo": "rust-analyzer", + "rev": "a9026e6d5068172bf5a0d52a260bb290961d1cb4", + "type": "github" + }, + "original": { + "owner": "rust-lang", + "ref": "nightly", + "repo": "rust-analyzer", + "type": "github" + } + }, + "rust-analyzer-src_3": { + "flake": false, + "locked": { + "lastModified": 1752428706, + "narHash": "sha256-EJcdxw3aXfP8Ex1Nm3s0awyH9egQvB2Gu+QEnJn2Sfg=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "a6bc4a4bbe6a65b71cbf76a0cf528c47a8d9f97f", + "rev": "591e3b7624be97e4443ea7b5542c191311aa141d", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 447c19c..758e6f1 100644 --- a/flake.nix +++ b/flake.nix @@ -4,12 +4,12 @@ inputs = { # Commit does not correspond to a tag. # Updating to latest commit generally follows unstable branch. - nixpkgs.url = "github:NixOS/nixpkgs/3e2dc72078e0299abcc0af8d4cba5b7c64be6f7c"; + nixpkgs.url = "github:NixOS/nixpkgs/a425ddc3158912fd0bc7bf650d5b752df0087566"; # Commit does not correspond to a tag. - flake-parts.url = "github:hercules-ci/flake-parts/a34fae9c08a15ad73f295041fec82323541400a9"; + flake-parts.url = "github:hercules-ci/flake-parts/80daad04eddbbf5a4d883996a73f3f542fa437ac"; flake-checker = { - # Commit corresponds to tag v0.2.10. - url = "github:DeterminateSystems/flake-checker/9eecc66959dde5efc621cd7063538971177d303c"; + # Commit corresponds to tag v0.2.11. + url = "github:DeterminateSystems/flake-checker/1d9e9f37224ff2904b7dbca5cad576725ee814e5"; inputs.nixpkgs.follows = "nixpkgs"; }; };