Get nix base builds working again

ryanbooker

Dec 27, 2023, 11:38 AM

ND62U46THW72F6K32HFN6BEOKAXUM23L2ADIYEUXB3MHFAERWRCAC

Dependencies

• [2] PNJL5TPZ Version bump
• [3] 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.
• [4] SXEYMYF7 Fixing the bad changes in history (unfortunately, by rebooting).
• [5] MUYNSHG2 update Nix build for Rust 2021 edition requirement
• [6] VKBJ6XB6 Formatting and version bump
• [7] G734WNM6 flake.nix: use crate2nix
• [8] ZWPPIJXF flake.nix: use Mozilla overlay for Rust
• [9] X243Z3Y5 Recording only the required metadata (can even be changed later!)
• [10] QAXLX3UA Backwards-compatibility: moving old paths to the new "roots" feature
• [11] YN63NUZO Sanakirja 1.0
• [12] LNZVL2QQ update build tools
• [13] XXYMJ6PM update Rust for CVE-2022-21658
• [14] WZYPQBYN flake: use crate2nix from Nixpkgs
• [15] RNNJ4ORV shell uses the flake
• [*] LAFA7YMQ switch to oxalica/rust-overlay
• [*] EJ7TFFOW Re-adding Cargo.lock
• [*] RVAH6PXA Getting libpijul to compile to WASM32
• [*] RDQYEED2 Fixing versions

Change contents

• replacement in shell.nix at line 1
  [4.12]→[4.0:121](∅→∅)
  − (import (fetchTarball https://github.com/edolstra/flake-compat/archive/master.tar.gz) {

  − src = ./.;

  − }).shellNix.default
  [4.12]
  + (import

  + (

  + let lock = builtins.fromJSON (builtins.readFile ./flake.lock); in

  + fetchTarball {

  + url = lock.nodes.flake-compat.locked.url or "https://github.com/edolstra/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz";

  + sha256 = lock.nodes.flake-compat.locked.narHash;

  + }

  + )

  + { src = ./.; }

  + ).shellNix
• edit in flake.nix at line 6
  [3.59]

  [17.121]
  + flake-compat.url = "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz";
• edit in flake.lock at line 3
  [4.1026253]

  [4.1026253]
  + "flake-compat": {

  + "locked": {

  + "lastModified": 1696426674,

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

  + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",

  + "revCount": 57,

  + "type": "tarball",

  + "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz"

  + },

  + "original": {

  + "type": "tarball",

  + "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz"

  + }

  + },
• replacement in flake.lock at line 19
  [4.1026288]→[3.2004:2114](∅→∅)
  − "lastModified": 1700856099,

  − "narHash": "sha256-RnEA7iJ36Ay9jI0WwP+/y4zjEhmeN6Cjs9VOFBH7eVQ=",
  [4.1026288]

  [4.1026398]
  + "lastModified": 1703499205,

  + "narHash": "sha256-lF9rK5mSUfIZJgZxC3ge40tp1gmyyOXZ+lRY3P8bfbg=",
• replacement in flake.lock at line 23
  [4.1026451]→[3.2115:2174](∅→∅)
  − "rev": "0bd59c54ef06bc34eca01e37d689f5e46b3fe2f1",
  [4.1026451]

  [4.1026510]
  + "rev": "e1fa12d4f6c6fe19ccb59cac54b5b3f25e160870",
• edit in flake.lock at line 35
  [4.1026722]

  [3.2175]
  + "flake-compat": "flake-compat",
• replacement in default.nix at line 2
  [4.248547]→[4.248547:248778](∅→∅)
  − (fetchTarball {

  − url = "https://github.com/edolstra/flake-compat/archive/c71d063a2fce96001c7ef99b301dfbd0c29ebde1.tar.gz";

  − sha256 = "0vnbhqf0lc4mf2zmzqbfv6kqj9raijxz8xfaimxihz3c6s5gma2x";

  − })

  − { src = ./.; }).defaultNix
  [4.248547]
  + (

  + let lock = builtins.fromJSON (builtins.readFile ./flake.lock); in

  + fetchTarball {

  + url = lock.nodes.flake-compat.locked.url or "https://github.com/edolstra/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz";

  + sha256 = lock.nodes.flake-compat.locked.narHash;

  + }

  + )

  + { src = ./.; }

  + ).defaultNix
• edit in Cargo.lock at line 593
  [18.10489]

  [18.10489]
  + ]

  +

  + [[package]]

  + name = "conpty"

  + version = "0.5.1"

  + source = "registry+https://github.com/rust-lang/crates.io-index"

  + checksum = "b72b06487a0d4683349ad74d62e87ad639b09667082b3c495c5b6bab7d84b3da"

  + dependencies = [

  + "windows",
• edit in Cargo.lock at line 1010
  [2.5601]

  [2.5601]
  + ]

  +

  + [[package]]

  + name = "exitcode"

  + version = "1.1.2"

  + source = "registry+https://github.com/rust-lang/crates.io-index"

  + checksum = "de853764b47027c2e862a995c34978ffa63c1501f2e15f987ba11bd4f9bba193"

  +

  + [[package]]

  + name = "expectrl"

  + version = "0.7.1"

  + source = "registry+https://github.com/rust-lang/crates.io-index"

  + checksum = "ede784925953fcab9a3351d5009bcb8d2b0c13e940924c88087e8e2ce0c4717a"

  + dependencies = [

  + "conpty",

  + "nix 0.26.4",

  + "ptyprocess",

  + "regex",
• edit in Cargo.lock at line 1931
  [19.8600]

  [18.41129]
  + "pin-utils",
• edit in Cargo.lock at line 2245
  [18.48277]

  [18.48277]
  + "exitcode",

  + "expectrl",
• edit in Cargo.lock at line 2401
  [18.51513]

  [18.51513]
  + ]

  +

  + [[package]]

  + name = "ptyprocess"

  + version = "0.4.1"

  + source = "registry+https://github.com/rust-lang/crates.io-index"

  + checksum = "7e05aef7befb11a210468a2d77d978dde2c6381a0381e33beb575e91f57fe8cf"

  + dependencies = [

  + "nix 0.26.4",
• edit in Cargo.lock at line 3605
  [18.78789]

  [20.9647]
  +

  + [[package]]

  + name = "windows"

  + version = "0.44.0"

  + source = "registry+https://github.com/rust-lang/crates.io-index"

  + checksum = "9e745dab35a0c4c77aa3ce42d595e13d2003d6902d6b08c9ef5fc326d08da12b"

  + dependencies = [

  + "windows-targets 0.42.2",

  + ]