Skip to content

Commit 60c037d

Browse files
committed
Expr.Types: mv Hashable1 NonEmpty: proper order fixes deriving inference
1 parent 5c73148 commit 60c037d

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

src/Nix/Expr/Types.hs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -318,6 +318,11 @@ type NAttrPath r = NonEmpty (NKeyName r)
318318

319319
-- ** @Binding@
320320

321+
#if !MIN_VERSION_hashable(1,3,1)
322+
-- Required by Hashable Binding deriving. There was none of this Hashable instance before mentioned version, remove this in year >2022
323+
instance Hashable1 NonEmpty
324+
#endif
325+
321326
-- | A single line of the bindings section of a let expression or of a set.
322327
data Binding r
323328
= NamedVar !(NAttrPath r) !r !SourcePos
@@ -522,11 +527,6 @@ data NExprF r
522527
instance IsString NExpr where
523528
fromString = Fix . NSym . fromString
524529

525-
#if !MIN_VERSION_hashable(1,3,1)
526-
-- Required by Hashable NExprF. There was none this Hashable before, remove this in year >2022
527-
instance Hashable1 NonEmpty
528-
#endif
529-
530530

531531
-- *** @NExpr@
532532

0 commit comments

Comments
 (0)