From f688d495115386d977418ccf6df56e939f1ac67f Mon Sep 17 00:00:00 2001 From: Colin Date: Mon, 13 Jan 2025 10:22:59 +0000 Subject: [PATCH] flake: rust-overlay: 2023-12-30 -> 2024-06-27 `cargo test` passes (except wgpu tests, doc tests) --- flake.lock | 42 ++++-------------------------------------- flake.nix | 2 +- 2 files changed, 5 insertions(+), 39 deletions(-) diff --git a/flake.lock b/flake.lock index 46bd01d..05c72f0 100644 --- a/flake.lock +++ b/flake.lock @@ -18,24 +18,6 @@ "type": "github" } }, - "flake-utils_2": { - "inputs": { - "systems": "systems_2" - }, - "locked": { - "lastModified": 1681202837, - "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "cfacdce06f30d2b68473a46042957675eebb3401", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "nixpkgs": { "locked": { "lastModified": 1704290814, @@ -76,21 +58,20 @@ }, "rust-overlay": { "inputs": { - "flake-utils": "flake-utils_2", "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1703902408, - "narHash": "sha256-qXdWvu+tlgNjeoz8yQMRKSom6QyRROfgpmeOhwbujqw=", + "lastModified": 1719454714, + "narHash": "sha256-MojqG0lyUINkEk0b3kM2drsU5vyaF8DFZe/FAlZVOGs=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "319f57cd2c34348c55970a4bf2b35afe82088681", + "rev": "d1c527659cf076ecc4b96a91c702d080b213801e", "type": "github" }, "original": { "owner": "oxalica", + "ref": "snapshot/2024-08-01", "repo": "rust-overlay", - "rev": "319f57cd2c34348c55970a4bf2b35afe82088681", "type": "github" } }, @@ -108,21 +89,6 @@ "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 8ec6dd4..e24421c 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,7 @@ inputs = { nixpkgs.url = "nixpkgs/nixos-23.05"; flake-utils.url = "github:numtide/flake-utils"; - rust-overlay.url = "github:oxalica/rust-overlay/319f57cd2c34348c55970a4bf2b35afe82088681"; #< 2023-12-30 (TODO: update/un- pin) + rust-overlay.url = "github:oxalica/rust-overlay/snapshot/2024-08-01"; #< 2024-06-27 (TODO: update/un- pin) }; outputs = { self, nixpkgs, flake-utils, rust-overlay }: