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

pkgs.tests.haskell.shellFor: fix test #392234

Merged
merged 2 commits into from
Mar 27, 2025

Conversation

thomie
Copy link

@thomie thomie commented Mar 23, 2025

Currently the test doesn't do anything. Fix it.

In #296645, envFunc (and thus shellFor) was changed from mkDerivation {phases=[..]} to runCommand ...

So since then, the derivation of shellFor contains a buildCommand ("echo $nativeBuildInputs $buildInputs > $out" to be specific), and as a result the custom phases defined in shellFor's test were ignored.

Also add documentation to the extraDependencies parameter of shellFor.

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/)
  • 25.05 Release Notes (or backporting 24.11 and 25.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.

In NixOS#296645, envFunc (and thus shellFor) was changed from
`mkDerivation {phases=[..]}` to `runCommand ..`. So since
then, the derivation of shellFor contains a `buildCommand`
("echo $nativeBuildInputs $buildInputs > $out"),
and as a result the custom phases defined in shellFor's
test were ignored.
@github-actions github-actions bot added 6.topic: haskell 8.has: documentation This PR adds or changes documentation labels Mar 23, 2025
@nix-owners nix-owners bot requested review from sternenseemann and maralorn March 23, 2025 00:46
@nix-owners nix-owners bot requested a review from cdepillabout March 23, 2025 00:52
@thomie thomie marked this pull request as draft March 23, 2025 01:13
@thomie thomie force-pushed the fix-haskell-shellFor-test branch from 4ed873f to 5386852 Compare March 23, 2025 17:39
@cdepillabout
Copy link
Member

This seems reasonable, thanks for the fix!

Any reason to keep this in draft?

@thomie thomie marked this pull request as ready for review March 24, 2025 00:45
@thomie
Copy link
Author

thomie commented Mar 24, 2025

Ha, I was waiting for the passthru.tests to pass, and they were waiting on me to undraft?

@cdepillabout
Copy link
Member

Looks like ofborg finally ran and passed on Linux. Thanks!

@cdepillabout cdepillabout merged commit f0ba963 into NixOS:haskell-updates Mar 27, 2025
39 checks passed
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.

2 participants