Conflict resolution (flakes)

pmeunier

Feb 7, 2024, 6:45 PM

V3G26FEWYGQN7TJON3KOKJPXM6NGRCUAGV7IW3OI7MNUM63KE5CAC

Dependencies

• [2] ND62U46T Get nix base builds working again
• [3] O2CDACII Solving a conflict
• [4] 2RUJ4J7M Bump flake.nix & flake.lock
• [5] LAFA7YMQ switch to oxalica/rust-overlay
• [6] SXEYMYF7 Fixing the bad changes in history (unfortunately, by rebooting).
• [7] LNZVL2QQ update build tools
• [8] WZYPQBYN flake: use crate2nix from Nixpkgs
• [9] 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.
• [10] G734WNM6 flake.nix: use crate2nix
• [11] SH2ZBSAZ Fix typo in flake.nix defaultPackage
• [12] XXYMJ6PM update Rust for CVE-2022-21658
• [13] ZWPPIJXF flake.nix: use Mozilla overlay for Rust
• [14] 2B7KNPCM flake.nix uses zstd 1.49
• [15] MUYNSHG2 update Nix build for Rust 2021 edition requirement

Change contents

• edit in flake.nix at line 92
  [5.1026223]→[3.102:102](∅→∅),[5.67]→[4.55:110](∅→∅),[5.67]→[4.55:110](∅→∅),[5.13]→[4.0:54](∅→∅),[5.13]→[4.0:54](∅→∅)
  −

  − rustChannel = prev.rust-bin.stable."1.70.0";

  − nixpkgs.url = "github:nixos/nixpkgs/nixos-23.05";
• resolve order conflict in flake.nix at line 92
  [5.1026223]
• replacement in flake.lock at line 19
  [5.1026288]→[2.956:1066](∅→∅),[5.1026288]→[4.339:449](∅→∅)
  − "lastModified": 1703499205,

  − "narHash": "sha256-lF9rK5mSUfIZJgZxC3ge40tp1gmyyOXZ+lRY3P8bfbg=",

  − "lastModified": 1689137672,

  − "narHash": "sha256-QZoHxr0a73x6rQcAo5CiwYpysHbSnk7lAR8/16um7mM=",
  [5.1026288]

  [5.1026398]
  + "lastModified": 1707205916,

  + "narHash": "sha256-fmRJilYGlB7VCt3XsdYxrA0u8e/K84O5xYucerUY0iM=",
• replacement in flake.lock at line 23
  [5.1026451]→[2.1067:1126](∅→∅),[5.1026451]→[4.450:509](∅→∅)
  − "rev": "e1fa12d4f6c6fe19ccb59cac54b5b3f25e160870",

  − "rev": "98da3dd0de6660d4abed7bb74e748694bd803413",
  [5.1026451]

  [5.1026510]
  + "rev": "8cc79aa39bbc6eaedaf286ae655b224c71e02907",
• edit in flake.lock at line 37
  [5.1703]→[4.1187:1300](∅→∅),[5.1703]→[4.1187:1300](∅→∅)
  − },

  − "original": {

  − "owner": "nix-systems",

  − "repo": "default",

  − "type": "github"
• resolve order conflict in flake.lock at line 37
  [5.2204]

  [5.1026751]
• edit in flake.lock at line 43
  [5.1335]→[4.712:822](∅→∅),[5.1335]→[4.712:822](∅→∅),[5.1505]→[4.823:882](∅→∅),[5.1505]→[4.823:882](∅→∅),[5.1678]→[4.883:1186](∅→∅),[5.1678]→[4.883:1186](∅→∅),[5.1026590]→[4.510:540](∅→∅),[5.1026590]→[4.510:540](∅→∅),[5.744]→[4.541:651](∅→∅),[5.744]→[4.541:651](∅→∅),[5.907]→[4.652:711](∅→∅),[5.907]→[4.652:711](∅→∅),[5.587]→[4.279:338](∅→∅),[5.587]→[4.279:338](∅→∅),[5.417]→[4.111:167](∅→∅),[5.417]→[4.111:167](∅→∅),[5.896]→[4.168:278](∅→∅),[5.896]→[4.168:278](∅→∅)
  − "lastModified": 1689215707,

  − "narHash": "sha256-Wuqkwdjtox/CfCq71p1pVBRd0VTR1Hw3+cb/zdvxOHI=",

  − "rev": "7a1c8fd0f90694af49b89181344096e3375f2e23",

  − "type": "github"

  − }

  − },

  − "systems": {

  − "locked": {

  − "lastModified": 1681028828,

  − "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",

  − "owner": "nix-systems",

  − "repo": "default",

  − "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",

  − "ref": "nixos-23.05",

  − "lastModified": 1681358109,

  − "narHash": "sha256-eKyxW4OohHQx9Urxi7TQlFBTDWII+F+x2hklDOQPB50=",

  − "rev": "96ba1c52e54e74c3197f4d43026b3f3d92e83ff9",

  − "rev": "cfacdce06f30d2b68473a46042957675eebb3401",

  − "inputs": {

  − "systems": "systems"

  − },

  − "lastModified": 1681202837,

  − "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
• resolve order conflict in flake.lock at line 43
  [5.1026805]