switch to oxalica/rust-overlay

rohan

Oct 23, 2021, 2:27 AM

LAFA7YMQZM2FX5NMTAJDZZ3OGOJM7QJVSETRX5ZO5ROWF22OZHWQC

Dependencies

• [2] OC3QJUVK Update to rust 1.54. Needed by clap.
• [3] GHO6DWPI Refactoring iterators
• [4] ZWPPIJXF flake.nix: use Mozilla overlay for Rust
• [5] IXGIROWK flake.nix: add rust-src to devShell
• [6] WZYPQBYN flake: use crate2nix from Nixpkgs
• [7] LNZVL2QQ update build tools
• [8] VN6L65VR flake.nix: remove unnecessary build inputs
• [9] 7O3EMT3V Fix rustChannelOf usage (the argument is sha256, not hash) to fix pure evaluation
• [10] SXEYMYF7 Fixing the bad changes in history (unfortunately, by rebooting).
• [11] G734WNM6 flake.nix: use crate2nix

Change contents

• replacement in "flake.nix" at line 4
  [3.1023829]→[3.0:59](∅→∅),[3.59]→[3.0:79](∅→∅),[3.246088]→[3.0:79](∅→∅)
  − inputs.nixpkgs.url = "github:nixos/nixpkgs/nixos-21.05";

  − inputs.mozilla = { url = "github:mozilla/nixpkgs-mozilla"; flake = false; };
  [3.1023829]

  [3.1023891]
  + inputs = {

  + nixpkgs.url = "github:nixos/nixpkgs/nixos-21.05";

  + rust-overlay.url = "github:oxalica/rust-overlay";

  + };
• replacement in "flake.nix" at line 12
  [3.117]→[3.117:131](∅→∅)
  − , mozilla
  [3.117]

  [3.131]
  + , rust-overlay
• replacement in "flake.nix" at line 21
  [3.191]→[3.191:248](∅→∅),[3.248]→[2.0:108](∅→∅),[3.76]→[3.357:370](∅→∅),[2.108]→[3.357:370](∅→∅),[3.168]→[3.357:370](∅→∅),[3.67749]→[3.357:370](∅→∅),[3.357]→[3.357:370](∅→∅)
  − let

  − rustChannel = prev.rustChannelOf {

  − channel = "1.54.0";

  − sha256 = "sha256-2NfCJiH3wk7sR1XlRf8+IZfY3S9sYKdL8TpMqk82Bq0=";

  − };
  [3.191]

  [3.370]
  + let rustChannel = prev.rust-bin.stable."1.54.0";
• replacement in "flake.nix" at line 25
  [3.422]→[3.422:494](∅→∅)
  − rustc = rustChannel.rust;

  − cargo = rustChannel.rust;
  [3.422]

  [3.494]
  + rustc = rustChannel.minimal;

  + cargo = rustChannel.minimal;
• replacement in "flake.nix" at line 34
  [3.588]→[3.588:639](∅→∅)
  − (import "${mozilla}/rust-overlay.nix")
  [3.588]

  [3.639]
  + (import rust-overlay)
• replacement in "flake.nix" at line 54
  [3.246505]→[3.688:809](∅→∅),[3.809]→[3.0:73](∅→∅)
  − # rustChannel.rust provides tools like clippy, rustfmt, cargo,

  − # rust-analyzer, rustc, and more.

  − (rustChannel.rust.override { extensions = [ "rust-src" ]; })
  [3.246505]

  [3.0]
  + (rustChannel.default.override { extensions = [ "rust-src" ]; })
• replacement in "flake.lock" at line 3
  [3.248048]→[3.839:878](∅→∅)
  − "mozilla": {

  − "flake": false,
  [3.1026253]

  [3.878]
  + "flake-utils": {
• replacement in "flake.lock" at line 5
  [3.896]→[3.169:279](∅→∅),[3.279]→[3.1006:1069](∅→∅),[3.1006]→[3.1006:1069](∅→∅),[3.1069]→[3.280:339](∅→∅)
  − "lastModified": 1627552629,

  − "narHash": "sha256-OWA7Z2WL2JvDTZVN/jFIjCZRp/jFyqjb0l982o186eE=",

  − "owner": "mozilla",

  − "repo": "nixpkgs-mozilla",

  − "rev": "4a07484cf0e49047f82d83fd119acffbad3b235f",
  [3.896]

  [3.1128]
  + "lastModified": 1623875721,

  + "narHash": "sha256-A8BU7bjS5GirpAUv4QA+QnJ4CceLHkcXdRp4xITDB0s=",

  + "owner": "numtide",

  + "repo": "flake-utils",

  + "rev": "f7e004a55b120c02ecb6219596820fcd32ca8772",
• replacement in "flake.lock" at line 13
  [3.1182]→[3.1182:1245](∅→∅)
  − "owner": "mozilla",

  − "repo": "nixpkgs-mozilla",
  [3.1182]

  [3.1245]
  + "owner": "numtide",

  + "repo": "flake-utils",
• edit in "flake.lock" at line 34
  [3.1026690]

  [3.1026690]
  + "nixpkgs_2": {

  + "locked": {

  + "lastModified": 1628186154,

  + "narHash": "sha256-r2d0wvywFnL9z4iptztdFMhaUIAaGzrSs7kSok0PgmE=",

  + "owner": "NixOS",

  + "repo": "nixpkgs",

  + "rev": "06552b72346632b6943c8032e57e702ea12413bf",

  + "type": "github"

  + },

  + "original": {

  + "owner": "NixOS",

  + "repo": "nixpkgs",

  + "type": "github"

  + }

  + },
• edit in "flake.lock" at line 50
  [3.1026704]

  [3.1026704]
  + "inputs": {

  + "nixpkgs": "nixpkgs",

  + "rust-overlay": "rust-overlay"

  + }

  + },

  + "rust-overlay": {
• replacement in "flake.lock" at line 57
  [3.248285]→[3.1286:1316](∅→∅),[3.1316]→[3.1026722:1026751](∅→∅),[3.248285]→[3.1026722:1026751](∅→∅),[3.1026722]→[3.1026722:1026751](∅→∅)
  − "mozilla": "mozilla",

  − "nixpkgs": "nixpkgs"
  [3.1026722]

  [3.1026751]
  + "flake-utils": "flake-utils",

  + "nixpkgs": "nixpkgs_2"

  + },

  + "locked": {

  + "lastModified": 1635041777,

  + "narHash": "sha256-36LeviqJlWikocBObavRcaFnAQDdbr1Yaze2y7t0Ie0=",

  + "owner": "oxalica",

  + "repo": "rust-overlay",

  + "rev": "21ec729445fbf58ac59061c2694063799e9ee1aa",

  + "type": "github"

  + },

  + "original": {

  + "owner": "oxalica",

  + "repo": "rust-overlay",

  + "type": "github"