Skip to content

Commit 369e56d

Browse files
committed
Nix: nixEval: change arg order
1 parent 599150e commit 369e56d

File tree

2 files changed

+18
-6
lines changed

2 files changed

+18
-6
lines changed

ChangeLog.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,22 @@ Breaking:
2121
* `Nix.Types.Assumption`:
2222
* added instances:
2323
* `Assumption`: `{Semigroup,Monoid,One}`
24+
2425
* `Nix.Type.Env`:
2526
* added instances:
2627
* `Env`: `{Semigroup,Monoid,One}`
28+
* `Nix`:
29+
* changed argument order:
30+
* `nixEval`:
31+
32+
```haskell
33+
-- was:
34+
=> Maybe FilePath -> Transform g (m a) -> Alg g (m a) -> Fix g -> m a
35+
-- became:
36+
=> Transform g (m a) -> Alg g (m a) -> Maybe FilePath -> Fix g -> m a
37+
```
38+
39+
2740

2841

2942
### [(diff)](https://github.com/haskell-nix/hnix/compare/0.13.0.1...0.13.1#files_bucket) 0.13.1 (2021-05-22)

src/Nix.hs

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,20 +55,20 @@ import Nix.XML
5555
-- transformations, allowing them to be easily composed.
5656
nixEval
5757
:: (MonadNix e t f m, Has e Options, Functor g)
58-
=> Maybe FilePath
59-
-> Transform g (m a)
58+
=> Transform g (m a)
6059
-> Alg g (m a)
60+
-> Maybe FilePath
6161
-> Fix g
6262
-> m a
63-
nixEval mpath xform alg = withNixContext mpath . adi alg xform
63+
nixEval transform alg mpath = withNixContext mpath . adi alg transform
6464

6565
-- | Evaluate a nix expression in the default context
6666
nixEvalExpr
6767
:: (MonadNix e t f m, Has e Options)
6868
=> Maybe FilePath
6969
-> NExpr
7070
-> m (NValue t f m)
71-
nixEvalExpr mpath = nixEval mpath id Eval.eval
71+
nixEvalExpr = nixEval id Eval.eval
7272

7373
-- | Evaluate a nix expression in the default context
7474
nixEvalExprLoc
@@ -77,9 +77,8 @@ nixEvalExprLoc
7777
=> Maybe FilePath
7878
-> NExprLoc
7979
-> m (NValue t f m)
80-
nixEvalExprLoc mpath =
80+
nixEvalExprLoc =
8181
nixEval
82-
mpath
8382
Eval.addMetaInfo
8483
Eval.evalContent
8584

0 commit comments

Comments
 (0)