From 1f57d3e7224290eebda23fa1c79718d6b8361574 Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Sun, 27 Mar 2022 12:11:28 +0200
Subject: [PATCH] nix-linter: 0.2.0.3 -> 0.2.0.4

---
 pkgs/development/haskell-modules/configuration-common.nix | 5 +++++
 pkgs/development/tools/analysis/nix-linter/default.nix    | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 271c2acd7eb1..8c2e5c32df13 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -2596,6 +2596,11 @@ self: super: {
   # Fixes test suite with modern-uri 0.3.4.3, waiting for Stackage LTS to follow suit
   mmark = doDistribute self.mmark_0_0_7_5;
 
+  # https://github.com/Synthetica9/nix-linter/issues/65
+  nix-linter = super.nix-linter.overrideScope (self: super: {
+    aeson = self.aeson_1_5_6_0;
+  });
+
   # Test suite doesn't support hspec 2.8
   # https://github.com/zellige/hs-geojson/issues/29
   geojson = dontCheck super.geojson;
diff --git a/pkgs/development/tools/analysis/nix-linter/default.nix b/pkgs/development/tools/analysis/nix-linter/default.nix
index 1a6539520d73..cd3374262370 100644
--- a/pkgs/development/tools/analysis/nix-linter/default.nix
+++ b/pkgs/development/tools/analysis/nix-linter/default.nix
@@ -21,13 +21,13 @@
 
 mkDerivation rec {
   pname = "nix-linter";
-  version = "0.2.0.3";
+  version = "0.2.0.4";
 
   src = fetchFromGitHub {
     owner = "Synthetica9";
     repo = "nix-linter";
-    rev = "38c4a14681cf3a1e6f098d8b723db503910a28d8";
-    sha256 = "16igk4xnm4mg9mw0zg2zk6s44axia3fs6334fasvjy0c7cjwk4c7";
+    rev = "ecdd50750fd3ffaff83c0637474b884a0c38f8b9";
+    sha256 = "0hm6iaamh1wlvqk8z4yfh4idgbclbsimxhlgflwz2hnv9mm12sf1";
   };
 
   isLibrary = false;