diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index e2eb353..835fb30 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -20,10 +20,10 @@ jobs: - name: Checkout uses: actions/checkout@v4 - - name: Install Rust beta + - name: Install Rust run: | - rustup update --no-self-update beta - rustup default beta + rustup update --no-self-update stable + rustup default stable - name: Cache dependencies uses: Swatinem/rust-cache@v2 diff --git a/flake.lock b/flake.lock index 39a75e8..e2c5ef6 100644 --- a/flake.lock +++ b/flake.lock @@ -22,11 +22,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1726937504, - "narHash": "sha256-bvGoiQBvponpZh8ClUcmJ6QnsNKw0EMrCQJARK3bI1c=", + "lastModified": 1728888510, + "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9357f4f23713673f310988025d9dc261c20e70c6", + "rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c", "type": "github" }, "original": { @@ -50,11 +50,11 @@ ] }, "locked": { - "lastModified": 1727144949, - "narHash": "sha256-uMZMjoCS2nf40TAE1686SJl3OXWfdfM+BDEfRdr+uLc=", + "lastModified": 1729218602, + "narHash": "sha256-KDmYxpkFWa0Go0WnOpkgQOypVaQxbwgpEutET5ey1VQ=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "2e19799819104b46019d339e78d21c14372d3666", + "rev": "9051466c82b9b3a6ba9e06be99621ad25423ec94", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 0058d3e..cfd8be6 100644 --- a/flake.nix +++ b/flake.nix @@ -105,6 +105,10 @@ rec { env.RUST_LOG = "blahd=debug,blahctl=debug"; }; + + without-rust = self.devShells.${system}.default.overrideAttrs (old: { + nativeBuildInputs = lib.filter (drv: drv.pname != "rust-default") old.nativeBuildInputs; + }); } ); diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 0cd810a..cc2914a 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,8 +1,4 @@ -# WAIT: Rust 1.82 release on 2024-10-17 -# Used features: -# - min_exhaustive_patterns: https://github.com/rust-lang/rust/issues/119612 -# - precise_capturing: https://github.com/rust-lang/rust/issues/123432 [toolchain] -channel = "beta-2024-09-10" # 1.82.0-beta.3 +channel = "1.82" profile = "default" components = ["llvm-tools"]