picnoir
/
hnix
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
2,002 Commits 1 Branch 0 Tags 3.5 MiB
Commit Graph

232 Commits

Author SHA1 Message Date
Anton-Latukha ffc82fc97e
clean-up: LANGUAGE pragmas 
M  Setup.hs
M  main/Repl.hs
M  src/Nix/Builtins.hs
M  src/Nix/Cache.hs
M  src/Nix/Cited.hs
M  src/Nix/Cited/Basic.hs
M  src/Nix/Convert.hs
M  src/Nix/Exec.hs
M  src/Nix/Expr/Types.hs
M  src/Nix/Expr/Types/Annotated.hs
M  src/Nix/Lint.hs
M  src/Nix/Normal.hs
M  src/Nix/Pretty.hs
M  src/Nix/Render/Frame.hs
M  src/Nix/Scope.hs
M  src/Nix/TH.hs
M  src/Nix/Thunk.hs
M  src/Nix/Thunk/Basic.hs
M  src/Nix/Utils.hs
M  src/Nix/Value.hs
M  src/Nix/Value/Equal.hs
 2020-09-14 20:54:37 +03:00
Simon Jakobi 54030284fa Update to data-fix-0.3 
Changelog: http://hackage.haskell.org/package/data-fix-0.3.0/changelog

Context: https://github.com/commercialhaskell/stackage/issues/5535
 2020-07-24 12:35:59 +03:00
Richard Marko 06edd4b8cf builtins.nixVersion: version 2.0 -> 2.3 
Nixpkgs now has minimum required version 2.2, this allows us to
import it again.
 2020-07-11 19:18:07 +03:00
