From 511aa640cddc32823f6291b14f5ec99364443320 Mon Sep 17 00:00:00 2001
From: Troels Henriksen <athas@sigkill.dk>
Date: Wed, 19 Jul 2023 19:48:07 +0200
Subject: [PATCH] Use newer Nix.

---
 default.nix       |  2 +-
 nix/lsp-types.nix |  4 ++--
 nix/lsp.nix       |  4 ++--
 nix/sources.json  |  6 +++---
 nix/versions.nix  | 17 -----------------
 5 files changed, 8 insertions(+), 25 deletions(-)
 delete mode 100644 nix/versions.nix

diff --git a/default.nix b/default.nix
index 9c14b16149..00fb42bd38 100644
--- a/default.nix
+++ b/default.nix
@@ -26,7 +26,7 @@ let
       haskellPackages = pkgs.haskellPackages.override {
         overrides = haskellPackagesNew: haskellPackagesOld: rec {
           versions =
-            haskellPackagesNew.callPackage ./nix/versions.nix { };
+            haskellPackagesNew.versions_6_0_1;
 
           lsp =
             haskellPackagesNew.callPackage ./nix/lsp.nix { };
diff --git a/nix/lsp-types.nix b/nix/lsp-types.nix
index f6e4a27bf3..9d59d055c4 100644
--- a/nix/lsp-types.nix
+++ b/nix/lsp-types.nix
@@ -6,8 +6,8 @@
 }:
 mkDerivation {
   pname = "lsp-types";
-  version = "2.0.0.1";
-  sha256 = "87f150940640524c8ec8f4d7e630774077dcfbbeed8afa0032501aed33333c85";
+  version = "2.0.1.0";
+  sha256 = "57406c159d14aa30b3d8e5f48ca713186b340f668c93e940e884387fe561ffe0";
   isLibrary = true;
   isExecutable = true;
   libraryHaskellDepends = [
diff --git a/nix/lsp.nix b/nix/lsp.nix
index b7911d72a8..84fb67c128 100644
--- a/nix/lsp.nix
+++ b/nix/lsp.nix
@@ -7,8 +7,8 @@
 }:
 mkDerivation {
   pname = "lsp";
-  version = "2.0.0.0";
-  sha256 = "af73311e471a1d929858e6ba05c11cc950da4bb565286e9dee3b35a0095e11e6";
+  version = "2.1.0.0";
+  sha256 = "c8a7a2b82d074641c77894639bdd5aacae5046610ee8d6b8a74b0cf71c4af30d";
   isLibrary = true;
   isExecutable = true;
   libraryHaskellDepends = [
diff --git a/nix/sources.json b/nix/sources.json
index 89c3c181ae..6c96eac576 100644
--- a/nix/sources.json
+++ b/nix/sources.json
@@ -17,10 +17,10 @@
         "homepage": "",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c5450f0b3c7890c860216cd3f56a4e5d53a04134",
-        "sha256": "1api3z11cjmhva6mr0yhla3gyyz8cj20lr61xlgclqbi2d3m3xf1",
+        "rev": "f912309722e0e94f8f29160b4161b93d487f10b9",
+        "sha256": "1w670p2ddq1kgkyicax0iq4six0zfyhra054xxgwiqg2vi44m2if",
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/c5450f0b3c7890c860216cd3f56a4e5d53a04134.tar.gz",
+        "url": "https://github.com/NixOS/nixpkgs/archive/f912309722e0e94f8f29160b4161b93d487f10b9.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     }
 }
diff --git a/nix/versions.nix b/nix/versions.nix
deleted file mode 100644
index 6aa4daac64..0000000000
--- a/nix/versions.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ mkDerivation, base, deepseq, hashable, lib, megaparsec, microlens
-, parser-combinators, tasty, tasty-hunit, text
-}:
-mkDerivation {
-  pname = "versions";
-  version = "6.0.0";
-  sha256 = "d7df2b918522f31cc2d555ac626fa200b57e98fa2f70976c3541ed68a8d268b1";
-  libraryHaskellDepends = [
-    base deepseq hashable megaparsec parser-combinators text
-  ];
-  testHaskellDepends = [
-    base megaparsec microlens tasty tasty-hunit text
-  ];
-  homepage = "https://github.com/fosskers/versions";
-  description = "Types and parsers for software version numbers";
-  license = lib.licenses.bsd3;
-}