Richard Marko
24c74f26c3
hnix.cabal: add tests/files to extra-source-files
...
Better add all of them so we don't accidentally hit
this again when we add tests using other than findFile.nix.
Closes #612 .
2020-06-03 14:41:30 +03:00
Simon Jakobi
9c6003ae8b
Use haskeline-0.8 ( #540 )
...
The `MonadException` class was removed in favor of `MonadCatch`, so we
can remove its instances, enabling us to remove the library dependency
on haskeline.
To simplify dependency resolution with GHC < 8.10, this also disables
the executable in that configuration.
2020-05-30 03:32:20 +02:00
Simon Jakobi
707060260a
Clean up hashing-related dependencies ( #597 )
...
Background: https://github.com/haskell-nix/hnix/issues/588#issuecomment-634692400
2020-05-30 02:28:50 +02:00
John Wiegley
05aaec56b5
Bump version to 0.8.0
2020-05-29 11:26:16 -07:00
Simon Jakobi
726dc96b05
Allow http-client-0.7 ( #596 )
...
Changelog:
http://hackage.haskell.org/package/http-client-0.7.0/changelog
Tested by building with
cabal test -w ghc-8.8.3
2020-05-27 15:06:50 +03:00
hyperfekt
111937ba58
allow aeson 1.5 & these 1.1 ( #595 )
...
aeson 1.5.1 depends on these 1.1, so allowing a newer version is
necessary to prevent a conflict.
"
I saw in https://github.com/haskell-nix/hnix/issues/551#issuecomment-633953865 that a bump of aeson was wished before the 0.7.2 release would be cut, so here it is.
At a glance, there don't seem to be any relevant changes:
https://hackage.haskell.org/package/aeson-1.5.0.0/changelog
https://github.com/bos/aeson/compare/1.4.7.1-r1...1.5.0.0
But 1.5.1 requires a bump to these to avoid diamond dependencies.
Changes also seem irrelevant and just related to the change in aeson:
https://hackage.haskell.org/package/these-1.1/changelog
https://github.com/isomorphism/these/compare/v1...v1.1 (most changes here are in other packages in the same repository)
These changes compile fine and tests are successful with GHC 8.8.3.
"
2020-05-27 12:16:20 +03:00
Simon Jakobi
a2b9980e2c
Fix build failure in Nix.Var ( #587 )
...
The `Refl` constructor had previously been re-exported from
`Data.GADT.Compare`.
This also replaces the dependency on `dependent-sum` with `some`,
where the `Data.GADT.Compare` module is now defined.
Tested by building locally with GHC 8.4.4, 8.6.5 and 8.8.3 in `cabal`.
Fixes #585 .
2020-05-25 20:28:26 +03:00
Anton-Latukha
90d688747c
dep: upd dependent-sum (0.6->0.7)
...
"breaking change in 0.6.2.1/0.6.2.2 and properly do major version bump to
reflect the breaking change"
Changelog: https://hackage.haskell.org/package/dependent-sum-0.7.1.0/changelog
0.7.1.0 - 2020-03-25
Shift version bounds for some to 1.0.1.* versions.
0.7.0.0 - 2020-03-24
Fix ChangeLog to include the breaking change in 0.6.2.1/0.6.2.2 and properly do major version bump to reflect the breaking change.
0.6.2.2 - 2020-03-23
Update GitHub repository in cabal metadata.
0.6.2.1 - 2020-03-21
(Breaking change) Removed modules Data.GADT.Compare, Data.GADT.Show, Data.Some and now re-export them from the some package. This forced some deprecations to be fully realized.
Update cabal meta-information (tested with GHC 8.8).
"This forced some deprecations to be fully realized." - it compiles, so
those functions was not used in HNix.
M hnix.cabal
2020-05-20 05:31:33 +03:00
Simon Jakobi
8341c1b4ac
Allow hnix-store-core 0.2
2020-05-15 17:48:39 -07:00
Anton-Latukha
65ece58d2d
Allow pretty-show 1.11
...
M hnix.cabal
[The previous release of the package](https://hackage.haskell.org/package/pretty-show-1.9.5 ) (v 1.9.5, date `Dec 27 16:54:42 UTC 2018`, [tree](1b484f4b16
)).
[Curren release](https://hackage.haskell.org/package/pretty-show-1.10 ) (v1.10, date `Thu Jan 30 19:08:20 UTC 2020`, [tree](0ff7959238
)).
Diff is: 1b484f4b16..0ff7959238
Source changes prove [changelog](https://hackage.haskell.org/package/pretty-show-1.10/changelog ) statement:
```text
Changes in 1.10
* Add support for quasi-quotes, as the preferred way of dealing
with non-properly showable things.
```
is true.
Tests are passing.
2020-05-15 17:33:04 -07:00
John Wiegley
9f1519d9ca
Bump version to 0.7.1
2020-03-03 13:14:20 -08:00
Simon Jakobi
1b6ab11a53
Allow prettyprinter 1.6
2020-03-03 13:14:02 -08:00
John Wiegley
24049aa7b1
Bump version to 0.7.0
2020-03-03 13:01:36 -08:00
John Wiegley
583c048e15
Update version to 0.7.0
2020-03-02 14:56:15 -08:00
John Wiegley
9d63f952e9
Merge remote-tracking branch 'sjakobi/ghc-gte-8.4'
2020-01-13 18:13:37 -08:00
Simon Jakobi
6c9c7c310c
Remove unused dependency on regex-tdfa-text
2019-12-05 16:25:55 +01:00
Simon Jakobi
8ce466ee80
Allow megaparsec-8
2019-11-09 20:23:42 -08:00
Simon Jakobi
e22882489c
Allow prettyprinter-1.5
2019-11-09 20:23:25 -08:00
Simon Jakobi
57d63aa381
Allow parser-combinators-1.1.*
...
This fixes `nix-build`.
2019-10-22 10:02:59 -07:00
Simon Jakobi
7603e3634c
Simplify hnix.cabal some more
2019-10-22 00:27:44 +02:00
Simon Jakobi
5c8c1cc16f
We unconditionally depend on deepseq >= 1.4.3 now
2019-10-22 00:18:12 +02:00
Simon Jakobi
5f4cef9922
We unconditionally have hashable >= 1.2.5 now
2019-10-22 00:03:52 +02:00
Simon Jakobi
3d6f34f280
Simplify conditional build-depends
2019-10-22 00:03:39 +02:00
Simon Jakobi
8ed7d765dd
Require base >= 4.11
...
There were multiple build failures with GHC-8.2 due
to (<>) and Semigroup not being in scope.
2019-10-21 23:46:35 +02:00
Simon Jakobi
2df4986aa6
Bump bounds for regex-tdfa, semialign and semialign-indexed
2019-10-21 14:44:47 -07:00
Simon Jakobi
e2d2543951
Allow prettyprinter-1.4.0
2019-10-21 08:52:05 -07:00
quasicomputational
91262e7602
Allow most recent versions of dependencies.
...
The only actual breaking change affecting `hnix` is `these` splitting
into three packages and renaming some things. Otherwise, as the
package should work fine with either the newer or older versions, I
have left the previous bounds in place and added the new ones
disjunctively.
This will help somewhat with #494 .
2019-09-06 13:19:14 -07:00
John Wiegley
38219591d4
Bump version to 0.6.1
2019-04-18 17:45:48 -07:00
John Wiegley
9e22c63bd5
Simplify Standard.hs further by creating Nix.Utils.Fix1
2019-03-23 00:49:03 -07:00
John Wiegley
77c52fd43c
Revise Nix.Standard
2019-03-23 00:49:03 -07:00
Greg Hale
8029d6c2cd
Tweak cabal file and default.nix for ghc844 support
2019-03-21 09:13:00 -04:00
Greg Hale
522b24e969
Fix dependency bounds
2019-03-19 21:52:55 -04:00
Greg Hale
ccfaae70fe
Add conservative dependency bounds to all dependencies
2019-03-19 21:20:05 -04:00
John Wiegley
2c0c896871
Everything compiling again, but 25 tests failing
2019-03-18 17:30:31 -07:00
John Wiegley
df3e79d945
Port over most of Builtins.hs
2019-03-18 15:27:12 -07:00
John Wiegley
522585a7f1
Begin work on harmonizing the two different value representations
2019-03-18 11:41:46 -07:00
John Wiegley
f5d070af16
Bump version to 0.6.0
2019-03-17 23:07:27 -07:00
John Wiegley
18c49f6a0d
Reorganize code in Nix.Value, creating new Nix.Value.Equal
2019-03-17 22:44:22 -07:00
John Wiegley
7b5d134d22
Factor out FreshIdT from Standard
2019-03-17 19:04:38 -07:00
John Wiegley
015ced236e
Simplify Standard by splitting off Cited.Basic
2019-03-17 18:43:23 -07:00
John Wiegley
145e69c9a4
Further work on Standard.hs
2019-03-15 22:54:29 -07:00
John Wiegley
209a9ae9a5
Create Nix/Thunk/Standard.hs
2019-03-15 17:59:38 -07:00
John Wiegley
e9236aa55c
Now down to Main.hs and the tests
2019-03-15 17:20:10 -07:00
John Wiegley
28a1410013
Split off NCited into its own file
2019-03-12 07:21:24 -07:00
John Wiegley
3cb9834792
Begin abstracting the thunk/value data representation
2019-03-11 22:41:56 -07:00
John Wiegley
39fd51c1a8
Split Nix.Thunk into Nix.Var, Nix.Thunk and Nix.Thunk.Basic
...
This is in preparation for further generalization of the thunk/value scheme
used by the execution code.
2019-03-11 08:42:46 -07:00
John Ericson
5ddb79009d
Depend on hnix-store-core and use it for printHash32
2019-03-10 08:59:05 -07:00
John Wiegley
eae6bf542f
Split MonadFreshId off into its own file
2019-03-10 08:58:27 -07:00
John Wiegley
23aae87db7
Merge pull request #463 from kmicklas/remove-hspec-discover
...
Remove unused dependency on hspec-discover
2019-03-10 08:35:13 -07:00
Ken Micklas
81f702f98d
Remove unused dependency on hspec-discover
2019-03-09 22:33:32 -05:00