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

haskell: Don't use package-qualified and non-package-qualified grep #320148

Merged

Conversation

nh2
Copy link
Contributor

@nh2 nh2 commented Jun 15, 2024

Description of changes

Using grep in 2 different ways can cause confusion and increase the closure, especially if it's not the same grep.

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.

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.

We are just waiting for the next set rebuild, right?

@sternenseemann
Copy link
Member

Or we merge this into staging…

@wegank wegank added 12.approvals: 2 This PR was reviewed and approved by two reputable people 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in the package labels Jun 18, 2024
@maralorn
Copy link
Member

I mean in the end that will likely also trigger another rebuild (unless we are careful with the timing) only advantage is it doesn’t happen on our branch. So I suggest we just wait for the merge impending merge and then merge it here.

@nh2
Copy link
Contributor Author

nh2 commented Jun 19, 2024

No rush from my side. It was just a drive-by cleanup.

@eldritch-cookie
Copy link
Contributor

this seems like it was just forgotten, so i will ping the people involved @sternenseemann @maralorn @nh2 sorry if i was mistaken.

@sternenseemann sternenseemann changed the base branch from haskell-updates to staging November 1, 2024 13:57
@sternenseemann

This comment was marked as outdated.

@sternenseemann

This comment was marked as outdated.

@sternenseemann
Copy link
Member

@ofborg build haskell.packages.ghc948.microlens

@maralorn
Copy link
Member

maralorn commented Nov 1, 2024

Why test 948 specifically?

@sternenseemann
Copy link
Member

GHC >= 9.6 needs to be rebuilt.

@sternenseemann sternenseemann merged commit a2f60bb into NixOS:staging Nov 17, 2024
39 checks passed
@sternenseemann sternenseemann added the 9.needs: port to stable A PR needs a backport to the stable release. label Nov 17, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: haskell 9.needs: port to stable A PR needs a backport to the stable release. 10.rebuild-darwin: 501+ 10.rebuild-darwin: 5001+ 10.rebuild-linux: 501+ 10.rebuild-linux: 5001+ 12.approvals: 2 This PR was reviewed and approved by two reputable people 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in the package
Development

Successfully merging this pull request may close these issues.

5 participants