From 5d24f847e5933cb3fe920ac4487a0920a8fc63f8 Mon Sep 17 00:00:00 2001 From: James Carl Date: Sun, 1 Mar 2026 20:02:52 -0500 Subject: [PATCH] Get back on the main branch of fenix --- flake.lock | 13 ++++++------- flake.nix | 4 +--- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/flake.lock b/flake.lock index 2102e2d..afb87eb 100644 --- a/flake.lock +++ b/flake.lock @@ -23,16 +23,15 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1771385326, - "narHash": "sha256-SI3IR8gdoIL21Ur7yfLY1Wd7MC48iqsthY0Adxzb/Bg=", + "lastModified": 1772348640, + "narHash": "sha256-caiKs7O4khFydpKyg8O8/nmvw/NfN4fn/4spageGoig=", "owner": "nix-community", "repo": "fenix", - "rev": "6ef197384c418654c34d2819d06a80f660881486", + "rev": "47c5355eaba0b08836e720d5d545c8ea1e1783db", "type": "github" }, "original": { "owner": "nix-community", - "ref": "eureka-cpu/rust-analyzer-wrapped", "repo": "fenix", "type": "github" } @@ -82,11 +81,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1771264911, - "narHash": "sha256-vDNZ6Y1M3DSa1JbPGgqtdJPl4rMzxebUK9hmZcopxX0=", + "lastModified": 1772310333, + "narHash": "sha256-njFwHnxYcfQINwSa+XWhenv8s8PMg/j5ID0HpIa49xM=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "3360aebb35a099ff4a7bbd37e9a0dd44b8f23748", + "rev": "a96b6a9b887008bae01839543f9ca8e1f67f4ebe", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 19440cd..76e6cd2 100644 --- a/flake.nix +++ b/flake.nix @@ -6,8 +6,7 @@ flake-utils.url = "github:numtide/flake-utils"; crane.url = "github:ipetkov/crane"; fenix = { - # url = "github:nix-community/fenix"; - url = "github:nix-community/fenix?ref=eureka-cpu/rust-analyzer-wrapped"; + url = "github:nix-community/fenix"; inputs.nixpkgs.follows = "nixpkgs"; }; }; @@ -56,7 +55,6 @@ }; devShells.default = with pkgs; pkgs.mkShell { - inputsFrom = [ packages.default ]; buildInputs = [ bashInteractive nodejs_24