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

Give Store::queryDerivationOutputMap and evalStore argument #9588

Merged

Conversation

Ericson2314
Copy link
Member

Motivation

Picking up where #9563 left off.

Context

Priorities

Add 👍 to pull requests you find important.

@github-actions github-actions bot added the store Issues and pull requests concerning the Nix store label Dec 10, 2023
@Ericson2314 Ericson2314 force-pushed the queryDerivationOutputMap-evalStore branch from 61dd401 to ba5349c Compare December 11, 2023 00:39
Ericson2314 added a commit to obsidiansystems/hydra that referenced this pull request Dec 11, 2023
Need backport of NixOS/nix#9588 too

Flake lock file updates:

• Updated input 'nix':
    'github:NixOS/nix/c4a5f409f167af133b9d917d4c1c23f3f13de06c' (2023-12-09)
  → 'github:obsidiansystems/nix/f49fd6896a409eaeb9a1169f583143e792920b5f' (2023-12-11)
@Ericson2314
Copy link
Member Author

N.B. thufschmitt/hydra#2 Fixed up Hydra CA supporting using (a backport of) this.

@roberth
Copy link
Member

roberth commented Dec 11, 2023

Needs tests.

The best approach may be to provide a mode to run the test suite with a separate eval store.

@Ericson2314
Copy link
Member Author

The eval-store.sh test is run for CA mode in #9589

Copy link
Member

@roberth roberth left a comment

Choose a reason for hiding this comment

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

No changes to non-experimental behavior.
Merging to unblock other work, which will include tests, such as #9589.

@@ -604,7 +604,7 @@ void DerivationGoal::inputsRealised()
return *outPath;
}
else {
auto outMap = worker.evalStore.queryDerivationOutputMap(depDrvPath);
Copy link
Member

Choose a reason for hiding this comment

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

Small change to CA behavior. Ignores store from now on.
This is in an experimental feature, relating to an already known-broken non-experimental feature.
@Ericson2314 continues to work on this.

Copy link
Member Author

Choose a reason for hiding this comment

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

No longer contains this change!

@Ericson2314 Ericson2314 force-pushed the queryDerivationOutputMap-evalStore branch from ba5349c to 5f30c8a Compare December 11, 2023 15:39
@Ericson2314 Ericson2314 added the backport 2.19-maintenance Automatically creates a PR against the branch label Dec 11, 2023
Copy link
Member

@roberth roberth left a comment

Choose a reason for hiding this comment

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

No behavioral change. Will be tested as mentioned.
Merging to unblock other work.

@Ericson2314 Ericson2314 merged commit 8cddda4 into NixOS:master Dec 11, 2023
9 checks passed
Copy link

Successfully created backport PR for 2.19-maintenance:

@Ericson2314 Ericson2314 deleted the queryDerivationOutputMap-evalStore branch December 11, 2023 16:31
tebowy pushed a commit to tebowy/nix that referenced this pull request Jul 11, 2024
…putMap-evalStore

Give `Store::queryDerivationOutputMap` and `evalStore` argument

(cherry picked from commit 8cddda4)
Change-Id: I394e7e11c3f2e0cd3dbe0f48d757c14c09835e44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.19-maintenance Automatically creates a PR against the branch store Issues and pull requests concerning the Nix store
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants