Skip to content

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

Merged
sternenseemann merged 1 commit intoNixOS:masterfrom
sternenseemann:revert-cabal-sdist-file-set
Jun 21, 2024
Merged

tests.haskell.cabalSdist.localFromCabalSdist: prevent unnecessary rebuilds#321246
sternenseemann merged 1 commit intoNixOS:masterfrom
sternenseemann:revert-cabal-sdist-file-set

Conversation

@sternenseemann
Copy link
Copy Markdown
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.

@github-actions github-actions bot added the 6.topic: haskell General-purpose, statically typed, purely functional programming language label Jun 20, 2024
@ofborg ofborg bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. labels Jun 20, 2024
@sternenseemann
Copy link
Copy Markdown
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
Copy Markdown
Member Author

@ofborg build tests.haskell.cabalSdist

@ofborg ofborg bot removed the 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. label Jun 20, 2024
philiptaron

This comment was marked as resolved.

@philiptaron philiptaron self-requested a review June 21, 2024 02:53
@philiptaron
Copy link
Copy Markdown
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
Copy Markdown
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
@sternenseemann sternenseemann deleted the revert-cabal-sdist-file-set branch June 21, 2024 16:06
@sternenseemann
Copy link
Copy Markdown
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

Labels

6.topic: haskell General-purpose, statically typed, purely functional programming language 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants