Commit graph

213 commits

Author SHA1 Message Date
Anton-Latukha 8538d3a763
default.nix: expose additional part of Nixpkgs haskell.lib API
M  default.nix
2020-06-03 02:11:34 +03:00
Anton-Latukha e249cac73e
default.nix: off enableSharedExecutables | rare feature, not passes macOS tests
This feature seems to enable binaries as also a dynamic library, with is a rare
and largely unknown feature, and it not used. Since it is unexpected optional
rare not standard feature - turn it off by default.

M  default.nix
2020-06-03 02:11:33 +03:00
Anton-Latukha 44e159c7da
default.nix: default enableDeadCodeElimination to false | GHC macOS build bug
M  default.nix
2020-06-03 02:11:33 +03:00
Anton-Latukha f25a5034f0
default.nix: add if useRev - then use rev, else use <nixpkgs>
M  default.nix
2020-06-01 18:55:42 +03:00
Anton-Latukha 637f6641d4
default.nix: for import form separate explicit override set
M  default.nix
2020-06-01 18:48:31 +03:00
Anton-Latukha cf0007c09e
default.nix: set rev default to nixpkgs-unstable
M  default.nix
2020-06-01 18:47:42 +03:00
Anton-Latukha 5ae47df2c9
default.nix: to allow use of current channels remove hash guarding
M  default.nix
2020-06-01 18:47:13 +03:00
Anton-Latukha 82f9c9b7fe default.nix: add docs to the exposed haskell.lib options
M  default.nix
2020-05-31 23:24:00 +03:00
Anton-Latukha c642478f81 default.nix: expose more features of haskell.lib API
M  default.nix
2020-05-31 23:24:00 +03:00
Anton-Latukha 6890eccfe3 default.nix: add flags {doCheck,doHaddock,doCoverage}
M  default.nix
2020-05-31 23:24:00 +03:00
Anton-Latukha 5b36d8af5d default.nix: add haskell.lib profiling options explicitly
Integrates with CI.

