chore: switch to rust-overlay for nix rust

AstarNetwork · Feb 24, 2023 · 52ed5c9 · 52ed5c9
1 parent a78bc28
commit 52ed5c9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/third-party/nix/nixpkgs.nix b/third-party/nix/nixpkgs.nix
@@ -1,7 +1,7 @@
-{ moz_overlay ? import (builtins.fetchTarball https://github.com/mozilla/nixpkgs-mozilla/archive/master.tar.gz)
+{ rust-overlay ? import (builtins.fetchTarball https://github.com/oxalica/rust-overlay/archive/master.tar.gz)
 , nixpkgs ? import (builtins.fetchTarball https://github.com/nixos/nixpkgs-channels/archive/nixos-21.11.tar.gz)
 }:
 
 nixpkgs {
-  overlays = [ moz_overlay ];
+  overlays = [ rust-overlay ];
 }
diff --git a/third-party/nix/release.nix b/third-party/nix/release.nix
@@ -1,13 +1,9 @@
-{ moz_overlay ? import (builtins.fetchTarball https://github.com/mozilla/nixpkgs-mozilla/archive/master.tar.gz)
+{ rust-overlay ? import (builtins.fetchTarball https://github.com/oxalica/rust-overlay/archive/master.tar.gz)
 }:
 
 let
-  pkgs = import <nixpkgs> { overlays = [ moz_overlay ]; };
-  channel = pkgs.rustChannelOf { date = "2023-01-10"; channel = "nightly"; };
+  pkgs = import <nixpkgs> { overlays = [ rust-overlay ]; };
 in {
   inherit pkgs;
-  rust-nightly = channel.rust.override {
-    targets = [ "wasm32-unknown-unknown" ];
-    extensions = [ "rustfmt-preview" ];
-  };
+  rust-nightly = pkgs.rust-bin.fromRustupToolchainFile ../../rust-toolchain.toml;
 }