Commit Graph

2223 Commits

Author SHA1 Message Date
IOHK
ea3b640667 Update Hackage and Stackage 2022-03-03 01:19:49 +00:00
Michael Peyton Jones
4751dc70a6
Use gitMinimal in call-cabal-project-to-nix (#1387)
This was using full `git`, which isn't part of the project `roots`, and so
would often not be cached.

I don't know how this ended up not being problematic before, since this
has been here for a while...
2022-03-03 12:44:58 +13:00
IOHK
50c6984263 Update Hackage and Stackage 2022-03-02 01:18:18 +00:00
IOHK
f0308ed1df Update Hackage and Stackage 2022-03-01 01:26:16 +00:00
IOHK
7685cc698b Update Hackage and Stackage 2022-02-28 01:17:17 +00:00
IOHK
29433c04fa Update Hackage and Stackage 2022-02-27 01:23:49 +00:00
IOHK
59974fd04a Update Hackage and Stackage 2022-02-26 01:15:06 +00:00
IOHK
7b02d82faa Update Hackage and Stackage 2022-02-25 01:19:08 +00:00
Hamish Mackenzie
864c0aff9c
Pass enableDWARF to makeConfigFiles to fix -g3 support in nix-shell (#1385) 2022-02-25 01:52:16 +13:00
Hamish Mackenzie
e2b12dbff7
Only pass --index-state to cabal when asked (#1384)
Currently we pass the `--index-state` argument to `cabal` for configuration of a project even if it was found in the `cabal.project` file.  This must have seemed harmless enough when we set it up that way, but it causes problems if there are `repository` blocks in the `cabal.project` file.

So for instance if we have a `cabal.project` with:

```
index-state: 2022-01-22T00:00:00Z
index-state: ghcjs-overlay HEAD

repository ghcjs-overlay
  url: https://raw.githubusercontent.com/input-output-hk/hackage-overlay-ghcjs/8756b0891a0a550cc8b00dacd24227aee483c0ca
  secure: True
  root-keys:
  key-threshold: 0
```

With the intention of using the `HEAD` version of the `ghcjs-overlay` and letting the commit hash in the `url` ensure it is stable.  The first `index-state` is found and `--index-state 2022-01-22T00:00:00Z` is passed on the command line to `cabal`.  This overrides the `HEAD` setting for `ghcjs-overlay` and because the timestamps in the `ghcjs-overlay` depend solely on when the `hackage-overlay-repo-tool` ran none of them are included.

The solution is to pass `--index-state` to `cabal` only when it was passed into the project function.  When it is not provided `cabal` should still respect the setting in the `cabal.project` file, but it will not elevate it to replace other settings as it does now.
2022-02-24 23:55:06 +13:00
IOHK
ac01820dc3 Update Hackage and Stackage 2022-02-24 01:18:20 +00:00
Yura Lazarev
d420709339
fix: stack cache generator sha256 is a string not a lambda (#1383) 2022-02-24 13:28:45 +13:00
Hamish Mackenzie
a4e85e4714
Fix for #1381 (introduced by #1378) (#1382) 2022-02-23 18:22:00 +13:00
IOHK
5fbf5d5b6b Update Hackage and Stackage 2022-02-23 01:18:40 +00:00
Cheng Shao
c084516ada
git-ls-files should prefer local building (#1378) 2022-02-22 14:24:33 +00:00
IOHK
b263e40747 Update Hackage and Stackage 2022-02-22 01:17:57 +00:00
ruicc
b5ff7dc103
Fix when "materialized" dir is deep (#1376) 2022-02-21 10:09:08 +00:00
IOHK
f4ec5a1ce1 Update Hackage and Stackage 2022-02-21 01:23:57 +00:00
IOHK
668c075003 Update Hackage and Stackage 2022-02-20 01:23:17 +00:00
IOHK
31a8266cce Update Hackage and Stackage 2022-02-19 01:20:17 +00:00
IOHK
8ebafe54de Update Hackage and Stackage 2022-02-18 01:18:47 +00:00
Hamish Mackenzie
2576a948b5
Improve support for external Hackage repositories (#1370)
* Improve support for external Hackage repositories

This change builds #535. `repository` blocks in `cabal.project` parsed and `cabal` is used to automatically downloaded them.  Then `hackage-to-nix` is used to produce the nix required.

To make it work with restricted eval (on hydra for instance) we need to include a sha256 like this:

```
repository ghcjs-overlay
  url: https://input-output-hk.github.io/hackage-overlay-ghcjs
  secure: True
  root-keys:
  key-threshold: 0
  --sha256: sha256-EPlLYPmIGtxeahlOspRzwJv+60N5mqrNC2BY4jZKceE=
```

To find the correct `sha256` put in an invalid one and attempt a build.
2022-02-18 00:42:11 +13:00
IOHK
6b891ba383 Update Hackage and Stackage 2022-02-17 01:18:36 +00:00
IOHK
659b73698e Update Hackage and Stackage 2022-02-16 01:17:07 +00:00
Cheng Shao
18ebf60137
Fix libnuma dependency in rts.conf (#1342) 2022-02-15 23:49:45 +13:00
Hamish Mackenzie
90a0cf6488
Add bootstrap materialization for ghc 8.8.4 (#1374) 2022-02-15 15:44:53 +13:00
IOHK
bcd346e8f7 Update Hackage and Stackage 2022-02-15 01:18:11 +00:00
Peter Becich
c4713f624f
update GHC used for aarch64 bootstrap (#1325) 2022-02-15 11:13:51 +13:00
Hamish Mackenzie
41682ea1fd
update pins (#1371) 2022-02-15 11:11:34 +13:00
Jan Vogt
c04edd9687
Update pkgconf-nixpkgs-map.nix (#1373)
poppler-cpp is required in package-depends of
https://hg.sr.ht/~geyaeb/haskell-pdftotext/browse/pdftotext.cabal
a.k.a pdftotext on hackage. Successfully tested with aliasing to
poppler in nixpkgs.
2022-02-14 16:54:15 +00:00
IOHK
f3b66b194c Update Hackage and Stackage 2022-02-14 01:17:48 +00:00
IOHK
8a09098e0f Update Hackage and Stackage 2022-02-13 01:15:41 +00:00
IOHK
84532e8105 Update Hackage and Stackage 2022-02-12 01:16:07 +00:00
IOHK
c2677deef1 Update Hackage and Stackage 2022-02-11 01:19:07 +00:00
IOHK
82a20b768d Update Hackage and Stackage 2022-02-10 01:17:07 +00:00
Hamish Mackenzie
f67cf8e439
Use updated nix-tools (#1365) 2022-02-09 22:08:43 +13:00
IOHK
cbce067929 Update Hackage and Stackage 2022-02-09 01:19:44 +00:00
IOHK
2a49fa660c Update Hackage and Stackage 2022-02-08 01:22:53 +00:00
IOHK
1b54ea0156 Update Hackage and Stackage 2022-02-07 01:16:01 +00:00
IOHK
7b9192484c Update Hackage and Stackage 2022-02-06 01:15:47 +00:00
IOHK
d3cd933259 Update Hackage and Stackage 2022-02-05 01:15:43 +00:00
Teo Camarasu
b48b549c96
musl: allow linking pcre statically (#1363) 2022-02-04 15:24:07 +00:00
Teo Camarasu
02f34c6f36
fix typo (#1362) 2022-02-04 14:52:37 +00:00
J.R. Hill
355cd3701d
Fix minor typo (#1360) 2022-02-04 10:08:10 +00:00
IOHK
a0e3b27d6f Update Hackage and Stackage 2022-02-04 01:16:59 +00:00
IOHK
dc4c624fad Update Hackage and Stackage 2022-02-03 01:17:17 +00:00
IOHK
1c23c7e3cb Update Hackage and Stackage 2022-02-02 01:17:32 +00:00
Cameron
08ef714536
Add libgpiod to lib/system-nixpkgs-map.nix (#1359)
Co-authored-by: Cameron Dart <cdart@anduril.com>
2022-02-01 09:57:01 +00:00
IOHK
b9c58c1b1b Update Hackage and Stackage 2022-02-01 01:28:09 +00:00
IOHK
bfb828ccb8 Update Hackage and Stackage 2022-01-31 01:16:31 +00:00