Add nixpkgs-2105 #1133
Add nixpkgs-2105 #1133
Conversation
|
It would be great to see this come through, as 21.05 includes some cross-compilation fixes for openssl on non-linux build machines. |
|
Probably we need to do this from a branch in the main repo, I don't think Hydra will build this and we need to do that to see if it works! |
|
One thing I just noticed is that GHC 8.10.4 isn't working on macOS+nixpkgs-2105 (it does work on nixpkgs-unstable), nix-shell fails with https://gitlab.haskell.org/ghc/ghc/-/issues/19655. This was resolved on GHC 8.10.5, so maybe we should add support for that before adding nixpkgs-2105 (?) |
|
We still have 20.09, so that's okay. We can mark things as broken for now. But yeah, doing this sort of update involves a lot of waiting to see which things are broken and fussing with the conditional logic, unfortunately. |
| @@ -2,6 +2,8 @@ final: prev: let | |||
| # GHCJS currently requires an old version of emscripten. Overriding to build the older version doesn't | |||
| # work straightforwardly on 20.09 anymore, so we use an ugly hack and pull emscripten from 20.03. | |||
| # In future, we'll just fix GHCJS to work with the newer emscripten. | |||
|
|
|||
| # Not sure what to do here - akrmn | |||
There was a problem hiding this comment.
hey @michaelpj, I think I got rid of all occurrences of nixpkgs-2003 or R2003, except for this one. The comment above mine is a bit worrying.
There was a problem hiding this comment.
Yep, this is a bit worrying. I also don't know what to do about this.
There was a problem hiding this comment.
We will need to keep a nixpkgs-2003 pin for now
|
Would be great to have this in for LTS-18.0 |
|
bors try |
tryTimed out. |
|
bors try |
tryBuild failed: |
|
bors try |
tryBuild failed: |
|
bors try |
|
bors try- |
|
bors try |
tryTimed out. |
|
hydra did finish ok in the end. |
* Add nixpkgs-2105 * [WIP] Drop nixpkgs-2003 * Update all the nixpkgs pins * Default to nixpkgs-2009 for build.nix * Update individual jobs to nixpkgs 2105 Co-authored-by: Hamish Mackenzie <Hamish.K.Mackenzie@gmail.com>
Given the recent release of nixpkgs-2105 (https://github.com/NixOS/nixpkgs/releases/tag/21.05) I thought this was in order :) I based my additions on #1025, but please let me know if there's anything else needed.