Commit graph

1345 commits

Author SHA1 Message Date
Ryan Trinkle 07dd6ac3f3
Merge pull request #403 from haskell-nix/abstract-scopes
Abstract out IO and some scoping stuff
2018-11-18 15:31:05 -05:00
Ryan Trinkle df8e58d4e5 Merge remote-tracking branch 'origin/master' into abstract-scopes 2018-11-18 15:16:54 -05:00
Ryan Trinkle 0a82ab26ce Merge remote-tracking branch 'origin/pending' into abstract-scopes 2018-11-18 15:04:30 -05:00
Ryan Trinkle 42afdc21da Try to enable hydra testing of "pending" branch 2018-11-18 14:30:21 -05:00
Ryan Trinkle c1fd6245d0 Disable old and broken tests for hydra 2018-11-18 14:29:32 -05:00
John Wiegley b47bd010e2
Merge pull request #401 from haskell-nix/readme-eval-nixpkgs-cmd
Add command for evaluating nixpkgs
2018-11-18 11:07:21 -08:00
Doug Beardsley 6f9472f050 Add command for evaluating nixpkgs 2018-11-18 11:44:52 -05:00
Doug Beardsley b8b3a8e4f4 Disable ghcjs builds for duration of hackathon 2018-11-18 08:51:38 -05:00
Doug Beardsley 602c673cba
Merge pull request #397 from haskell-nix/coerceToString-boolean-blindness
Create data types to avoid coerceToString boolean blindness
2018-11-17 19:00:29 -05:00
Ryan Trinkle 68b26dad4e Expose the nixpkgs we're using (jobsets.nix uses) 2018-11-17 18:48:37 -05:00
Ryan Trinkle 17768c9a02 Add jobsets.nix 2018-11-17 18:43:22 -05:00
Ken Micklas 3beeaa6a79 Add and use fromStringNoContext 2018-11-17 18:40:22 -05:00
Ken Micklas ff1166aba6 replace *StringIgnoreContextMaybe with more accurate *GetStringNoContext 2018-11-17 18:40:22 -05:00
Ken Micklas 340e97e8d3 Use principledStringIngoreContextMaybe for builtins.compareVersions 2018-11-17 18:40:22 -05:00
Ken Micklas 306d710527 Use principled* functions for builtins.splitVersion 2018-11-17 18:40:22 -05:00
Ken Micklas a488e9aa5c Add principledStringIgnoreContextMaybe 2018-11-17 18:40:22 -05:00
Ken Micklas 124f7165e4 Add principledStringMempty 2018-11-17 18:40:22 -05:00
Ken Micklas a0a89248e9 Use principledMakeNixStringWithoutContext in assembleString 2018-11-17 18:40:22 -05:00
Ken Micklas c9071db5bc Use custom force for isDerivation instead of relying on valueEq 2018-11-17 18:40:22 -05:00
Ken Micklas a7bdda4912 Ignore context when comparing strings 2018-11-17 18:40:22 -05:00
Ken Micklas ff16557e34 Add principledStringIgnoreContext 2018-11-17 18:40:22 -05:00
Ken Micklas 8dc1762f8e Use curry and LambdaCase for valueEq 2018-11-17 18:40:22 -05:00
Ken Micklas a6ab1d4e27 Use principledMakeNixStringWithoutContext in Nix.Pretty 2018-11-17 18:40:22 -05:00
Ken Micklas be8390ac79 Remove unused valueText and valueTextNoContext functions 2018-11-17 18:40:22 -05:00
Doug Beardsley 50b907861a
Merge pull request #395 from haskell-nix/require-at-least-ghc84
Disable GHC 8.0 and 8.2 in CI
2018-11-17 18:28:01 -05:00
Doug Beardsley 4edcda00e4 Create data types to avoid coerceToString boolean blindness 2018-11-17 18:26:10 -05:00
Ryan Trinkle e6886143ed Fix declarative hydra config 2018-11-17 17:48:27 -05:00
Doug Beardsley 7d7ddf5848 Disable GHC 8.0 and 8.2 in CI
If we really want this support, we can add it back later.  Doing this
now to speed up turnaround time during weekend hackathon.
2018-11-17 17:30:08 -05:00
Ryan Trinkle 337a1f31a0 Add hydra configuration 2018-11-17 17:27:35 -05:00
Doug Beardsley 5fb9dae34c
Merge pull request #393 from haskell-nix/coerceToString-returns-nix-string
Make coerceToString return NixString
2018-11-17 17:05:58 -05:00
Doug Beardsley ba7fc3446d Remove hackyModifyNixContents 2018-11-17 16:23:41 -05:00
Ryan Trinkle d60130c566 Abstract Scopes 2018-11-17 16:21:03 -05:00
Ken Micklas ec03b08d5b Add tests for null and empty string comparison 2018-11-17 16:19:18 -05:00
Doug Beardsley cda7345647 Merge remote-tracking branch 'origin/pending' into coerceToString-returns-nix-string 2018-11-17 16:15:06 -05:00
Doug Beardsley d949b9c1e1 Make coerceToString return NixString 2018-11-17 16:08:02 -05:00
Ken Micklas f617e790a4 Make null and empty string not equal
Fixes #391.
2018-11-17 16:02:27 -05:00
Ken Micklas b7ad125c46 Remove hackyStringMappend 2018-11-17 13:52:15 -05:00
Ken Micklas 4018fd0ccf Change the only use of hackyStringMConcat to principledStringMConcat 2018-11-17 13:51:47 -05:00
Doug Beardsley f01ba97edf Export principledStringMappend 2018-11-17 13:29:34 -05:00
Doug Beardsley 2d36ccbdf5 Issue #387, hackyStringMappend 2018-11-17 13:04:08 -05:00
Doug Beardsley 6f322dfdd6 Merge branch 'master' into pending 2018-11-17 12:54:43 -05:00
Ryan Trinkle e6b189e69b Eliminate MonadIO from MonadEffects instance for Lazy 2018-11-16 21:30:55 -05:00
Ryan Trinkle c655bdb9f2 Factor out MonadIntrospect 2018-11-16 21:30:55 -05:00
Ryan Trinkle 32850cd23e Factor out instantiate and exec 2018-11-16 21:30:51 -05:00
Ryan Trinkle 7f964f8d21 WIP: Eliminate pathExists in favor of doesFileExist
Needs approval from @gbwey9

TODO:
* Actually get rid of pathExists
2018-11-16 17:29:14 -05:00
Ryan Trinkle 5acd886aca Factor out MonadEnv 2018-11-16 17:17:42 -05:00
Ryan Trinkle c2be721454 Factor out HTTP requests 2018-11-16 17:17:38 -05:00
Ryan Trinkle cc7a97b545 Factor out printing text 2018-11-16 17:17:34 -05:00
Ryan Trinkle 2884c4f918 Factor out filesystem functionality into MonadFile 2018-11-16 15:16:17 -05:00
Ryan Trinkle 02e057c5c0 Factor out addPath and toFile_ into MonadStore class 2018-11-16 14:50:58 -05:00