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

echidna: fix build due to brick-1.9 #251919

Merged
merged 1 commit into from
Sep 3, 2023

Conversation

hellwolf
Copy link
Contributor

@hellwolf hellwolf commented Aug 28, 2023

Description of changes

Fix build due to brick-1.9 update from the haskellPackages.

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/)
  • 23.11 Release Notes (or backporting 23.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.

@hellwolf
Copy link
Contributor Author

@ofborg build echidna

@hellwolf
Copy link
Contributor Author

1 package built:
echidna

Result of nixpkgs-review pr 251919 run on x86_64-linux 1

1 package built:
  • echidna

@hellwolf hellwolf marked this pull request as ready for review August 28, 2023 07:05
@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-ready-for-review/3032/2601

Comment on lines 37 to 38
# Note: pending PR https://github.com/crytic/echidna/pull/1096
patches = [ ./brick-1.9.patch ];
Copy link
Member

Choose a reason for hiding this comment

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

Can you pull this from upstream (with fetchpatch)?

We generally try not to check patches in to Nixpkgs if it can be avoided in any way.

Also, we generally ask for Haskell-related PRs to be based on haskell-updates, since we have CI for these Haskell-based programs like echidna.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I see, there is no upstream patch yet unfortunately.

Copy link
Member

Choose a reason for hiding this comment

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

Ah, so crytic/echidna#1096 is the upstream patch, right? You should be able to pull specific commits/files from a GitHub PR using fetchpatch.

Take a look in pkgs/development/haskell-modules/configuration-*.nix, there should be various uses of fetchpatch for pulling patches from specific commits/files from GitHub PRs.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I see let me check with their upstream packaging status. There was a report of something not working.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done re using fetchpatch, thanks!

Re haskell-updates, I would like to contend that. Some "leaf" packages are not published to the hackage, and simply using the hackages to download dependencies. I would like these packages to continue to be tested against the master instead.

@hellwolf
Copy link
Contributor Author

@ofborg build echidna

@hellwolf hellwolf changed the base branch from master to haskell-updates September 2, 2023 10:44
@hellwolf
Copy link
Contributor Author

hellwolf commented Sep 2, 2023

changed base to haskell-updates @cdepillabout

@hellwolf
Copy link
Contributor Author

hellwolf commented Sep 2, 2023

@ofborg build echidna

@cdepillabout
Copy link
Member

Great, thanks for fixing this!

@cdepillabout cdepillabout merged commit 8b2b01f into NixOS:haskell-updates Sep 3, 2023
26 checks passed
@hellwolf hellwolf deleted the echidna-brick-1.9-fix branch September 3, 2023 19:17
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.

None yet

3 participants