haskellPackages.hnix: drop obsolete patch

This commit is contained in:
sternenseemann 2022-01-22 01:18:47 +01:00
parent 3c20f80ae5
commit b2f63fbd6f
2 changed files with 2 additions and 26 deletions

View file

@ -182,7 +182,7 @@ self: super: {
digit = doJailbreak super.digit;
# hnix.patch needed until the next release is bumped
hnix = appendPatch ./patches/hnix.patch (generateOptparseApplicativeCompletion "hnix"
hnix = generateOptparseApplicativeCompletion "hnix"
(overrideCabal (drv: {
# 2020-06-05: HACK: does not pass own build suite - `dontCheck`
doCheck = false;
@ -190,7 +190,7 @@ self: super: {
# needs newer version of relude and semialign than stackage has
relude = self.relude_1_0_0_1;
semialign = self.semialign_1_2_0_1;
})));
}));
# Fails for non-obvious reasons while attempting to use doctest.
focuslist = dontCheck super.focuslist;

View file

@ -1,24 +0,0 @@
From 06b12ab8a733d4de2a39060ba29c06e4ec1c1187 Mon Sep 17 00:00:00 2001
From: Anton Latukha <anton.latukha@gmail.com>
Date: Sun, 16 Jan 2022 18:16:50 +0200
Subject: [PATCH] fix aeson <2 support
---
src/Nix/Json.hs | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/Nix/Json.hs b/src/Nix/Json.hs
index 3fe05269..329899e4 100644
--- a/src/Nix/Json.hs
+++ b/src/Nix/Json.hs
@@ -9,6 +9,8 @@ import qualified Data.Text.Lazy.Encoding as TL
#if MIN_VERSION_aeson(2,0,0)
import qualified Data.Aeson.Key as AKM
import qualified Data.Aeson.KeyMap as AKM
+#else
+import Nix.Expr.Types
#endif
import qualified Data.Vector as V
import Nix.Atoms
--
2.34.1