From da283cbbcea756a29dad017fc3ddc1e12bc77c50 Mon Sep 17 00:00:00 2001
From: Kornel <kornel@geekhood.net>
Date: Fri, 8 Nov 2024 14:03:35 +0000
Subject: [PATCH] Try less outdated nix

---
 .github/workflows/ci-nix.yml | 6 ++----
 flake.nix                    | 4 +---
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ci-nix.yml b/.github/workflows/ci-nix.yml
index 6277b73a..65052d6e 100644
--- a/.github/workflows/ci-nix.yml
+++ b/.github/workflows/ci-nix.yml
@@ -8,8 +8,6 @@ on:
   # Triggers the workflow on push or pull request events but only for the "main" branch
   push:
     branches: [ "main", "master", "devel" ]
-  pull_request:
-    branches: [ "main", "master", "devel" ]
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
@@ -23,7 +21,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: cachix/install-nix-action@V28
         with:
-          nix_path: nixpkgs=channel:nixos-23.05
+          nix_path: nixpkgs=channel:nixos-unstable
       - uses: cachix/cachix-action@v15
         with:
           name: cargo-crev
@@ -49,7 +47,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: cachix/install-nix-action@V28
         with:
-          nix_path: nixpkgs=channel:nixos-23.05
+          nix_path: nixpkgs=channel:nixos-unstable
       - uses: cachix/cachix-action@v15
         with:
           name: cargo-crev
diff --git a/flake.nix b/flake.nix
index 05255cd1..de08c16f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -24,13 +24,12 @@
         };
         lib = pkgs.lib;
 
-        fenix-channel = fenix.packages.${system}.stable;
+        fenix-channel = fenix.packages.${system}.latest;
 
         fenix-toolchain = (fenix-channel.withComponents [
           "rustc"
           "cargo"
           "clippy"
-          "rust-analysis"
           "rust-src"
           "llvm-tools-preview"
         ]);
@@ -225,7 +224,6 @@
             nativeBuildInputs = commonArgs.nativeBuildInputs ++ (with pkgs;
               [
                 fenix-toolchain
-                fenix.packages.${system}.rust-analyzer
 
                 pkgs.nixpkgs-fmt
                 pkgs.shellcheck