From 1f0b359ad2b7293712f8482a66a09a4b83e11089 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Delenk?= Date: Fri, 27 Jan 2023 21:57:42 +0100 Subject: [PATCH] patch crane --- flake.lock | 140 ++++++++++++++++++++++++++--------------------------- flake.nix | 7 +++ 2 files changed, 76 insertions(+), 71 deletions(-) diff --git a/flake.lock b/flake.lock index 84a02403..7880232c 100644 --- a/flake.lock +++ b/flake.lock @@ -2,12 +2,16 @@ "nodes": { "attic": { "inputs": { - "crane": "crane", + "crane": [ + "crane" + ], "flake-compat": "flake-compat", "flake-utils": [ "flake-utils" ], - "nixpkgs": "nixpkgs", + "nixpkgs": [ + "nixpkgs" + ], "nixpkgs-stable": "nixpkgs-stable" }, "locked": { @@ -27,7 +31,7 @@ "attic_2": { "inputs": { "crane": "crane_2", - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_4", "flake-utils": [ "nix-packages", "flake-utils" @@ -120,7 +124,7 @@ "nixpkgs": [ "nixpkgs" ], - "rust-overlay": "rust-overlay_2" + "rust-overlay": "rust-overlay" }, "locked": { "lastModified": 1674678757, @@ -138,30 +142,25 @@ }, "crane": { "inputs": { - "flake-compat": [ - "attic", - "flake-compat" - ], + "flake-compat": "flake-compat_3", "flake-utils": [ - "attic", "flake-utils" ], "nixpkgs": [ - "attic", "nixpkgs" ], - "rust-overlay": "rust-overlay" + "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1674348649, - "narHash": "sha256-hBRlaUlsrmW1wAPevwQnkrT0XiLrmlAHWabWYmLeQlQ=", - "owner": "ipetkov", + "lastModified": 1674853047, + "narHash": "sha256-HMMG3ouEtwM52mOPDl1nwcICbDp3obPgemuH53uAzJ0=", + "owner": "DarkKirb", "repo": "crane", - "rev": "ccea7b33178daf6010aae3ea2b3fb5b0241b9146", + "rev": "a32a0f63e3b64f511fd7f9bd52a13885f8bf7cc0", "type": "github" }, "original": { - "owner": "ipetkov", + "owner": "DarkKirb", "repo": "crane", "type": "github" } @@ -228,7 +227,7 @@ "flake-parts": "flake-parts", "flake-root": "flake-root", "haskell-flake": "haskell-flake", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "treefmt-nix": "treefmt-nix" }, "locked": { @@ -328,6 +327,22 @@ } }, "flake-compat_4": { + "flake": false, + "locked": { + "lastModified": 1668681692, + "narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "009399224d5e398d03b22badca40a37ac85412a1", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_5": { "flake": false, "locked": { "lastModified": 1673956053, @@ -343,7 +358,7 @@ "type": "github" } }, - "flake-compat_5": { + "flake-compat_6": { "flake": false, "locked": { "lastModified": 1668681692, @@ -599,7 +614,7 @@ "nix": { "inputs": { "lowdown-src": "lowdown-src", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_2", "nixpkgs-regression": "nixpkgs-regression" }, "locked": { @@ -620,7 +635,7 @@ "nix-packages": { "inputs": { "attic": "attic_2", - "flake-compat": "flake-compat_4", + "flake-compat": "flake-compat_5", "flake-utils": [ "flake-utils" ], @@ -659,15 +674,15 @@ }, "nixpkgs": { "locked": { - "lastModified": 1674807565, - "narHash": "sha256-zOLE1YXf2RhYhtNv4n8C0xPaSjduchLlCxZaAeoAvxU=", - "owner": "NixOS", + "lastModified": 1674096995, + "narHash": "sha256-/vw7At/SztpZjTeM11foA7YdOFmdwSn+ARo8oy+mlUU=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "f80ac848e3d6f0c12c52758c0f25c10c97ca3b62", + "rev": "676c80dcc2f0ba780c8ab204f92c5abd69fa1245", "type": "github" }, "original": { - "owner": "NixOS", + "owner": "nixos", "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" @@ -756,22 +771,6 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 1674096995, - "narHash": "sha256-/vw7At/SztpZjTeM11foA7YdOFmdwSn+ARo8oy+mlUU=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "676c80dcc2f0ba780c8ab204f92c5abd69fa1245", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1657693803, "narHash": "sha256-G++2CJ9u0E7NNTAi9n5G8TdDmGJXcIjkJ3NF8cetQB8=", @@ -787,7 +786,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { "lastModified": 1674895870, "narHash": "sha256-eCObaRvyPVAn1IQZ64Ptg4uXnBh+hr7YN/U/GSbphXY=", @@ -819,7 +818,7 @@ }, "prismmc": { "inputs": { - "flake-compat": "flake-compat_5", + "flake-compat": "flake-compat_6", "libnbtplusplus": "libnbtplusplus", "nixpkgs": [ "nixpkgs" @@ -844,6 +843,7 @@ "attic": "attic", "cargo2nix": "cargo2nix", "chir-rs": "chir-rs", + "crane": "crane", "dns": "dns", "ema": "ema", "emanote": "emanote", @@ -855,7 +855,7 @@ "hydra": "hydra", "nix-packages": "nix-packages", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_3", "nixpkgs-noto-variable": "nixpkgs-noto-variable", "nur": "nur", "prismmc": "prismmc", @@ -865,33 +865,6 @@ } }, "rust-overlay": { - "inputs": { - "flake-utils": [ - "attic", - "crane", - "flake-utils" - ], - "nixpkgs": [ - "attic", - "crane", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1672712534, - "narHash": "sha256-8S0DdMPcbITnlOu0uA81mTo3hgX84wK8S9wS34HEFY4=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "69fb7bf0a8c40e6c4c197fa1816773774c8ac59f", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "rust-overlay_2": { "inputs": { "flake-utils": [ "chir-rs", @@ -916,6 +889,31 @@ "type": "github" } }, + "rust-overlay_2": { + "inputs": { + "flake-utils": [ + "crane", + "flake-utils" + ], + "nixpkgs": [ + "crane", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1672712534, + "narHash": "sha256-8S0DdMPcbITnlOu0uA81mTo3hgX84wK8S9wS34HEFY4=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "69fb7bf0a8c40e6c4c197fa1816773774c8ac59f", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, "rust-overlay_3": { "inputs": { "flake-utils": [ diff --git a/flake.nix b/flake.nix index 10b63a91..6c9fcac4 100644 --- a/flake.nix +++ b/flake.nix @@ -6,7 +6,9 @@ rec { # Sorted by name attic = { url = "github:zhaofengli/attic"; + inputs.crane.follows = "crane"; inputs.flake-utils.follows = "flake-utils"; + inputs.nixpkgs.follows = "nixpkgs"; }; cargo2nix = { url = "github:cargo2nix/cargo2nix"; @@ -21,6 +23,11 @@ rec { inputs.nixpkgs.follows = "nixpkgs"; inputs.attic.follows = "attic"; }; + crane = { + url = "github:DarkKirb/crane"; + inputs.flake-utils.follows = "flake-utils"; + inputs.nixpkgs.follows = "nixpkgs"; + }; dns = { url = "github:DarkKirb/dns.nix"; inputs.flake-utils.follows = "flake-utils";