override dev tooling

rohan

Oct 25, 2021, 3:27 AM

Q4XPH27LXW4Q343HV3HCBXSHVJ5J7ESBHZHMQKSVTXM2QYKVXVJAC

Dependencies

• [2] LAFA7YMQ switch to oxalica/rust-overlay
• [3] G734WNM6 flake.nix: use crate2nix
• [4] VN6L65VR flake.nix: remove unnecessary build inputs
• [5] ZWPPIJXF flake.nix: use Mozilla overlay for Rust
• [6] WZYPQBYN flake: use crate2nix from Nixpkgs
• [7] SXEYMYF7 Fixing the bad changes in history (unfortunately, by rebooting).
• [8] 2GNO2PLC flake.nix: Use custom derivation for crate2nix

Change contents

• edit in "flake.nix" at line 19
  [3.1024163]

  [3.1024163]
  + forAllSystems = f: genAttrs allSystems (system: f system);
• replacement in "flake.nix" at line 24
  [3.381]→[3.381:391](∅→∅),[3.391]→[3.391:422](∅→∅),[3.422]→[2.205:283](∅→∅),[2.283]→[3.494:506](∅→∅),[3.494]→[3.494:506](∅→∅),[3.506]→[3.1024164:1024246](∅→∅),[3.1024164]→[3.1024164:1024246](∅→∅),[3.1024246]→[3.507:588](∅→∅),[3.588]→[2.284:318](∅→∅),[2.318]→[3.639:687](∅→∅),[3.639]→[3.639:687](∅→∅),[3.687]→[3.1024297:1024307](∅→∅),[3.1024297]→[3.1024297:1024307](∅→∅),[3.621]→[3.1024682:1024773](∅→∅),[3.246235]→[3.1024682:1024773](∅→∅),[3.1024682]→[3.1024682:1024773](∅→∅)
  − {

  − inherit rustChannel;

  − rustc = rustChannel.minimal;

  − cargo = rustChannel.minimal;

  − };

  −

  − forAllSystems = f: genAttrs allSystems (system: f {

  − inherit system;

  − pkgs = import nixpkgs {

  − inherit system;

  − overlays = [

  − (import rust-overlay)

  − rustOverlay

  − ];

  − };

  − });

  − in

  − {

  − devShell = forAllSystems ({ system, pkgs, ... }:

  − pkgs.mkShell {
  [3.381]

  [3.1024773]
  + {

  + inherit rustChannel;

  + rustc = rustChannel.minimal;

  + };

  + in {

  + devShell = forAllSystems (system:

  + let rustDevOverlay = final: prev:

  + {

  + # rust-analyzer needs core source

  + rustc-with-src = prev.rustc.override { extensions = [ "rust-src" ]; };

  + # need the latest rustfmt to match apheleia's behaviour

  + rustfmt = prev.rust-bin.nightly."2021-10-23".rustfmt;

  + };

  + pkgs = import nixpkgs {

  + inherit system;

  + overlays = [

  + (import rust-overlay)

  + rustOverlay

  + rustDevOverlay

  + ];

  + };

  + in pkgs.mkShell {
• replacement in "flake.nix" at line 52
  [3.246462]→[3.1024850:1024887](∅→∅),[3.1024850]→[3.1024850:1024887](∅→∅)
  − buildInputs = with pkgs; [
  [3.246462]

  [3.246463]
  + packages = with pkgs; [
• replacement in "flake.nix" at line 57
  [3.246505]→[2.319:395](∅→∅)
  − (rustChannel.default.override { extensions = [ "rust-src" ]; })
  [3.246505]

  [3.0]
  + # needs to be before rustc-with-src so that we're not using the bundled rustfmt

  + rustfmt

  + rust-analyzer rustc-with-src
• replacement in "flake.nix" at line 67
  [3.1025151]→[3.1025151:1025183](∅→∅)
  − ({ system, pkgs, ... }:
  [3.1025151]

  [3.1025183]
  + (system:
• edit in "flake.nix" at line 69
  [3.1025197]

  [3.246552]
  + pkgs = import nixpkgs {

  + inherit system;

  + overlays = [

  + (import rust-overlay)

  + rustOverlay

  + ];

  + };