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

haskellPackages.password: use crypton, disable scrypt on non-x86 #351305

Merged
merged 1 commit into from
Nov 2, 2024

Conversation

sternenseemann
Copy link
Member

@sternenseemann sternenseemann commented Oct 25, 2024

  • crypton is maintained, contrary to cryptonite
  • since the Hackage scrypt package uses SSE2, we can't build it on non-x86 platforms (non x86_64 even probably). The best option is to disable the Scrypt module. To prevent cabal from pulling in scrypt in spite of that, we need to patch build-depends to respect the flag.

Currently untested, waiting for cache to catch up.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • 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/)
  • 24.11 Release Notes (or backporting 23.11 and 24.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
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

- crypton is maintained, contrary to cryptonite
- since the Hackage scrypt package uses SSE2, we can't build it on
  non-x86 platforms (non x86_64 even probably). The best option
  is to disable the Scrypt module. To prevent cabal from pulling
  in scrypt in spite of that, we need to patch build-depends to
  respect the flag.
@ofborg ofborg bot added the 8.has: package (new) This PR adds a new package label Oct 26, 2024
@ofborg ofborg bot requested a review from cdepillabout October 26, 2024 01:43
@sternenseemann sternenseemann marked this pull request as ready for review October 26, 2024 11:24
@sternenseemann
Copy link
Member Author

Confirmed to work on aarch64-linux and x86_64-linux. Darwin is difficult to test at the moment because we don't have any sort of cache from a Hydra jobset.

@nix-owners nix-owners bot requested a review from maralorn October 26, 2024 11:25
Copy link
Member

@maralorn maralorn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, but maybe @cdepillabout wants to have a quick glance.

@wegank wegank added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Nov 1, 2024
Copy link
Member

@cdepillabout cdepillabout left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, this does look good to me.

@maralorn maralorn merged commit 97ad835 into NixOS:haskell-updates Nov 2, 2024
49 checks passed
@sternenseemann sternenseemann deleted the password-non-x86 branch November 2, 2024 21:29
cdepillabout added a commit to cdepillabout/password that referenced this pull request Nov 8, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: haskell 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 12.approvals: 1 This PR was reviewed and approved by one reputable person
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants