diff options
| author | Alex <alex@adnab.me> | 2023-04-25 14:56:49 +0000 |
|---|---|---|
| committer | Alex <alex@adnab.me> | 2023-04-25 14:56:49 +0000 |
| commit | 1ecd88c01f0857139921214a264128e5639e31db (patch) | |
| tree | eeca4d33aabec4150296f6c475224a8510563204 /flake.lock | |
| parent | a16eb7e4b8344d2f58c09a249b7b1bd17d339a35 (diff) | |
| parent | 5efcdc0de3121da18e7531a9f8196ef38cecd93c (diff) | |
| download | garage-1ecd88c01f0857139921214a264128e5639e31db.tar.gz garage-1ecd88c01f0857139921214a264128e5639e31db.zip | |
Merge pull request 'Update rust toolchain to 1.68 and simplify Nix stuff' (#554) from nix-update-simplify into main
Reviewed-on: https://git.deuxfleurs.fr/Deuxfleurs/garage/pulls/554
Diffstat (limited to 'flake.lock')
| -rw-r--r-- | flake.lock | 99 |
1 files changed, 76 insertions, 23 deletions
@@ -41,12 +41,15 @@ } }, "flake-utils": { + "inputs": { + "systems": "systems" + }, "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": { @@ -56,12 +59,15 @@ } }, "flake-utils_2": { + "inputs": { + "systems": "systems_2" + }, "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "lastModified": 1681202837, + "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", "owner": "numtide", "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "rev": "cfacdce06f30d2b68473a46042957675eebb3401", "type": "github" }, "original": { @@ -72,44 +78,61 @@ }, "nixpkgs": { "locked": { - "lastModified": 1665657542, - "narHash": "sha256-mojxNyzbvmp8NtVtxqiHGhRfjCALLfk9i/Uup68Y5q8=", + "lastModified": 1682109806, + "narHash": "sha256-d9g7RKNShMLboTWwukM+RObDWWpHKaqTYXB48clBWXI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a3073c49bc0163fea6a121c276f526837672b555", + "rev": "2362848adf8def2866fabbffc50462e929d7fffb", "type": "github" }, "original": { "owner": "NixOS", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", - "rev": "a3073c49bc0163fea6a121c276f526837672b555", "type": "github" } }, - "root": { - "inputs": { - "cargo2nix": "cargo2nix", - "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs" + "nixpkgs_2": { + "locked": { + "lastModified": 1682423271, + "narHash": "sha256-WHhl1GiOij1ob4cTLL+yhqr+vFOUH8E5wAX8Ir8fvjE=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "94517a501434a627c5d9e72ac6e7f26174b978d3", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "94517a501434a627c5d9e72ac6e7f26174b978d3", + "type": "github" } }, - "rust-overlay": { + "root": { "inputs": { + "cargo2nix": "cargo2nix", + "flake-compat": [ + "cargo2nix", + "flake-compat" + ], "flake-utils": [ "cargo2nix", "flake-utils" ], - "nixpkgs": [ - "cargo2nix", - "nixpkgs" - ] + "nixpkgs": "nixpkgs_2" + } + }, + "rust-overlay": { + "inputs": { + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1664247556, - "narHash": "sha256-J4vazHU3609ekn7dr+3wfqPo5WGlZVAgV7jfux352L0=", + "lastModified": 1682389182, + "narHash": "sha256-8t2nmFnH+8V48+IJsf8AK51ebXNlVbOSVYOpiqJKvJE=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "524db9c9ea7bc7743bb74cdd45b6d46ea3fcc2ab", + "rev": "74f1a64dd28faeeb85ef081f32cad2989850322c", "type": "github" }, "original": { @@ -117,6 +140,36 @@ "repo": "rust-overlay", "type": "github" } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "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", |