[Backport release-24.05] factorio: 2.0.8 -> 2.0.10 #353803
Open
+709
−547
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
bmillwood
force-pushed
the
backport-350528-350727-to-release-24.05
branch
from
5a6052e
to
f67d961
Compare
(cherry picked from commit f68438a)
This is spiritually a merge conflict resolution but I'm putting it in a separate commit to minimise the difference from the cherry-pick source.
In master this was done by NixOS#350453 / revision b12bcab. This part is necessary for making the next cherry-pick apply cleanly, but applying the whole patch here seems probably excessive.
(cherry picked from commit 8a819d4)
(cherry picked from commit 44754ac)
When experimental==stable for Space Age, the experimental.expansion key just goes missing, so we need to fall back to stable in that case. (cherry picked from commit b9b0f03)
(cherry picked from commit a9522ff)
(cherry picked from commit 8387c16)
(cherry picked from commit 0d3fab3)
(cherry picked from commit b79d605)
(cherry picked from commit 33892f8)
(cherry picked from commit 6db8aaf)
bmillwood
force-pushed
the
backport-350528-350727-to-release-24.05
branch
from
f67d961
to
1d8b392
Compare
bmillwood
changed the title
bmillwood
force-pushed
the
backport-350528-350727-to-release-24.05
branch
from
1d8b392
to
4e59cf7
Compare
bmillwood
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Backports:
(My stopping point here is based on what's convenient for me to test, since I happen to already have downloaded 2.0.10 locally. I plan to open another PR after this is merged for the rest of the version updates, but didn't want to mix them all into one big thing.)
I've tested this (or rather, this rebased onto nixos-24.05, without all the other pending release-24.05 changes) locally to ensure both
factorio-space-ageandfactorio_1(=factorio) both start up OK.91d76e3 required me to update my
allowUnfreePredicate, which I assume isn't a big deal?Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.