From e0e3d8495ae0c0de9ad4b98e45d3180ebf32b466 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Tue, 7 Feb 2023 13:06:46 +0400 Subject: [PATCH] Use helix from master --- flake.lock | 338 ++++++++++++++++++++++++++++++++++++++++++++-------- flake.nix | 2 + overlay.nix | 2 + 3 files changed, 290 insertions(+), 52 deletions(-) diff --git a/flake.lock b/flake.lock index 437b55a..e786aeb 100644 --- a/flake.lock +++ b/flake.lock @@ -80,6 +80,22 @@ "url": "https://nheko.im/nheko-reborn/coeurl" } }, + "crane": { + "flake": false, + "locked": { + "lastModified": 1670900067, + "narHash": "sha256-VXVa+KBfukhmWizaiGiHRVX/fuk66P8dgSFfkVN4/MY=", + "owner": "ipetkov", + "repo": "crane", + "rev": "59b31b41a589c0a65e4a1f86b0e5eac68081468b", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, "crate2nix": { "flake": false, "locked": { @@ -158,6 +174,22 @@ "type": "github" } }, + "devshell_2": { + "flake": false, + "locked": { + "lastModified": 1667210711, + "narHash": "sha256-IoErjXZAkzYWHEpQqwu/DeRNJGFdR7X2OGbkhMqMrpw=", + "owner": "numtide", + "repo": "devshell", + "rev": "96a9dd12b8a447840cc246e17a47b81a4268bba7", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "devshell", + "type": "github" + } + }, "direnv-vscode": { "inputs": { "devshell": "devshell", @@ -180,6 +212,71 @@ "type": "github" } }, + "dream2nix": { + "inputs": { + "alejandra": [ + "helix", + "nci" + ], + "all-cabal-json": [ + "helix", + "nci" + ], + "crane": "crane", + "devshell": [ + "helix", + "nci", + "devshell" + ], + "flake-parts": "flake-parts", + "flake-utils-pre-commit": [ + "helix", + "nci" + ], + "ghc-utils": [ + "helix", + "nci" + ], + "gomod2nix": [ + "helix", + "nci" + ], + "mach-nix": [ + "helix", + "nci" + ], + "nix-pypi-fetcher": [ + "helix", + "nci" + ], + "nixpkgs": [ + "helix", + "nci", + "nixpkgs" + ], + "poetry2nix": [ + "helix", + "nci" + ], + "pre-commit-hooks": [ + "helix", + "nci" + ] + }, + "locked": { + "lastModified": 1671323629, + "narHash": "sha256-9KHTPjIDjfnzZ4NjpE3gGIVHVHopy6weRDYO/7Y3hF8=", + "owner": "nix-community", + "repo": "dream2nix", + "rev": "2d7d68505c8619410df2c6b6463985f97cbcba6e", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "dream2nix", + "type": "github" + } + }, "flake-compat": { "flake": false, "locked": { @@ -228,6 +325,24 @@ "type": "github" } }, + "flake-parts": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib" + }, + "locked": { + "lastModified": 1668450977, + "narHash": "sha256-cfLhMhnvXn6x1vPm+Jow3RiFAUSCw/l1utktCw5rVA4=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "d591857e9d7dd9ddbfba0ea02b43b927c3c0f1fa", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "flake-registry": { "flake": false, "locked": { @@ -260,21 +375,6 @@ } }, "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" - } - }, - "flake-utils_3": { "locked": { "lastModified": 1659877975, "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", @@ -289,7 +389,7 @@ "type": "github" } }, - "flake-utils_4": { + "flake-utils_3": { "locked": { "lastModified": 1667395993, "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", @@ -304,6 +404,21 @@ "type": "github" } }, + "flake-utils_4": { + "locked": { + "lastModified": 1659877975, + "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "flake-utils_5": { "locked": { "lastModified": 1667395993, @@ -319,9 +434,44 @@ "type": "github" } }, + "flake-utils_6": { + "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" + } + }, + "helix": { + "inputs": { + "nci": "nci", + "nixpkgs": "nixpkgs_3", + "rust-overlay": "rust-overlay" + }, + "locked": { + "lastModified": 1675741428, + "narHash": "sha256-X62JbWE1swmvlcRM8jyvlIw07SW8zsHBTSCPmo4dMjo=", + "owner": "helix-editor", + "repo": "helix", + "rev": "23ed8c12f17c28ee888b5560d0ab2a9f9cd74dc9", + "type": "github" + }, + "original": { + "owner": "helix-editor", + "repo": "helix", + "type": "github" + } + }, "home-manager": { "inputs": { - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "utils": "utils_2" }, "locked": { @@ -355,7 +505,7 @@ }, "lambda-launcher": { "inputs": { - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_5" }, "locked": { "lastModified": 1654984020, @@ -435,6 +585,33 @@ "type": "github" } }, + "nci": { + "inputs": { + "devshell": "devshell_2", + "dream2nix": "dream2nix", + "nixpkgs": [ + "helix", + "nixpkgs" + ], + "rust-overlay": [ + "helix", + "rust-overlay" + ] + }, + "locked": { + "lastModified": 1671430291, + "narHash": "sha256-UIc7H8F3N8rK72J/Vj5YJdV72tvDvYjH+UPsOFvlcsE=", + "owner": "yusdacra", + "repo": "nix-cargo-integration", + "rev": "b1b0d38b8c3b0d0e6a38638d5bbe10b0bc67522c", + "type": "github" + }, + "original": { + "owner": "yusdacra", + "repo": "nix-cargo-integration", + "type": "github" + } + }, "nheko": { "flake": false, "locked": { @@ -454,7 +631,7 @@ "nix": { "inputs": { "lowdown-src": "lowdown-src", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_6", "nixpkgs-regression": "nixpkgs-regression" }, "locked": { @@ -473,8 +650,8 @@ }, "nix-direnv": { "inputs": { - "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_6" + "flake-utils": "flake-utils_3", + "nixpkgs": "nixpkgs_7" }, "locked": { "lastModified": 1672568215, @@ -492,8 +669,8 @@ }, "nix-vscode-marketplace": { "inputs": { - "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs_7" + "flake-utils": "flake-utils_4", + "nixpkgs": "nixpkgs_8" }, "locked": { "lastModified": 1672902551, @@ -540,6 +717,24 @@ "type": "github" } }, + "nixpkgs-lib": { + "locked": { + "dir": "lib", + "lastModified": 1665349835, + "narHash": "sha256-UK4urM3iN80UXQ7EaOappDzcisYIuEURFRoGQ/yPkug=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "34c5293a71ffdb2fe054eb5288adc1882c1eb0b1", + "type": "github" + }, + "original": { + "dir": "lib", + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-old": { "flake": false, "locked": { @@ -590,6 +785,22 @@ } }, "nixpkgs_10": { + "locked": { + "lastModified": 1672791794, + "narHash": "sha256-mqGPpGmwap0Wfsf3o2b6qHJW1w2kk/I6cGCGIU+3t6o=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "9813adc7f7c0edd738c6bdd8431439688bb0cb3d", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_11": { "locked": { "lastModified": 1671741567, "narHash": "sha256-SSmlJkiSOkrM0CW6pASLAMs1+3TaAogmw0hwch+VvhQ=", @@ -604,7 +815,7 @@ "type": "github" } }, - "nixpkgs_11": { + "nixpkgs_12": { "locked": { "lastModified": 1599773960, "narHash": "sha256-5bL52aaUOOyOBjgKh9/6jQlFbeE+WfVX7dpvjohmD+w=", @@ -634,6 +845,22 @@ } }, "nixpkgs_3": { + "locked": { + "lastModified": 1671359686, + "narHash": "sha256-3MpC6yZo+Xn9cPordGz2/ii6IJpP2n8LE8e/ebUXLrs=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "04f574a1c0fde90b51bf68198e2297ca4e7cccf4", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { "locked": { "lastModified": 1671983799, "narHash": "sha256-Z2Ro6hFPZHkBqkVXY5/aBUzxi5xizQGvuHQ9+T5B/ks=", @@ -649,7 +876,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { "lastModified": 1614531970, "narHash": "sha256-cfsbJwD5t8b03YQW7/F4hlYO19ACV/BIDIiRJ4V43V4=", @@ -664,7 +891,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_6": { "locked": { "lastModified": 1670461440, "narHash": "sha256-jy1LB8HOMKGJEGXgzFRLDU1CBGL0/LlkolgnqIsF0D8=", @@ -680,7 +907,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_7": { "locked": { "lastModified": 1672428209, "narHash": "sha256-eejhqkDz2cb2vc5VeaWphJz8UXNuoNoM8/Op8eWv2tQ=", @@ -696,7 +923,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_8": { "locked": { "lastModified": 1660464579, "narHash": "sha256-kzA9rwh0wS6CwUnFHAQ7dhJCowMPfRbvixVeOKnUmjo=", @@ -712,33 +939,17 @@ "type": "github" } }, - "nixpkgs_8": { - "locked": { - "lastModified": 1672791794, - "narHash": "sha256-mqGPpGmwap0Wfsf3o2b6qHJW1w2kk/I6cGCGIU+3t6o=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "9813adc7f7c0edd738c6bdd8431439688bb0cb3d", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_9": { "locked": { "lastModified": 1672791794, "narHash": "sha256-mqGPpGmwap0Wfsf3o2b6qHJW1w2kk/I6cGCGIU+3t6o=", - "owner": "NixOS", + "owner": "nixos", "repo": "nixpkgs", "rev": "9813adc7f7c0edd738c6bdd8431439688bb0cb3d", "type": "github" }, "original": { - "owner": "NixOS", + "owner": "nixos", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" @@ -762,8 +973,8 @@ }, "remapper": { "inputs": { - "flake-utils": "flake-utils_4", - "nixpkgs": "nixpkgs_9", + "flake-utils": "flake-utils_5", + "nixpkgs": "nixpkgs_10", "telegram-bot-monadic": "telegram-bot-monadic" }, "locked": { @@ -792,6 +1003,7 @@ "direnv-vscode": "direnv-vscode", "flake-compat": "flake-compat_3", "flake-registry": "flake-registry", + "helix": "helix", "home-manager": "home-manager", "impermanence": "impermanence", "lambda-launcher": "lambda-launcher", @@ -803,7 +1015,7 @@ "nix-direnv": "nix-direnv", "nix-vscode-marketplace": "nix-vscode-marketplace", "nixos-fhs-compat": "nixos-fhs-compat", - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs_9", "nixpkgs-old": "nixpkgs-old", "nixpkgs-wayland": "nixpkgs-wayland", "remapper": "remapper", @@ -813,6 +1025,28 @@ "sonoff-lan": "sonoff-lan" } }, + "rust-overlay": { + "inputs": { + "flake-utils": "flake-utils_2", + "nixpkgs": [ + "helix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1671416426, + "narHash": "sha256-kpSH1Jrxfk2qd0pRPJn1eQdIOseGv5JuE+YaOrqU9s4=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "fbaaff24f375ac25ec64268b0a0d63f91e474b7d", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, "rycee": { "flake": false, "locked": { @@ -848,7 +1082,7 @@ "simple-osd-daemons": { "inputs": { "crate2nix": "crate2nix", - "nixpkgs": "nixpkgs_11" + "nixpkgs": "nixpkgs_12" }, "locked": { "lastModified": 1651606905, @@ -882,8 +1116,8 @@ }, "telegram-bot-monadic": { "inputs": { - "flake-utils": "flake-utils_5", - "nixpkgs": "nixpkgs_10", + "flake-utils": "flake-utils_6", + "nixpkgs": "nixpkgs_11", "telegram-bot-simple": "telegram-bot-simple" }, "locked": { diff --git a/flake.nix b/flake.nix index fb5fc42..7dc6276 100644 --- a/flake.nix +++ b/flake.nix @@ -97,6 +97,8 @@ nix-vscode-marketplace.url = "github:AmeerTaweel/nix-vscode-marketplace"; remapper.url = "github:balsoft/remapper"; + + helix.url = "github:helix-editor/helix"; }; outputs = { nixpkgs, self, nix, deploy-rs, ... }@inputs: diff --git a/overlay.nix b/overlay.nix index bc5bfb3..165f6aa 100644 --- a/overlay.nix +++ b/overlay.nix @@ -133,4 +133,6 @@ in rec { }); remapper = inputs.remapper.packages.${final.system}.default; + + helix = inputs.helix.packages.${final.system}.default; }