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

tests.haskell.cabalSdist.localFromCabalSdist: prevent unnecessary rebuilds #321246

Merged

Conversation

sternenseemann
Copy link
Member

@sternenseemann sternenseemann commented Jun 20, 2024

Description of changes

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.

@sternenseemann
Copy link
Member Author

@ofborg build tests.haskell.cabalSdist

…sary rebuilds"

This reverts commit 81c06bc.

Reason for revert: This change breaks the
`tests.haskell.cabalSdist.assumptionLocalHasDirectReference` test which
relies on checking for the test source store path in the resulting
derivation files. 81c06bc did not
account for this in the change (though it should be possible).
@sternenseemann sternenseemann force-pushed the revert-cabal-sdist-file-set branch from e5b22e5 to d77ed98 Compare June 20, 2024 14:05
@sternenseemann sternenseemann changed the title Revert "tests.haskell.setBuildTarget: prevent unnecessary rebuilds" tests.haskell.cabalSdist.localFromCabalSdist: prevent unnecessary rebuilds Jun 20, 2024
@sternenseemann
Copy link
Member Author

@ofborg build tests.haskell.cabalSdist

philiptaron

This comment was marked as resolved.

@philiptaron philiptaron self-requested a review June 21, 2024 02:53
@philiptaron
Copy link
Contributor

philiptaron commented Jun 21, 2024

The test that was broken as a result of #320572 (which this PR reverts, contrary to the headmatter) is tests.haskell.cabalSdist.assumptionLocalHasDirectReference, added in #174176.

@sternenseemann
Copy link
Member Author

contrary to the headmatter

Yes, I reverted the wrong commit initially, that has been fixed.

@sternenseemann sternenseemann merged commit b1acf7b into NixOS:master Jun 21, 2024
28 checks passed
@sternenseemann sternenseemann deleted the revert-cabal-sdist-file-set branch June 21, 2024 16:06
@sternenseemann
Copy link
Member Author

@philiptaron I think it should be fixable if a fileset expression is used instead of ./local as well. Maybe the parent expression can just override the local derivation to use this source instead of changing it ad hoc in generated.nix which would be difficult to update anyways after the manual changes.

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