M  default.nix
2020-05-31 23:24:00 +03:00
Anton-Latukha a23b18b705 default.nix: rm allowUnfree - there is none
M  default.nix
2020-05-31 23:24:00 +03:00
Anton-Latukha 13fc309d68 default.nix: make GHC 8.8.3 default
M  default.nix
2020-05-31 23:24:00 +03:00
hyperfekt acaa65c1df
get pinned nixpkgs with fetchTarball and guard with hash (#594)
Tarball is faster
2020-05-27 11:22:38 +03:00
Anton-Latukha c5d05d3003
default.nix: dep: upd hnix-store: use it from the repository
M  default.nix
2020-05-26 04:02:15 +03:00
Anton-Latukha 1c8f5822fd
default.nix: dep: upd hnix-store to 0.2
M  default.nix
2020-05-26 04:02:15 +03:00
Anton-Latukha 591336dbb0
default.nix: upd Nixpkgs revision
M  default.nix
2020-05-26 04:02:14 +03:00
Anton-Latukha 3fe7de78ff
default.nix: override: free semialign
It no longer needed, and 1.1 now does not exist in Nixpkgs - and this override
prevents building HNix with HNix-store 0.2

M  default.nix
2020-05-26 04:02:14 +03:00
Anton-Latukha f8e51f0db2
default.nix: m clean-up
M  default.nix
2020-05-26 04:02:14 +03:00
Anton-Latukha 81fb592e1c
default.nix: override: free Diff
GHC844 does not work from HNix 0.5, so there bigger issues

M  default.nix
2020-05-23 19:09:58 +03:00
Anton-Latukha fa4dcc7c08
default.nix: override: free {mono-traversable,regex-tdfa-text,these}
M  default.nix
2020-05-23 15:27:15 +03:00
Anton-Latukha 6a4963d0aa
default.nix: override: free {semialign-indexed,multistate,butcher}
M  default.nix
2020-05-23 15:26:16 +03:00
Anton-Latukha 39817c68e8
default.nix: override: free {britanny,ghc-exactprint}
M  default.nix
2020-05-23 15:23:14 +03:00
Anton-Latukha 6ad74a73a4
default.nix: override: free from {aeson,base-compat-batteries}
I'm compiling with 8.6.5 (>= 8.6.3) - it no longer needs explicit contravatiant.

M  default.nix
2020-05-23 15:22:38 +03:00
John Wiegley bcdaaafe16
Update rev 2020-01-29 17:32:56 -08:00
John Wiegley 0ca6613d4b Fixes for building with GHC 8.6.5 under Nix 2020-01-13 17:55:16 -08:00
John Wiegley 0478ab6ba6 Update hnix to build with ghc865; however, hnix-store does not build 2020-01-13 17:55:16 -08:00
quasicomputational 717492a7ec Bump nixpkgs pin and use fetchGit to get it. 2019-09-06 13:19:14 -07:00
Linus Heckemann 3db38d0663 Warn users who forget to fetch the submodules 2019-06-25 20:24:32 +02:00
John Wiegley 646cc4adc7
Update nixpkgs, use GHC 8.6.4 2019-04-30 17:29:36 -07:00
John Wiegley 9e22c63bd5 Simplify Standard.hs further by creating Nix.Utils.Fix1 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
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 4d4636e76c
Add Brittany to the set of build tools 2019-03-17 13:59:53 -07:00
Doug Beardsley 34c9d63990 Bump hnix-store version 2019-03-10 11:14:38 -07:00
Doug Beardsley 2f27ea81c8 Make nix dep match the submodule version 2019-03-10 10:03:39 -07:00
John Ericson 5ddb79009d Depend on hnix-store-core and use it for printHash32 2019-03-10 08:59:05 -07:00
John Ericson 5f1605bcbf Pull in hnix-store and its overlays 2019-03-10 08:59:05 -07:00
John Ericson 50b1046536 Expose a haskell package set, don't use inNixStore for shell 2019-03-10 08:50:04 -07:00
John Wiegley 269faf88a8
Jailbreak the these package for 8.6.3 2019-02-16 17:26:36 -08:00
John Wiegley a9ba6f1735
Bump the default version to GHC 8.6.3 2019-02-16 15:39:03 -08:00
Silvan Mosberger 8ef09e6efa
Fix Nix build for external imports
Previously `import (pkgs.fetchgit { url = ...; rev = ...; sha256 = ...; })`
would give a cabal2nix error
2018-11-24 21:50:37 +01:00
John Wiegley 2e4e5e0077
Whitespace fix 2018-11-22 11:23:54 -08:00
John Wiegley 8dc9cd7b58
Some cleanup in default.nix 2018-11-22 11:21:06 -08:00
John Wiegley 197adf01b9
Refer to megaparsec_7_0_4 2018-11-22 10:04:33 -08:00
John Wiegley 01e805e106
Update default.nix to use megaparsec 7.0.4 2018-11-22 09:53:04 -08:00
John Wiegley 73e520923c
Merge branch 'master' into clean-up-default-nix 2018-11-22 09:49:40 -08:00
John Wiegley 2447e7e044
Remove the use of hpack
Fixes #411
2018-11-22 09:15:50 -08:00
John Wiegley e0669ce3c3
Merge branch 'master' into doOptimize-doProfiling 2018-11-22 08:57:09 -08:00
Domen Kožar ef3bc04a7c
Be able to pass doOptimize/doProfiling flags to nix build 2018-11-22 09:53:43 +00:00
Vaibhav Sagar 017ce7667a Bump Megaparsec to 7.0.4 2018-11-22 01:16:11 -05:00
John Wiegley ba5b23a6e3
Bump minimum supported version to GHC 8.4.4 2018-11-19 09:46:02 -08:00
Ryan Trinkle d3682a9391
Merge branch 'master' into clean-up-default-nix 2018-11-18 15:33:43 -05:00
Ryan Trinkle df8e58d4e5 Merge remote-tracking branch 'origin/master' into abstract-scopes 2018-11-18 15:16:54 -05:00
Ryan Trinkle 68b26dad4e Expose the nixpkgs we're using (jobsets.nix uses) 2018-11-17 18:48:37 -05:00
John Ericson 85eaea06cd Clean up default.nix with lib.optionalAttrs 2018-11-16 21:18:07 -05:00
John Wiegley b5c0a0a147
Update to GHC 8.4.3 2018-10-05 11:12:30 -07:00
Domen Kožar 18d5753403
default.nix: skip profiling to speed up builds 2018-08-06 22:35:17 +01:00
John Wiegley c54bf53df6
Disable mono-traversable tests 2018-08-04 17:23:03 -04:00
John Wiegley c6718e374f
Merge remote-tracking branch 'origin/master' into pending 2018-08-04 10:54:57 -04:00
John Wiegley ac4d2cbb8e
Update default.nix 2018-08-01 09:47:30 -04:00
Matthew Bauer 55a92337c2 Add cabal-install as build tool 2018-07-30 13:27:43 -04:00
John Wiegley 9ed0597e40
Update default.nix and .cabal file 2018-07-25 11:53:48 -07:00
John Wiegley c060fa9d4e
Corrections to default.nix 2018-07-17 13:31:29 -07:00
John Wiegley e0bf2c4a36
For GHC 8.0, add a reference to hspec-discover 2018-07-09 10:41:42 -07:00
John Wiegley b0826b9166
Use megaparsec 6.5.0 2018-06-27 11:36:04 -07:00
John Wiegley 9931386c85
Update pinned version of nixpkgs in default.nix 2018-06-13 10:58:02 -07:00
John Wiegley 5c5e90170e
Drop any mention of a doProfiling flag 2018-05-30 12:10:31 -07:00
John Wiegley d40b3f15cb
Update default.nix files for profiling 2018-05-30 11:08:15 -07:00
John Wiegley 95ec4e287b
Update default.nix 2018-05-20 23:41:16 -07:00
John Wiegley 7cb68b2ae0
Correction to default.nix 2018-05-16 09:52:49 -07:00
John Wiegley 3b56b7d3d5
Fix reference to extensible-self 2018-05-16 00:21:40 -07:00
John Wiegley 5183f5ea13
Further refinements to default.nix 2018-05-16 00:11:14 -07:00
John Wiegley 5c2cc00b64
Update default.nix to allow more convenient wrappers around it 2018-05-15 17:23:40 -07:00
John Wiegley c9e1393391
Try another version of nixpkgs 2018-05-15 15:42:05 -07:00
John Wiegley 02409359b1
Use an older version of nixpkgs so that the cache is available to Travis 2018-05-15 13:03:32 -07:00
John Wiegley 44ad700a53
Minor reformatting in default.nix 2018-05-15 12:16:02 -07:00
John Wiegley 6f0c90f5d6
Change error message to say "requires at least nix 2.0" 2018-05-14 21:22:08 -07:00
John Wiegley 87bb41054b
Jailbreak concurrent-output when building for GHC 8.0 2018-05-14 21:22:07 -07:00
John Wiegley f4772727b5
Revert "Revert "Update the version of nixpkgs we are pinned to""
This reverts commit 7e1b288b9ff05f496fec1761f9962f249a2542c0.
2018-05-14 21:22:06 -07:00
John Wiegley c319d2730e
Revert "Update the version of nixpkgs we are pinned to"
This reverts commit e4a5806c766a4d1c832d245ad378b989c1aa4404.
2018-05-14 21:22:06 -07:00
John Wiegley 0b89cc7b3a
Include the appropriate version of cabal-install, so we can use --pure 2018-05-14 21:22:05 -07:00
John Wiegley 5a97378c85
Update the version of nixpkgs we are pinned to 2018-05-14 21:22:03 -07:00
Alexandre Esteves 701f15f94a Abort on nix prior to 2.0 2018-05-14 22:47:04 +01:00
John Wiegley eef2ec2512
Only use compact with GHC 8.2, as per the documentation for compact 2018-05-10 16:12:42 -07:00
John Wiegley e5d7a88bda
Define ghc-compact as required 2018-05-10 15:48:01 -07:00
John Wiegley 865984b428
Permit building with GHC 8.0, extend the Travis build matrix 2018-05-10 15:07:32 -07:00
John Wiegley 2fd9bd3fa8
Use a more explicit name than haskellPackages_8_2 2018-05-10 11:48:45 -07:00
John Wiegley 54f3220d79
Revert "Revert "Update pinned version of nixpkgs""
This reverts commit 575d317f6b.
2018-05-10 11:44:00 -07:00
John Wiegley 20e4c5ff61
Use only one version of hpack 2018-05-10 11:43:39 -07:00
John Wiegley 575d317f6b
Revert "Update pinned version of nixpkgs"
This reverts commit b3fdc43998.
2018-05-09 15:48:29 -07:00
John Wiegley b3fdc43998
Update pinned version of nixpkgs 2018-05-09 13:00:51 -07:00
John Wiegley ba0dc19d2d
Work from mightybyte: Minimize deps required, for building with GHCJS 2018-05-08 16:41:15 -07:00
John Wiegley bda103bc11 Don't include ghc-datasize if --flags=profiling is set 2018-04-30 21:48:45 -04:00
John Wiegley 7f01cc8bb8 valueSize will not work with GHC 8.4 right now
ghc-heap-view hasn't been updated yet
2018-04-28 18:29:37 -07:00
John Wiegley 8d0a67b52c Only turn on -Werror for Travis 2018-04-28 18:21:24 -07:00
John Wiegley b24598b3a3 Add top-level __valueSize
Fixes #253
2018-04-28 17:12:32 -07:00
John Wiegley 7714beae81 Use GHC 8.4.2 for the GHC 8.4 build 2018-04-24 16:43:56 -07:00
John Wiegley caf0a4a6a2 Add support for building with GHC 8.4.1, also on Travis 2018-04-23 16:39:37 -07:00
John Wiegley 86b09103d6 Move production of a reduced test case to --reduce, improve --trace 2018-04-20 22:36:40 -07:00