Merge pull request #425 from replit/actions/update-weekly

Fenix update

Author: blast-hardcheese

flake.lock

@@ -52,6 +52,7 @@
       };
 
       pkgs = mkPkgs patched-unstable "x86_64-linux";
+      pkgs-aarch64-darwin = mkPkgs patched-unstable "aarch64-darwin";
     in
     {
       overlays.default = final: prev: {
@@ -94,6 +95,7 @@
 
       };
       formatter.x86_64-linux = pkgs.nixpkgs-fmt;
+      formatter.aarch64-darwin = pkgs-aarch64-darwin.nixpkgs-fmt;
       packages.x86_64-linux = import ./pkgs {
         inherit pkgs self;
       };

flake.nix

@@ -4,23 +4,29 @@ let
   rust-channel-name = if fenix-channel-name == "latest" then "nightly" else fenix-channel-name;
   channel = pkgs.fenix."${fenix-channel-name}";
 
-  stripped-toolchain = pkgs.fenix.combine [
+  stripped-toolchain = pkgs.fenix.combine ([
     (channel.withComponents [
       "cargo"
       "llvm-tools"
       "rust-src"
       "rust-std"
       "rustc"
     ])
-    pkgs.fenix.targets.wasm32-wasi.${fenix-channel-name}.rust-std
-    pkgs.fenix.targets.wasm32-unknown-unknown.${fenix-channel-name}.rust-std
-  ];
+  ] ++ (
+    if fenix-channel-name == "nightly" then [
+      pkgs.fenix.targets.wasm32-wasi.${fenix-channel-name}.rust-std
+      pkgs.fenix.targets.wasm32-unknown-unknown.${fenix-channel-name}.rust-std
+    ] else [ ]
+  ));
 
-  toolchain = pkgs.fenix.combine [
+  toolchain = pkgs.fenix.combine ([
     channel.toolchain
-    pkgs.fenix.targets.wasm32-wasi.${fenix-channel-name}.rust-std
-    pkgs.fenix.targets.wasm32-unknown-unknown.${fenix-channel-name}.rust-std
-  ];
+  ] ++ (
+    if fenix-channel-name == "nightly" then [
+      pkgs.fenix.targets.wasm32-wasi.${fenix-channel-name}.rust-std
+      pkgs.fenix.targets.wasm32-unknown-unknown.${fenix-channel-name}.rust-std
+    ] else [ ]
+  ));
 
   # TODO: fenix doesn't give the rustc stable version :(
   displayVersion = if fenix-channel-name == "stable" then "stable" else channel.cargo.version;