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

Revert "Adapt scheduler to work with dynamic derivations" #9081

Merged
merged 1 commit into from
Oct 2, 2023

Conversation

Ericson2314
Copy link
Member

Motivation

This reverts commit 5e3986f. This un-implements RFC 92 but fixes the critical bug #9052 which many people are hitting. This is a decent stop-gap until a minimal reproduction of that bug is found and a proper fix can be made.

Context

Mostly fixed #9052, but I would like to leave that issue open until we have a regression test, so I can then properly fix the bug (unbreaking RFC 92) later.

Priorities

Add 👍 to pull requests you find important.

@github-actions github-actions bot added the with-tests Issues related to testing. PRs with tests have some priority label Oct 2, 2023
@Ericson2314 Ericson2314 force-pushed the hacky-fix-9052 branch 3 times, most recently from 5148a4a to d85a08c Compare October 2, 2023 03:40
This reverts commit 5e3986f. This
un-implements RFC 92 but fixes the critical bug NixOS#9052 which many people
are hitting. This is a decent stop-gap until a minimal reproduction of
that bug is found and a proper fix can be made.

Mostly fixed NixOS#9052, but I would like to leave that issue open until we
have a regression test, so I can then properly fix the bug (unbreaking
RFC 92) later.
@Ericson2314 Ericson2314 merged commit b80207f into NixOS:master Oct 2, 2023
8 checks passed
@Ericson2314 Ericson2314 deleted the hacky-fix-9052 branch October 2, 2023 12:10
@edolstra edolstra added the backport 2.18-maintenance Automatically creates a PR against the branch label Oct 2, 2023
@github-actions
Copy link

github-actions bot commented Oct 2, 2023

Successfully created backport PR for 2.18-maintenance:

@nixos-discourse
Copy link

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

https://discourse.nixos.org/t/2023-10-02-nix-team-meeting-minutes-91/33775/1

Ericson2314 added a commit that referenced this pull request Nov 20, 2023
…ns""

This fixes dynamic derivations, reverting #9081. #9052 However will be
reintroduced unless this is modified somehow.

This reverts commit 8440afb.
@fricklerhandwerk fricklerhandwerk added bug store Issues and pull requests concerning the Nix store labels Jan 21, 2024
Copy link

Backport failed for 2.18-maintenance, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin 2.18-maintenance
git worktree add -d .worktree/backport-9081-to-2.18-maintenance origin/2.18-maintenance
cd .worktree/backport-9081-to-2.18-maintenance
git switch --create backport-9081-to-2.18-maintenance
git cherry-pick -x 8440afbed756254784d9fea3eaab06649dffd390

1 similar comment
Copy link

Backport failed for 2.18-maintenance, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin 2.18-maintenance
git worktree add -d .worktree/backport-9081-to-2.18-maintenance origin/2.18-maintenance
cd .worktree/backport-9081-to-2.18-maintenance
git switch --create backport-9081-to-2.18-maintenance
git cherry-pick -x 8440afbed756254784d9fea3eaab06649dffd390

@Ericson2314 Ericson2314 removed the backport 2.18-maintenance Automatically creates a PR against the branch label Jan 21, 2024
@Ericson2314
Copy link
Member Author

(manual backport has been done)

Ericson2314 added a commit that referenced this pull request Mar 22, 2024
This fixes dynamic derivations, reverting #9081. #9052 However will be
reintroduced unless this is modified somehow.

This reverts commit 8440afb.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug store Issues and pull requests concerning the Nix store with-tests Issues related to testing. PRs with tests have some priority
Projects
None yet
Development

Successfully merging this pull request may close these issues.

error: path is not valid using nix ==2.18.0
4 participants