From c8070858ceb53e1361fb547d3408eaf7aa463f40 Mon Sep 17 00:00:00 2001 From: thesimplekid Date: Wed, 13 Dec 2023 23:00:29 +0000 Subject: [PATCH] Revert "chore: update flake.lock" This reverts commit ed2d1f82680ff8eb562d3642bd59c2baf1f72ea1. --- flake.lock | 144 ++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 120 insertions(+), 24 deletions(-) diff --git a/flake.lock b/flake.lock index 9140a389c..69320e8c9 100644 --- a/flake.lock +++ b/flake.lock @@ -26,23 +26,26 @@ }, "crane": { "inputs": { + "flake-compat": "flake-compat", + "flake-utils": "flake-utils_3", "nixpkgs": [ "flakebox", "nixpkgs" - ] + ], + "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1699217310, - "narHash": "sha256-xpW3VFUG7yE6UE6Wl0dhqencuENSkV7qpnpe9I8VbPw=", - "owner": "ipetkov", + "lastModified": 1697596235, + "narHash": "sha256-4VTrrTdoA1u1wyf15krZCFl3c29YLesSNioYEgfb2FY=", + "owner": "dpc", "repo": "crane", - "rev": "d535642bbe6f377077f7c23f0febb78b1463f449", + "rev": "c97a0c0d83bfdf01c29113c5592a3defc27cb315", "type": "github" }, "original": { - "owner": "ipetkov", + "owner": "dpc", "repo": "crane", - "rev": "d535642bbe6f377077f7c23f0febb78b1463f449", + "rev": "c97a0c0d83bfdf01c29113c5592a3defc27cb315", "type": "github" } }, @@ -78,11 +81,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1699597299, - "narHash": "sha256-uJMCDTKSUB7+K+s7SB2DS6WU2VGDmruXmP9TQwTYGkw=", + "lastModified": 1696918968, + "narHash": "sha256-18rAHsM9YsGp7aKKemO4gKIeWfrSyDsdJZ/mk4dQ3JI=", "owner": "nix-community", "repo": "fenix", - "rev": "ae8ecab0dbfe3552bd1a0bf5504416fd07dd2e8a", + "rev": "638fc95a2a3d01b372c76f71cbb6d73c63909d6e", "type": "github" }, "original": { @@ -91,16 +94,32 @@ "type": "github" } }, + "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": "systems" }, "locked": { - "lastModified": 1701680307, - "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", "owner": "numtide", "repo": "flake-utils", - "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", "type": "github" }, "original": { @@ -128,6 +147,24 @@ } }, "flake-utils_3": { + "inputs": { + "systems": "systems_4" + }, + "locked": { + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_4": { "inputs": { "systems": [ "flakebox", @@ -153,18 +190,19 @@ "android-nixpkgs": "android-nixpkgs", "crane": "crane", "fenix": "fenix", - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_4", "nixpkgs": [ "nixpkgs" ], - "systems": "systems_4" + "nixpkgs-unstable": "nixpkgs-unstable", + "systems": "systems_5" }, "locked": { - "lastModified": 1701844817, - "narHash": "sha256-7dV4cJ0Cz+P/X0f5dMdd8437MKR/5E0P7qR8VxEW++g=", + "lastModified": 1699480354, + "narHash": "sha256-nxT58nXjJWgznkMOm+RUOpcE/HgHnYe9IfwwMXQB0wc=", "owner": "rustshop", "repo": "flakebox", - "rev": "53530a1a4e8ff20db45a2ce2bd9394c98405855b", + "rev": "ea39c4e6e1760ee7b8872e69f8d10fbb14634e69", "type": "github" }, "original": { @@ -175,11 +213,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1702221085, - "narHash": "sha256-Br3GCSkkvkmw46cT6wCz6ro2H1WgDMWbKE0qctbdtL0=", + "lastModified": 1699291058, + "narHash": "sha256-5ggduoaAMPHUy4riL+OrlAZE14Kh7JWX4oLEs22ZqfU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c2786e7084cbad90b4f9472d5b5e35ecb57958af", + "rev": "41de143fda10e33be0f47eab2bfe08a50f234267", "type": "github" }, "original": { @@ -189,6 +227,22 @@ "type": "github" } }, + "nixpkgs-unstable": { + "locked": { + "lastModified": 1697456312, + "narHash": "sha256-roiSnrqb5r+ehnKCauPLugoU8S36KgmWraHgRqVYndo=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "ca012a02bf8327be9e488546faecae5e05d7d749", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "root": { "inputs": { "flake-utils": "flake-utils", @@ -199,11 +253,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1699552432, - "narHash": "sha256-MxxTH/X5vnqLWEwokxdA5AkX/NpXOrHMn/95QwOdA4o=", + "lastModified": 1696840854, + "narHash": "sha256-wphOvjDSDsUN5DMe3MOhdargANIab7YE3hkh3Qv7qso=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "76633199f4316b9c659d4ec0c102774d693cd940", + "rev": "aaa1e8e1b82d742b876d164a30dda02f318ce809", "type": "github" }, "original": { @@ -213,6 +267,33 @@ "type": "github" } }, + "rust-overlay": { + "inputs": { + "flake-utils": [ + "flakebox", + "crane", + "flake-utils" + ], + "nixpkgs": [ + "flakebox", + "crane", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1695003086, + "narHash": "sha256-d1/ZKuBRpxifmUf7FaedCqhy0lyVbqj44Oc2s+P5bdA=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "b87a14abea512d956f0b89d0d8a1e9b41f3e20ff", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, "systems": { "locked": { "lastModified": 1681028828, @@ -272,6 +353,21 @@ "repo": "default", "type": "github" } + }, + "systems_5": { + "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",