Switch to the oxalica overlay for controlling Rust

.gitea/workflows/actions.yaml

@@ -24,16 +24,8 @@ jobs:
     steps:
       - name: Checkout repository code
         uses: actions/checkout@v4
-      - name: Enter the developer environment
-        run: |
-          /run/current-system/sw/bin/nix --extra-experimental-features "nix-command flakes" develop --command bash -c "
-            echo HOME=$HOME
-            ACTUAL_CARGO=$(rustup which cargo)
-            echo ACTUAL_CARGO=$ACTUAL_CARGO
-            ls -la $ACTUAL_CARGO
-            $ACTUAL_CARGO --version
-            task test-all
-          "
+      - name: Run repository tests
+        run: /run/current-system/sw/bin/nix --extra-experimental-features "nix-command flakes" develop --command bash -c "task test-all"
 
   build-flake:
     runs-on: nixos

flake.lock

@@ -37,7 +37,28 @@
     "root": {
       "inputs": {
         "flake-utils": "flake-utils",
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": "nixpkgs",
+        "rust-overlay": "rust-overlay"
+      }
+    },
+    "rust-overlay": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1776568404,
+        "narHash": "sha256-Xng/brVgk+0+ggo/4xnaxb5v4lU82RxPpmFlMHXLGYg=",
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "rev": "e65c31bc66b9194a9fc5b5a9f97ac049523f9438",
+        "type": "github"
+      },
+      "original": {
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "type": "github"
       }
     },
     "systems": {

flake.nix

@@ -4,6 +4,10 @@
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11";
     flake-utils.url = "github:numtide/flake-utils";
+    rust-overlay = {
+      url = "github:oxalica/rust-overlay";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
   outputs =
@@ -11,11 +15,17 @@
       self,
       nixpkgs,
       flake-utils,
+      rust-overlay,
     }:
     flake-utils.lib.eachDefaultSystem (
       system:
       let
-        pkgs = import nixpkgs { inherit system; config.allowUnfree = true; };
+        pkgs = import nixpkgs {
+          inherit system;
+          config.allowUnfree = true;
+          overlays = [ rust-overlay.overlays.default ];
+        };
+        rustToolchain = pkgs.rust-bin.fromRustupToolchainFile ./rust-toolchain;
       in
       {
         devShell = pkgs.mkShell {
@@ -23,6 +33,7 @@
 
 
           buildInputs = with pkgs; [
+            rustToolchain
             clang
             crate2nix
             trunk
@@ -34,18 +45,12 @@
             pkg-config
             sqlite
             go-task
-            rustup
             cargo-llvm-cov
             nixfmt
-            llvmPackages.lld # Add the lld linker
+            llvmPackages.lld
             llvmPackages.llvm
             jq
           ];
-
-          # Install Rust via Rustup
-          shellHook = ''
-            rustup show
-          '';
         };
 
         packages =