Skip to content
This repository was archived by the owner on Aug 28, 2025. It is now read-only.

Bump nixpkgs to latest master#30

Merged
marcin-dziadus merged 36 commits intodfinity:masterfrom
nomeata:joachim/bump-nixpkgs
Sep 20, 2021
Merged

Bump nixpkgs to latest master#30
marcin-dziadus merged 36 commits intodfinity:masterfrom
nomeata:joachim/bump-nixpkgs

Conversation

@nomeata
Copy link
Copy Markdown
Contributor

@nomeata nomeata commented Sep 14, 2021

This PR is a lot of work…

  • Bumps nixpkgs to latest master
  • Because of that, a lot of Haskell related version bumps and other stuff can go
  • Also, all nixpkgs patches can be dropped. Leave nixpkgs-patching code in place, but improve so that it does not do anything if there are no patches.
  • Simply cabal2nix machinery; no need to repeat list of packages mentioned in nix/generate.nix
  • Use .gitattributes to mark generated files as such
  • Maintenance of the non-nix workflow that pushes the docs.
  • The static Haskell build no longer worked, but with ghc on musl: Crude hack to allow integer-simple NixOS/nixpkgs#138429 it does again. Yay!

@nomeata nomeata force-pushed the joachim/bump-nixpkgs branch from a3de2b8 to ea974be Compare September 14, 2021 12:28
@nomeata nomeata force-pushed the joachim/bump-nixpkgs branch from f92babc to 4394ee3 Compare September 18, 2021 10:07
@nomeata nomeata force-pushed the joachim/bump-nixpkgs branch from 4394ee3 to 3d0f880 Compare September 18, 2021 10:11
@nomeata
Copy link
Copy Markdown
Contributor Author

nomeata commented Sep 18, 2021

I am a bit stuck now, and the problem is the static build of ic-ref, which ships with dfx.

Previously, I used a compiler built against musl (via nix’s pkgsMusl), which allows static linking just fine. But this broke at some point in nixpkgs (see NixOS/nixpkgs#129606 (comment), although there isn't much information).

I tried to use pkgsStatic instead, but that fails because then GHC cannot do Template Haskell, as dependencies have no .so files in this configuration.

I could try haskell-nix-static, but that’s yet another dependency, and I am worried about keeping the versions in sync between that and nixpkgs.

It would be easiest if we can just drop the static build. I am not sure what the plans with the emulator in dfx are; we never advertised it. Is it still used and useful, @ericswanson-dfinity?

@nomeata nomeata marked this pull request as ready for review September 19, 2021 08:14
@nomeata
Copy link
Copy Markdown
Contributor Author

nomeata commented Sep 19, 2021

Finally green!

I suggest to squash merge using the PR description as the commit message (this is what mergify would do, maybe we should start using this.)

Also, I'd appreciate admin rights again, like I have on Motoko, so that I can do such maintenance and infra work more easily. Who do I need to ask about that?

@marcin-dziadus marcin-dziadus merged commit fb558eb into dfinity:master Sep 20, 2021
nomeata added a commit to nomeata/ic-hs that referenced this pull request Sep 24, 2021
in dfinity#30 we tracked a PR against nixpkgs, which isn't very stable (e.g. if
it gets force-pushed to, it may break this repository). The changes we
are trying to include are still not in nixpkgs master, but they are
closer already, on the `haskell-upgrades` branch. So track that, until
it is merged into `master` (via NixOS/nixpkgs#138596)
marcin-dziadus pushed a commit that referenced this pull request Sep 24, 2021
in #30 we tracked a PR against nixpkgs, which isn't very stable (e.g. if
it gets force-pushed to, it may break this repository). The changes we
are trying to include are still not in nixpkgs master, but they are
closer already, on the `haskell-upgrades` branch. So track that, until
it is merged into `master` (via NixOS/nixpkgs#138596)
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants