From 1aed1437b9426c512a0816b35446b7c23c9439ed Mon Sep 17 00:00:00 2001 From: "Travis A. Everett" Date: Fri, 20 Dec 2024 11:42:45 -0600 Subject: [PATCH] track comments & fenix update from matthew's PR --- flake.lock | 14 +++++++------- flake.nix | 6 +++++- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/flake.lock b/flake.lock index af7a28f1d..b2e2c2e8f 100644 --- a/flake.lock +++ b/flake.lock @@ -8,17 +8,17 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1714544767, - "narHash": "sha256-kF1bX+YFMedf1g0PAJYwGUkzh22JmULtj8Rm4IXAQKs=", + "lastModified": 1727764514, + "narHash": "sha256-tvN9v5gTxLI5zOKsNvYl1aUxIitHm8Nj3vKdXNfJo50=", "owner": "nix-community", "repo": "fenix", - "rev": "73124e1356bde9411b163d636b39fe4804b7ca45", + "rev": "a9d2e5fa8d77af05240230c9569bbbddd28ccfaf", "type": "github" }, "original": { "owner": "nix-community", "repo": "fenix", - "rev": "73124e1356bde9411b163d636b39fe4804b7ca45", + "rev": "a9d2e5fa8d77af05240230c9569bbbddd28ccfaf", "type": "github" } }, @@ -244,11 +244,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1714501997, - "narHash": "sha256-g31zfxwUFzkPgX0Q8sZLcrqGmOxwjEZ/iqJjNx4fEGo=", + "lastModified": 1727706011, + "narHash": "sha256-xxgUHwwJ+1xQQoUWvLDo807IZ0MDldkfr9N1G4fvNJU=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "49e502b277a8126a9ad10c802d1aaa3ef1a280ef", + "rev": "28830ff2f1158ee92f4852ef3ec35af0935d1562", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 14c15d2fb..d7638123c 100644 --- a/flake.nix +++ b/flake.nix @@ -2,10 +2,14 @@ description = "Experimental Nix Installer"; inputs = { + # can track upstream versioning with + # git show $most_recently_merged_commit:flake.lock | jq '.nodes[.nodes.root.inputs.nixpkgs].locked.rev' nixpkgs.url = "github:NixOS/nixpkgs/807e9154dcb16384b1b765ebe9cd2bba2ac287fd"; fenix = { - url = "github:nix-community/fenix/73124e1356bde9411b163d636b39fe4804b7ca45"; + # can track upstream versioning with + # git show $most_recently_merged_commit:flake.lock | jq '.nodes[.nodes.root.inputs.fenix].locked.rev' + url = "github:nix-community/fenix/a9d2e5fa8d77af05240230c9569bbbddd28ccfaf"; inputs.nixpkgs.follows = "nixpkgs"; };