Commit Graph

2036 Commits

Author SHA1 Message Date
IOHK
386d03f150 Update Hackage and Stackage 2022-04-12 01:17:29 +00:00
IOHK
fd74389bcf Update Hackage and Stackage 2022-04-11 01:16:28 +00:00
IOHK
bd6bae1c2c Update Hackage and Stackage 2022-04-10 01:15:25 +00:00
IOHK
9837fdee76 Update Hackage and Stackage 2022-04-09 01:15:25 +00:00
Hamish Mackenzie
5051bfa9d6
Fix the type of signatures in metadata (#1431)
See https://github.com/NixOS/hackage-db/pull/17
2022-04-09 01:25:38 +12:00
Hamish Mackenzie
82832676a1
ifdLevel 3 2022-04-08 18:52:37 +12:00
Hamish Mackenzie
aaae688f47
ifdLevel 2 2022-04-08 15:11:50 +12:00
Hamish Mackenzie
aef9e94377
ifdLevel 1 2022-04-08 13:09:22 +12:00
Hamish Mackenzie
31eea6644d
ifdLevel 0 (for hydra sigh) 2022-04-07 22:10:42 +12:00
Thomas Winant
0c9142a753
Don't duplicate the configureFlags when not on Windows (#1420)
When not on Windows, the `configureFlags` attr of `libmpc` is set to
`(drv.configureFlags or [])`. Since `drv.configureFlags` seems to be equal to
`["--enable-static" "--disable-shared"]` (at least on my machine),
`configureFlags` appears to be merged with itself and in the end, it is equal
to:
`["--enable-static" "--disable-shared" "--enable-static" "--disable-shared"]`.

You can verify this by comparing the derivations of `libmpc` with and without
this patch.

This changes the derivation of `libmpc` as well the derivation of all dependent
packages, like `gcc`, causing cache misses from https://cache.nixos.org/.

Because these packages are built and stored in the IOHK cache, users don't
notice this, until they use a different version of `nixpkgs` than the one pinned
by `haskell.nix`, e.g., one with a different version of `glibc` so that the IOHK
cache cannot be used. This results in `gcc` and other packages being built from
scratch instead of being downloaded from https://cache.nixos.org/.

Fix this by hoisting the conditional one level higher so that `overrideAttrs`
isn't even called on non-Windows OSes. Do the same for `mpfr` for consistency.

I haven't tested this on Windows. I'm not sure whether I have hoisted the
conditional too high, see the first comment in the file.
2022-04-07 21:59:32 +12:00
IOHK
b0fed19dc6 Update Hackage and Stackage 2022-04-07 01:21:16 +00:00
IOHK
28dbf2f4bd Update Hackage and Stackage 2022-04-06 01:18:07 +00:00
Hamish Mackenzie
9987a666f2
Update windows-secp256k1 github action (#1428)
Based on https://github.com/input-output-hk/ouroboros-network/pull/3687
2022-04-05 18:53:13 +12:00
IOHK
942108ec13 Update Hackage and Stackage 2022-04-05 01:19:46 +00:00
Hamish Mackenzie
dbb6409cab
Add windows-secp256k1 binary distribution (#1424) 2022-04-04 16:54:07 +12:00
Hamish Mackenzie
51bc73490c
Bump nixpkgs pins (#1426) 2022-04-04 16:04:44 +12:00
IOHK
5e792d5cdc Update Hackage and Stackage 2022-04-04 01:16:31 +00:00
IOHK
ff135f885a Update Hackage and Stackage 2022-04-03 01:15:59 +00:00
IOHK
9c6e2f0449 Update Hackage and Stackage 2022-04-02 01:14:58 +00:00
Hamish Mackenzie
97b3a67789
Fix typo & comment out cross comp in eg. flake.nix (#1423) 2022-04-01 18:18:42 +13:00
Hamish Mackenzie
e9a93540c3
Look for DLLs in /bin directory of pkgconfig deps (#1422)
We include the /bin directory of `component.libs` in `extra-lib-dirs` on windows, but not `components.pkgconfig`.  This causes confusing differences between the behavior depending on how a dependency was specified in the `.cabal` file or added in a module.  If it wounds up in `components.libs` the need for DLLs would propagate correctly, but if it was only in `componets.pkgconfig` DLLs would not be included when building TH code and did not get symlinked to `exe` component output /bin dirs.
2022-04-01 16:35:04 +13:00
IOHK
956ffffe98 Update Hackage and Stackage 2022-04-01 01:17:50 +00:00
IOHK
3fbb17e63c Update Hackage and Stackage 2022-03-31 01:19:07 +00:00
IOHK
83bf601595 Update Hackage and Stackage 2022-03-30 01:19:19 +00:00
IOHK
ce2d6dede2 Update Hackage and Stackage 2022-03-29 01:16:29 +00:00
Hamish Mackenzie
8eb5d29d37
Support Nix <2.4 (#1418)
* Downgrades the error to a warning.
* Adds `filterPath` as a way to disable filtering to have caching work between Nix <2.4 and >=2.4.
* Disables filtering on `haskell-nix.hackage-project` based functions (should make all the GHC derivations the same).

I think it would also be possible to make a `filterPath` implementation that recursively used `builtins.readDir` and called the `filter` function to implement filtering on Nix <2.4, but I am not sure if it is worth it.

Anyone that needs the old behaviour for project packages (consistent filtering between <2.4 and >=2.4, but not between store and local) replace:

```
project = pkgs.haskell-nix.cabalProject {
  src = pkgs.haskell-nix.haskellLib.cleanGit {
    src = ./.;
  };
};
```

```
project = pkgs.haskell-nix.cabalProject {
  src = pkgs.haskell-nix.haskellLib.cleanGit {
     src = {
       outPath = ./.;
       filterPath = { path, ... }@args:
         if builtins.hasContext (toString path) then path else builtins.path args;
     };
  };
};
```
2022-03-29 01:24:01 +13:00
IOHK
9660601302 Update Hackage and Stackage 2022-03-28 01:17:37 +00:00
IOHK
7315209dbf Update Hackage and Stackage 2022-03-27 01:15:47 +00:00
IOHK
dfcc83fcd6 Update Hackage and Stackage 2022-03-26 01:15:39 +00:00
Hamish Mackenzie
4b6ee9767d
Make DLLs in deps available to wine TH runner (#1405)
This is a better fix to the problem of making DLLs available to the process running in wine that is used to evaluate TH code when cross compiling for Windows.

Also fixes macOS loadArchive in TH for ghc 9

Co-authored-by: Michael Peyton Jones <michael.peyton-jones@iohk.io>
2022-03-25 21:44:02 +13:00
IOHK
2c895a2c41 Update Hackage and Stackage 2022-03-25 01:23:00 +00:00
DavHau
a385241331
Remove canCleanSource (#1409)
In recent nix, builtins.path works in restricted eval mode.
Therefore canCleanSource is not required anymore.

follow up on #1403

* add comment on hydra overlay

* throw error on outdated nix version
2022-03-25 12:57:36 +13:00
IOHK
7ae4953cff Update Hackage and Stackage 2022-03-24 01:20:08 +00:00
IOHK
b87bc95b04 Update Hackage and Stackage 2022-03-23 01:16:20 +00:00
Jean-Baptiste Giraudeau
53ffd8eac6
Enable static build of secp256k1 on musl (#1413) 2022-03-22 14:56:27 +00:00
Hamish Mackenzie
a4da3fa890
Better error when GHC is too old to build (#1411)
Currently we often get confusing errors (infinite loops looking for impossible materialization or GHC build errors) when trying to build a GHC version that is never going to work on the platform we are building for.  In particular it is common to on M1 Macs to forget to include `--system x86_64-darwin` and wind up with a confusing error.

With this change the error is more clear:

```
hamish@Hamishs-MBP haskell.nix % nix-build -A pkgs-unstable.haskell-nix.compiler.ghc8105
error: Desired GHC (8.10.5) is older than the bootstrap GHC (8.10.7) for this platform (aarch64-apple-darwin).
```
2022-03-22 11:59:45 +00:00
IOHK
a69616cebe Update Hackage and Stackage 2022-03-22 01:16:24 +00:00
Ian
9fae2eb97f
Replace deprecated NixOS binary cache settings (#1410)
`nix.binaryCachePublicKeys` and `nix.binaryCaches` are now deprecated in NixOS: the current names for these settings are `nix.settings.trusted-public-keys` and `nix.settings.substituters`, respectively
2022-03-21 16:27:36 +00:00
IOHK
3600267d49 Update Hackage and Stackage 2022-03-21 01:20:17 +00:00
IOHK
268f525860 Update Hackage and Stackage 2022-03-20 01:14:54 +00:00
IOHK
ed0b065b41 Update Hackage and Stackage 2022-03-19 01:15:07 +00:00
DavHau
1ca99326b2
always clean the source, no matter what (#1403)
* always clean the source, no matter what

* update hydra
2022-03-19 02:08:11 +13:00
IOHK
b944c8087d Update Hackage and Stackage 2022-03-18 01:21:21 +00:00
IOHK
f3f2c08051 Update Hackage and Stackage 2022-03-17 01:17:58 +00:00
IOHK
f44f0845b2 Update Hackage and Stackage 2022-03-16 01:18:36 +00:00
Hamish Mackenzie
eb49a3b721
Add secp256k1 DLL for win cross compilation of TH (#1400) 2022-03-15 16:33:49 +13:00
IOHK
308c937bfc Update Hackage and Stackage 2022-03-15 01:17:55 +00:00
IOHK
52acfe6f49 Update Hackage and Stackage 2022-03-14 01:15:47 +00:00
IOHK
548888187d Update Hackage and Stackage 2022-03-13 01:15:31 +00:00
Hamish Mackenzie
c5fa3f4a4b
nixpkgs gdk_pixbuf is now gdk-pixbuf (#1398) 2022-03-12 21:25:18 +13:00