From 9d25b3ee9b3c4a6198c20361ebb488260cf4b92e Mon Sep 17 00:00:00 2001
From: teutat3s <teutates@mailbox.org>
Date: Sun, 14 Aug 2022 14:24:53 +0200
Subject: [PATCH] Fix build of rnix-lsp for nix verion 2.10+

This fix didn't land in a released tag of rnix-lsp
yet.
Build it from the master branch until next release
Upstream PR:
https://github.com/nix-community/rnix-lsp/pull/94

Also bump flake.lock
---
 flake.lock            | 45 ++++---------------------------------------
 overlays/rnix-lsp.nix | 18 +++++++++++++++++
 2 files changed, 22 insertions(+), 41 deletions(-)
 create mode 100644 overlays/rnix-lsp.nix

diff --git a/flake.lock b/flake.lock
index f6a8edfc..2e4bdbcd 100644
--- a/flake.lock
+++ b/flake.lock
@@ -314,21 +314,6 @@
       }
     },
     "flake-utils_4": {
-      "locked": {
-        "lastModified": 1656928814,
-        "narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "flake-utils_5": {
       "locked": {
         "lastModified": 1649676176,
         "narHash": "sha256-OWKJratjt2RW151VUlJPRALb7OU2S5s+f0vLj4o1bHM=",
@@ -416,27 +401,6 @@
         "type": "github"
       }
     },
-    "nix-dram": {
-      "inputs": {
-        "flake-utils": "flake-utils_4",
-        "nixpkgs": [
-          "latest"
-        ]
-      },
-      "locked": {
-        "lastModified": 1660180791,
-        "narHash": "sha256-oPO+keK4S9daL9ubU51hZ+QOWVSMbZ56F20iFI9Px3s=",
-        "owner": "dramforever",
-        "repo": "nix-dram",
-        "rev": "ae7f0b7c5d39eec5941fe21e9f202106bdea9ac2",
-        "type": "github"
-      },
-      "original": {
-        "owner": "dramforever",
-        "repo": "nix-dram",
-        "type": "github"
-      }
-    },
     "nixlib": {
       "locked": {
         "lastModified": 1636849918,
@@ -489,11 +453,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1660291411,
-        "narHash": "sha256-9UfJMJeCl+T/DrOJMd1vLCoV8U3V7f9Qrv/QyH0Nn28=",
+        "lastModified": 1660407119,
+        "narHash": "sha256-04lWO0pDbhAXFdL4v2VzzwgxrZ5IefKn+TmZPiPeKxg=",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "78f56d8ec2c67a1f80f2de649ca9aadc284f65b6",
+        "rev": "12620020f76b1b5d2b0e6fbbda831ed4f5fe56e1",
         "type": "github"
       },
       "original": {
@@ -565,7 +529,7 @@
     "nvfetcher": {
       "inputs": {
         "flake-compat": "flake-compat_3",
-        "flake-utils": "flake-utils_5",
+        "flake-utils": "flake-utils_4",
         "nixpkgs": [
           "nixos"
         ]
@@ -621,7 +585,6 @@
         "home": "home",
         "latest": "latest_2",
         "naersk": "naersk",
-        "nix-dram": "nix-dram",
         "nixos": "nixos",
         "nixos-generators": "nixos-generators",
         "nixos-hardware": "nixos-hardware",
diff --git a/overlays/rnix-lsp.nix b/overlays/rnix-lsp.nix
new file mode 100644
index 00000000..62c0f2b0
--- /dev/null
+++ b/overlays/rnix-lsp.nix
@@ -0,0 +1,18 @@
+final: prev: {
+  rnix-lsp = prev.rnix-lsp.overrideAttrs (oldAttrs: rec {
+    version = "unstable-2022-07-28";
+
+    src = prev.fetchFromGitHub {
+      owner = "nix-community";
+      repo = "rnix-lsp";
+      rev = "ff18e04551a39ccdab0ff9c83926db3807b23478";
+      sha256 = "sha256-4OIpATLdPQvryyhRQPELeqNYC0n6PCyjD6LCPdwOztc=";
+    };
+
+    cargoDeps = oldAttrs.cargoDeps.overrideAttrs (prev.lib.const {
+      name = "rnix-lsp-vendor.tar.gz";
+      inherit src;
+      outputHash = "sha256-SroynaHaFpvKlMSEagoGQhZcY7A0tE4xTbUXYFcneo8=";
+    });
+  });
+}