Solving a conflict

pmeunier

Dec 27, 2023, 9:33 AM

O2CDACIIEOLVVBQPBFT5U5DYQXLSLPUD4VB5QQBNJTUMFDDKHS2AC

Dependencies

• [2] JVBQMAFU Solving a conflict
• [3] Q4XPH27L override dev tooling
• [4] POBHKKNG Use nixpkgs builtin Rust build tools This fixes the broken flake packages and prevents having to manually update any sort of Nix-specific lock file, which should make it less prone to breaking in the future.
• [5] SXEYMYF7 Fixing the bad changes in history (unfortunately, by rebooting).
• [6] G734WNM6 flake.nix: use crate2nix
• [7] HYENMEQW Add nix aarch64-darwin support for Apple Silicon macs
• [8] ZWPPIJXF flake.nix: use Mozilla overlay for Rust
• [9] MUYNSHG2 update Nix build for Rust 2021 edition requirement
• [10] BFQYATIR Add nix aarch64-darwin support for Apple Silicon macs
• [11] SH2ZBSAZ Fix typo in flake.nix defaultPackage

Change contents

• replacement in flake.nix at line 17
  [3.65]→[3.1024163:1024164](∅→∅),[3.159]→[3.1024163:1024164](∅→∅),[3.1024163]→[3.1024163:1024164](∅→∅)
  −
  [3.159]

  [3.160]
  + allSystems = [ "x86_64-linux" "aarch64-linux" "i686-linux" "x86_64-darwin" "aarch64-darwin" ];
• edit in flake.nix at line 91
  [3.1026223]→[3.847:847](∅→∅),[3.159]→[2.0:0](∅→∅),[2.0]→[3.0:101](∅→∅),[3.1024079]→[3.0:101](∅→∅)
  −

  −

  − allSystems = [ "x86_64-linux" "aarch64-linux" "i686-linux" "x86_64-darwin" "aarch64-darwin" ];
• resolve order conflict in flake.nix at line 91
  [3.1026223]