Simon Jakobi 220209c090
Use neat-interpolation instead of interpolate (#635) 
In addition to `interpolate`, this also removes the following
transitive dependencies:

 - `haskell-src-exts`
 - `haskell-src-meta`
 - `safe`
 - `th-expand-syns`
 - `th-lift`
 - `th-lift-instances`
 - `th-orphans`
 - `th-reify-many`

Since `neat-interpolation`'s `text` quasiquoter trims more whitespace
than `interpolate`'s `i`, the expected output of some tests for
`unsafeGetAttrPos` had to be updated.

This also improves the test failure output of the `constantEqual`
helper.

Fixes #634.
 2020-06-27 10:43:50 +02:00
Anton-Latukha b72bfe86c9
src/Nix/Builtins.hs: clean-up imports 
M  src/Nix/Builtins.hs
 2020-06-03 02:37:39 +03: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
Richard Marko c61abbe6c0 pretty derivation builtin nix 2020-05-15 17:50:21 -07:00
Silvan Mosberger f682907c97 Make URI's be separate from strings 2020-05-15 17:49:11 -07:00
Guillaume Maudoux 45c72cd20e fixup: undo spurious space change 2019-11-26 14:32:29 -07:00
Guillaume Maudoux 4ded48a789 Add proper default 'nix' prefix to search paths 
The search path of Nix contains by default the "nix" prefix that points
to $datadir/nix/corepkgs, where $datadir defaults to $prefix/lib at
installation time, but can be overriden by NIX_DATA_DIR.

We implemented it using `Paths.hnix.getDataDir` and `NIX_DATA_DIR` to
follow Nix behaviour as closely as possible.

A small discrepancy is that we do the lookup on each invocation, where
Nix caches the searchPath at context creation.
 2019-11-26 14:32:29 -07:00
Félix Baylac-Jacqué cacbfdbd6d Builtins: add builtins.concatMap 
Fixes #448
 2019-04-01 15:45:27 -07:00
John Wiegley 4607639774 Remove the NValueNF type, as it provides little utility 2019-03-27 21:16:01 -07:00
John Wiegley 77c52fd43c Revise Nix.Standard 2019-03-23 00:49:03 -07:00
Shea Levy e4b5e557e9
Bring up-to-date with hnix-store-core 0.1.0.0. 2019-03-19 03:48:13 -04:00
John Wiegley 39e42c9df7
All the tests now pass 2019-03-18 18:55:59 -07:00
John Wiegley 769a40e643
Down to 3 failures 2019-03-18 18:31:36 -07:00
John Wiegley 77d67b106c
8 test failures remaining 2019-03-18 18:20:07 -07:00
John Wiegley 2c0c896871
Everything compiling again, but 25 tests failing 2019-03-18 17:30:31 -07:00
Ryan Trinkle 9cc17a5c78 Fix all' issue in Builtins.hs 2019-03-18 19:27:04 -04:00
John Wiegley bf4ecb6f08
Almost all of Builtins.hs ported 2019-03-18 15:40:15 -07:00
John Wiegley df3e79d945
Port over most of Builtins.hs 2019-03-18 15:27:12 -07:00
John Wiegley 439ae6ce0d
More work toward harmonization; now down to porting Builtins 2019-03-18 14:01:48 -07:00
John Wiegley 522585a7f1
Begin work on harmonizing the two different value representations 2019-03-18 11:41:46 -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 895f4e721f
Merge remote-tracking branch 'origin/vs-context-primops' 2019-03-17 15:44:05 -07:00
John Wiegley aa66560bf7
Get rid of implicit conversions to and from thunks 2019-03-17 15:30:20 -07:00
John Wiegley 94e0be3882
Reformat all sources with Brittany, to restore consistency 2019-03-17 14:47:38 -07:00
John Wiegley 8cfb965e99
Restore the previous behavior of genericClosure 2019-03-17 14:18:57 -07:00
John Wiegley 88c81ceafe
Whitespace changes 2019-03-17 13:33:54 -07:00
John Wiegley ad8b4a9257
Remove some unnused code 2019-03-16 23:42:48 -07:00
John Wiegley 5c10be3e3b
More cleanup, get rid of the Eq and Ord instances for NValue' 
They had dubious semantics anyway; there is now only valueEqM and valueNFEq.
 2019-03-16 23:35:16 -07:00
John Wiegley 492a3ae0bc
Factor out thunk id representation into its own class, MonadThunkId 2019-03-16 16:23:40 -07:00
John Wiegley 9405074cd8
Fix hnix-tests 2019-03-16 14:41:25 -07:00
John Wiegley e9236aa55c
Now down to Main.hs and the tests 2019-03-15 17:20:10 -07:00
John Wiegley c9f4e40ec0
Get most of Builtins.hs type checking again 2019-03-15 14:33:03 -07:00
John Wiegley 483dded8db
Begin work in Builtins.hs 2019-03-15 13:27:11 -07:00
John Wiegley 107f29d3fd
Move certain constraints from MonadThunk to the BasicThunk instance 2019-03-11 13:55:40 -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 Wiegley 7bb233cb2b
Merge branch 'master' into vs-context-primops 2019-03-10 13:54:43 -07:00
Ken Micklas 765b2f9cfc Return string instead of context in appendContext 2019-03-10 16:41:00 -04:00
Ken Micklas 45400aae58 Allow missing keys in appendContext 2019-03-10 16:21:31 -04:00
Ken Micklas 37152002b0 Implement appendContext 2019-03-10 15:45:53 -04:00
Emmanuel Denloye-Ito c51d966d44 Add tests for mapAttrs and changed hackyMakeNixStringWithoutContext to principledMakeNixStringWithoutContext in Builtins.hs 2019-03-10 11:17:36 -07:00
Emmanuel Denloye-Ito 586f1de62d Less than test (#461) 
References issue #438 

Co-authored-by: John Wiegley <johnw@newartisans.com>
 2019-03-10 11:16:36 -07:00
Ken Micklas 22048ccc89 Clean up syntax in getContext 2019-03-10 14:09:29 -04:00
Ken Micklas 718c94e0bb Merge branch 'master' into vs-context-primops 2019-03-10 13:48:58 -04:00
Emily Pillmore f3970d49b9
Add principled 'fetchurl' + tests 
Tests are masked until store work is done
 2019-03-10 10:07:03 -07:00
John Ericson 5ddb79009d Depend on hnix-store-core and use it for `printHash32` 2019-03-10 08:59:05 -07:00
Vaibhav Sagar 4b8dff9aa8 Nix.Builtins: add getContext and appendContext primops 2019-03-09 19:30:56 -05:00
Ryan Trinkle 4e9ec1a964 Improve error message in case `read` fails in splitVersion 2019-03-09 15:55:31 -05:00