From 9289ba226d21439c7f499557b8c81941477d01a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Delenk?= Date: Sat, 28 Jan 2023 13:44:49 +0100 Subject: [PATCH] make it work --- flake.lock | 277 +++++++++++++++++------------------------------------ flake.nix | 14 +-- 2 files changed, 91 insertions(+), 200 deletions(-) diff --git a/flake.lock b/flake.lock index 7880232c..61337412 100644 --- a/flake.lock +++ b/flake.lock @@ -2,16 +2,10 @@ "nodes": { "attic": { "inputs": { - "crane": [ - "crane" - ], + "crane": "crane", "flake-compat": "flake-compat", - "flake-utils": [ - "flake-utils" - ], - "nixpkgs": [ - "nixpkgs" - ], + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs", "nixpkgs-stable": "nixpkgs-stable" }, "locked": { @@ -28,34 +22,6 @@ "type": "github" } }, - "attic_2": { - "inputs": { - "crane": "crane_2", - "flake-compat": "flake-compat_4", - "flake-utils": [ - "nix-packages", - "flake-utils" - ], - "nixpkgs": [ - "nix-packages", - "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable_2" - }, - "locked": { - "lastModified": 1674419074, - "narHash": "sha256-qOhl5NUGJn4R49AsHQT1zlVihqKZJiRn7GdP/ObUiP8=", - "owner": "zhaofengli", - "repo": "attic", - "rev": "9c8e9fbc35fe42b814ceb7482d5254ad3dad2c1e", - "type": "github" - }, - "original": { - "owner": "zhaofengli", - "repo": "attic", - "type": "github" - } - }, "cargo2nix": { "inputs": { "flake-compat": "flake-compat_2", @@ -124,7 +90,7 @@ "nixpkgs": [ "nixpkgs" ], - "rust-overlay": "rust-overlay" + "rust-overlay": "rust-overlay_2" }, "locked": { "lastModified": 1674678757, @@ -141,55 +107,27 @@ } }, "crane": { - "inputs": { - "flake-compat": "flake-compat_3", - "flake-utils": [ - "flake-utils" - ], - "nixpkgs": [ - "nixpkgs" - ], - "rust-overlay": "rust-overlay_2" - }, - "locked": { - "lastModified": 1674853047, - "narHash": "sha256-HMMG3ouEtwM52mOPDl1nwcICbDp3obPgemuH53uAzJ0=", - "owner": "DarkKirb", - "repo": "crane", - "rev": "a32a0f63e3b64f511fd7f9bd52a13885f8bf7cc0", - "type": "github" - }, - "original": { - "owner": "DarkKirb", - "repo": "crane", - "type": "github" - } - }, - "crane_2": { "inputs": { "flake-compat": [ - "nix-packages", "attic", "flake-compat" ], "flake-utils": [ - "nix-packages", "attic", "flake-utils" ], "nixpkgs": [ - "nix-packages", "attic", "nixpkgs" ], - "rust-overlay": "rust-overlay_3" + "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1672095661, - "narHash": "sha256-7NTsdCn3qsvU7A+1/7tY8pxbq0DYy1pFYNpzN6he9lI=", + "lastModified": 1674348649, + "narHash": "sha256-hBRlaUlsrmW1wAPevwQnkrT0XiLrmlAHWabWYmLeQlQ=", "owner": "ipetkov", "repo": "crane", - "rev": "98894bb39b03bfb379c5e10523cd61160e1ac782", + "rev": "ccea7b33178daf6010aae3ea2b3fb5b0241b9146", "type": "github" }, "original": { @@ -227,7 +165,7 @@ "flake-parts": "flake-parts", "flake-root": "flake-root", "haskell-flake": "haskell-flake", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "treefmt-nix": "treefmt-nix" }, "locked": { @@ -311,38 +249,6 @@ } }, "flake-compat_3": { - "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_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, @@ -358,7 +264,7 @@ "type": "github" } }, - "flake-compat_6": { + "flake-compat_4": { "flake": false, "locked": { "lastModified": 1668681692, @@ -457,6 +363,21 @@ "type": "github" } }, + "flake-utils_2": { + "locked": { + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "haskell-flake": { "locked": { "lastModified": 1674066917, @@ -614,7 +535,7 @@ "nix": { "inputs": { "lowdown-src": "lowdown-src", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "nixpkgs-regression": "nixpkgs-regression" }, "locked": { @@ -634,8 +555,10 @@ }, "nix-packages": { "inputs": { - "attic": "attic_2", - "flake-compat": "flake-compat_5", + "attic": [ + "attic" + ], + "flake-compat": "flake-compat_3", "flake-utils": [ "flake-utils" ], @@ -674,15 +597,15 @@ }, "nixpkgs": { "locked": { - "lastModified": 1674096995, - "narHash": "sha256-/vw7At/SztpZjTeM11foA7YdOFmdwSn+ARo8oy+mlUU=", - "owner": "nixos", + "lastModified": 1674899129, + "narHash": "sha256-6LGae8WbdCN4S9+o2wfYDJPpfxC2EnXEvoopVkguNtc=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "676c80dcc2f0ba780c8ab204f92c5abd69fa1245", + "rev": "6b9c27b4c9c1c329b27a44ed1fa8935df79f9a8b", "type": "github" }, "original": { - "owner": "nixos", + "owner": "NixOS", "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" @@ -740,27 +663,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1673800717, - "narHash": "sha256-SFHraUqLSu5cC6IxTprex/nTsI81ZQAtDvlBvGDWfnA=", + "lastModified": 1674868155, + "narHash": "sha256-eFNm2h6fNbgD7ZpO4MHikCB5pSnCJ7DTmwPisjetmwc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2f9fd351ec37f5d479556cd48be4ca340da59b8f", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-22.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable_2": { - "locked": { - "lastModified": 1673800717, - "narHash": "sha256-SFHraUqLSu5cC6IxTprex/nTsI81ZQAtDvlBvGDWfnA=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "2f9fd351ec37f5d479556cd48be4ca340da59b8f", + "rev": "ce20e9ebe1903ea2ba1ab006ec63093020c761cb", "type": "github" }, "original": { @@ -771,6 +678,22 @@ } }, "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=", @@ -786,7 +709,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { "lastModified": 1674895870, "narHash": "sha256-eCObaRvyPVAn1IQZ64Ptg4uXnBh+hr7YN/U/GSbphXY=", @@ -818,7 +741,7 @@ }, "prismmc": { "inputs": { - "flake-compat": "flake-compat_6", + "flake-compat": "flake-compat_4", "libnbtplusplus": "libnbtplusplus", "nixpkgs": [ "nixpkgs" @@ -843,28 +766,54 @@ "attic": "attic", "cargo2nix": "cargo2nix", "chir-rs": "chir-rs", - "crane": "crane", "dns": "dns", "ema": "ema", "emanote": "emanote", "flake-parts": "flake-parts_2", - "flake-utils": "flake-utils", + "flake-utils": "flake-utils_2", "haskell-flake": "haskell-flake_2", "home-manager": "home-manager", "hosts-list": "hosts-list", "hydra": "hydra", "nix-packages": "nix-packages", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "nixpkgs-noto-variable": "nixpkgs-noto-variable", "nur": "nur", "prismmc": "prismmc", - "rust-overlay": "rust-overlay_4", + "rust-overlay": "rust-overlay_3", "sops-nix": "sops-nix", "tomlplusplus": "tomlplusplus" } }, "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", @@ -889,61 +838,7 @@ "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": [ - "nix-packages", - "attic", - "crane", - "flake-utils" - ], - "nixpkgs": [ - "nix-packages", - "attic", - "crane", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1670034122, - "narHash": "sha256-EqmuOKucPWtMvCZtHraHr3Q3bgVszq1x2PoZtQkUuEk=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "a0d5773275ecd4f141d792d3a0376277c0fc0b65", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "rust-overlay_4": { "inputs": { "flake-utils": [ "flake-utils" diff --git a/flake.nix b/flake.nix index 6342a977..8b8dfe9e 100644 --- a/flake.nix +++ b/flake.nix @@ -6,9 +6,10 @@ rec { # Sorted by name attic = { url = "github:zhaofengli/attic"; - inputs.crane.follows = "crane"; - inputs.flake-utils.follows = "flake-utils"; - inputs.nixpkgs.follows = "nixpkgs"; + #inputs.crane.follows = "crane"; + #inputs.flake-utils.follows = "flake-utils"; + #inputs.nixpkgs.follows = "nixpkgs"; + #inputs.nixpkgs-stable.follows = "nixpkgs"; }; cargo2nix = { url = "github:cargo2nix/cargo2nix"; @@ -21,12 +22,6 @@ rec { inputs.cargo2nix.follows = "cargo2nix"; inputs.flake-utils.follows = "flake-utils"; 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"; @@ -62,6 +57,7 @@ rec { }; nix-packages = { url = "github:DarkKirb/nix-packages"; + inputs.attic.follows = "attic"; inputs.flake-utils.follows = "flake-utils"; inputs.nixpkgs.follows = "nixpkgs"; };