Skip to content

Mpj/bump haskell nix #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 83 commits into from
Jul 1, 2025
Merged

Mpj/bump haskell nix #2

merged 83 commits into from
Jul 1, 2025

Conversation

michaelpj
Copy link

Unsure if this will help but let's try.

hamishmack and others added 30 commits May 13, 2025 10:06
* Fix terminfo dep in dummy ghc for haskeline

The dependency is missed because a `terminfo` cabal flag is used.

* Also fix Win32:filepath
* Bump nixpkgs pins

* Unpin nodejs

* Fix wine

* Fix wine

* Update overlays/wine.nix

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* nix flake update iserv-proxy

* Fix broken symlink issue

* Bump head.hackage

* Check with `nix-eval-jobs` instead of `hydra-eval-jobs`

* Check with `nix-eval-jobs` instead of `hydra-eval-jobs`

* Check with `nix-eval-jobs` instead of `hydra-eval-jobs`

* Add materialized file

* Update head.hackage

* Fix hadrian eval time dependency on buildPackages.srcOnly

* Update head.hackage

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
* Fix input-output-hk#2365 missing pg_config

The `pg_config` executable was moved into its own derivation in `nixpkgs`.  This fix includes that derivation if present when the `pg` library is requested.

* Add comment
This patch fixes the way "non-haskell" dependencies are selected for dev shells (this includes `pre-existing` haskell packages).

Currently we only include "non-haskell" dependencies of the haskell packages that are needed by the shell (and not the the ones for the haskell packages that we plan to build in the shell).

This means if none of the haskell packages needed depend a particular "non-haskell" dependency it can be left out even if it will be needed to build the haskell packages we plan to build in the shell.

Fixes input-output-hk#2359 and probably input-output-hk#2256
It needs posgresql and pg_config, but does not explicitly list the dependency in the `.cabal` file.

With this change both `use-pkg-config` on and off work. Tested with:

```
nix build --impure --expr '((import ./. {}).pkgs-unstable.haskell-nix.hackage-package {compiler-nix-name="ghc9122"; name = "postgresql-libpq"; cabalProjectLocal = "package postgresql-libpq\n flags: -use-pkg-config"; }).components.library'
nix build --impure --expr '((import ./. {}).pkgs-unstable.haskell-nix.hackage-package {compiler-nix-name="ghc9122"; name = "postgresql-libpq"; cabalProjectLocal = "package postgresql-libpq\n flags: +use-pkg-config"; }).components.library'
```

Fixes input-output-hk#2281
…utput-hk#2376)

To support old and new versions of nixpkgs we still need to include framework derivations for now.
hamishmack and others added 27 commits June 13, 2025 05:51
* Use haskell-language-server 2.11

* Use existing haddock-library and haddock-api on GHC >9.12

* Reduce number of tests
Since this file is updated every 5 minutes (if hackage has changed), we can get the latest hackage packages by waiting 5 minutes and running:

```
nix flake update haskellNix/hackage
```
* Fix `index-sha256` bit rot

If an new package is deployed to `hackage.haskell.org`, to use it before it is captured by the `hackage.nix` update add the following to the project arguments:

```nix
  index-state="2025-06-16T00:00:00Z";  # Use current time here
  # This hash in not valid, the error message will give the correct hash
  index-sha256="sha256-NS28jJYko/tNUKVhncntu/mV8tsQmTA52T000000000=";
```

This change PR fixes some "bit rot" issues:
 * A warning about `--index-state` argument being out of range is now an error.
 * The sha256 might now be in base16 or base32.

* Add comment

* Doc change to trigger hydra CI

* Fix cross compilation shells

* Use hackage.nix/index-state.nix

* Support for older hackage.nix versions
We need to add llvmPackages.bintools to the nativeBuildInputs of
builders when using this and we need to configure GHC to use ld.lld.
* Fix GHC 9.6 mingwW64 cross compile

* Add iserv-syms.patch to just windows and musl

* Try just on Windows

* Disable broken test

* Update head.hackage
* Fix for HPUX, IOS and IRIX

* Update head.hackage and fix warning

* Merge remote-tracking branch 'origin/master' into static-nix-tools

* cd nix-tools && nix flake update haskellNix

* Bump head.hackage

* update nix-tools-static.nix

---------

Co-authored-by: Auto Update Bot <no-reply@iohk.io>
* Set EM_CACHE if needed in dev shell for GHCJS

* Update head.hackage
@michaelpj michaelpj force-pushed the mpj/bump-haskell-nix branch from 92c7fce to 225365a Compare June 30, 2025 18:08
@michaelpj michaelpj merged commit 29ba541 into circuithub Jul 1, 2025
1 check was pending
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants