From e9ce42a2d2e0c86931aeda2111298dd81812e5fd Mon Sep 17 00:00:00 2001 From: Colin Date: Mon, 13 Jan 2025 10:11:56 +0000 Subject: [PATCH] flake: update: rust-overlay 2022-12-31 -> 2023-06-30 `cargo test` passes (except wgpu tests, doc tests) --- flake.lock | 38 ++++++++++++++++++++++++++++---------- flake.nix | 2 +- 2 files changed, 29 insertions(+), 11 deletions(-) diff --git a/flake.lock b/flake.lock index 4cf5361..bdc9dd0 100644 --- a/flake.lock +++ b/flake.lock @@ -19,12 +19,15 @@ } }, "flake-utils_2": { + "inputs": { + "systems": "systems_2" + }, "locked": { - "lastModified": 1659877975, - "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "lastModified": 1681202837, + "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", "owner": "numtide", "repo": "flake-utils", - "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "rev": "cfacdce06f30d2b68473a46042957675eebb3401", "type": "github" }, "original": { @@ -50,11 +53,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1665296151, - "narHash": "sha256-uOB0oxqxN9K7XGF1hcnY+PQnlQJ+3bP2vCn/+Ru/bbc=", + "lastModified": 1681358109, + "narHash": "sha256-eKyxW4OohHQx9Urxi7TQlFBTDWII+F+x2hklDOQPB50=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "14ccaaedd95a488dd7ae142757884d8e125b3363", + "rev": "96ba1c52e54e74c3197f4d43026b3f3d92e83ff9", "type": "github" }, "original": { @@ -77,17 +80,17 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1672453260, - "narHash": "sha256-ruR2xo30Vn7kY2hAgg2Z2xrCvNePxck6mgR5a8u+zow=", + "lastModified": 1688092301, + "narHash": "sha256-NTgT955DzXWVjHsuBn1t2K0x4hUghY7uE1jG2nGL5R4=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "176b6fd3dd3d7cea8d22ab1131364a050228d94c", + "rev": "4c31223801dd0f28ac15d60f2e5ddbd4d51ce17a", "type": "github" }, "original": { "owner": "oxalica", "repo": "rust-overlay", - "rev": "176b6fd3dd3d7cea8d22ab1131364a050228d94c", + "rev": "4c31223801dd0f28ac15d60f2e5ddbd4d51ce17a", "type": "github" } }, @@ -105,6 +108,21 @@ "repo": "default", "type": "github" } + }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 20b4990..5ee5746 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,7 @@ inputs = { nixpkgs.url = "nixpkgs/nixos-22.11"; flake-utils.url = "github:numtide/flake-utils"; - rust-overlay.url = "github:oxalica/rust-overlay/176b6fd3dd3d7cea8d22ab1131364a050228d94c"; #< 2022-12-31 (TODO: update/un- pin) + rust-overlay.url = "github:oxalica/rust-overlay/4c31223801dd0f28ac15d60f2e5ddbd4d51ce17a"; #< 2023-06-30 (TODO: update/un- pin) }; outputs = { self, nixpkgs, flake-utils, rust-overlay }: