Skip to content
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

Revert GHC pyopenssl workarounds #179506

Merged
merged 2 commits into from
Jun 29, 2022

Conversation

SuperSandro2000
Copy link
Member

@SuperSandro2000 SuperSandro2000 commented Jun 29, 2022

Description of changes

This needs to wait until master is merged into staging Maybe this happened while doing the PR? I am surprised it works now.

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 22.11 Release Notes (or backporting 22.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@cdepillabout
Copy link
Member

cdepillabout commented Jun 29, 2022

cc @roberth @lovesegfault from #179181

@roberth
Copy link
Member

roberth commented Jun 29, 2022

This needs to wait until master is merged into staging Maybe this happened while doing the PR? I am surprised it works now.

I don't understand. What do you mean?

These commits can be reverted when ghc evaluates and builds on aarch64-darwin with a normal sphinx build.

$ gh pr checkout 179506
[...]

$ nix-instantiate -A ghc --argstr system aarch64-darwin
error: Package ‘python3.10-pyopenssl-22.0.0’ in /home/user/h/nixpkgs/pkgs/development/python-modules/pyopenssl/default.nix:73 is marked as broken, refusing to evaluate.

[...]

@SuperSandro2000
Copy link
Member Author

I don't understand. What do you mean?

I was waiting for 68da255 to happen.

These commits can be reverted when ghc evaluates and builds on aarch64-darwin with a normal sphinx build.

Was fixed in #179159

@SuperSandro2000
Copy link
Member Author

@ofborg build ghc

@roberth
Copy link
Member

roberth commented Jun 29, 2022

ofborg does not build for aarch64-darwin, which is the system type that #179181 was all about.

@SuperSandro2000
Copy link
Member Author

ofborg does not build for aarch64-darwin, which is the system type that #179181 was all about.

oh well. We had that a few weeks ago.

@SuperSandro2000 SuperSandro2000 merged commit fa3f2e3 into NixOS:staging Jun 29, 2022
@SuperSandro2000 SuperSandro2000 deleted the pyopenssl-ghc branch June 29, 2022 12:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants