From 76c327b9b98619b97459d6440fbf5d937fe0262b Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Mon, 17 Apr 2023 17:44:23 +0100 Subject: [PATCH] chore: remove nvim workaround to get the latest ...version --- flake.lock | 48 ++++++++++++++++-------------------------------- flake.nix | 3 --- 2 files changed, 16 insertions(+), 35 deletions(-) diff --git a/flake.lock b/flake.lock index c7a1416..951a989 100644 --- a/flake.lock +++ b/flake.lock @@ -35,15 +35,14 @@ "inputs": { "nixpkgs": [ "nixpkgs" - ], - "utils": "utils" + ] }, "locked": { - "lastModified": 1680000368, - "narHash": "sha256-TlgC4IJ7aotynUdkGRtaAVxquaiddO38Ws89nB7VGY8=", + "lastModified": 1681746824, + "narHash": "sha256-TRe6SAYqTEyWmHwg5gpAj3arebje/OVi7z9yLqZRYqg=", "owner": "nix-community", "repo": "home-manager", - "rev": "765e4007b6f9f111469a25d1df6540e8e0ca73a6", + "rev": "ae79840bc756e97f9750fc70448ae0efc1b8dcc3", "type": "github" }, "original": { @@ -62,11 +61,11 @@ }, "locked": { "dir": "contrib", - "lastModified": 1680076741, - "narHash": "sha256-Xc4IY54hYDnHotzYGoqvdQWwi19jy6gpt0hNiw4X8r0=", + "lastModified": 1681719021, + "narHash": "sha256-edYPdId662VSpTngbFinHZDk7hbIO0T4DaIG75QdOoA=", "owner": "neovim", "repo": "neovim", - "rev": "b7748662ed5b06c12a74560690b728fdf770666f", + "rev": "53985a6d31cc60d4b2d7a7af91929922de9ecf4d", "type": "github" }, "original": { @@ -83,11 +82,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1680077682, - "narHash": "sha256-d8NDUvTAR5ff+RbL5hS8P2xBcTjeTyEDe6o7GiPwVPI=", + "lastModified": 1681719254, + "narHash": "sha256-bA07zWjG/4mvnXcs08Z0vwAUObpE9nsbtF4wUC0G+Bg=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "6cf1e98e9ec0b48f6f20035fbcae63ef1d6ae18e", + "rev": "d4ac0e115563dc894323947e2fd679f25bfa788a", "type": "github" }, "original": { @@ -98,11 +97,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1671983799, - "narHash": "sha256-Z2Ro6hFPZHkBqkVXY5/aBUzxi5xizQGvuHQ9+T5B/ks=", + "lastModified": 1681693905, + "narHash": "sha256-XdXMvCt+i2ZcmAIPZvu3RUwcdaC9OX7d1WMAJJokzeA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "fad51abd42ca17a60fc1d4cb9382e2d79ae31836", + "rev": "db34d7561caa508ece0265a56f382c5d3b7a6c1b", "type": "github" }, "original": { @@ -114,11 +113,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1679944645, - "narHash": "sha256-e5Qyoe11UZjVfgRfwNoSU57ZeKuEmjYb77B9IVW7L/M=", + "lastModified": 1681648924, + "narHash": "sha256-pzi3HISK8+7mpEtv08Yr80wswyHKsz+RP1CROG1Qf6s=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4bb072f0a8b267613c127684e099a70e1f6ff106", + "rev": "f294325aed382b66c7a188482101b0f336d1d7db", "type": "github" }, "original": { @@ -134,21 +133,6 @@ "neovim-nightly": "neovim-nightly", "nixpkgs": "nixpkgs_2" } - }, - "utils": { - "locked": { - "lastModified": 1676283394, - "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 230f3cd..7a7a986 100644 --- a/flake.nix +++ b/flake.nix @@ -3,9 +3,6 @@ inputs = { home-manager.inputs.nixpkgs.follows = "nixpkgs"; home-manager.url = "github:nix-community/home-manager"; - # workaround: https://github.com/nix-community/neovim-nightly-overlay/issues/164 - neovim-nightly.inputs.nixpkgs.url = - "github:nixos/nixpkgs?rev=fad51abd42ca17a60fc1d4cb9382e2d79ae31836"; neovim-nightly.url = "github:nix-community/neovim-nightly-overlay"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; };