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.

Sign up for GitHub

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

Jump to bottom

[Backport release-24.05] factorio: 2.0.8 -> 2.0.10 #353803

Merged
merged 12 commits into from
Dec 2, 2024
Merged

[Backport release-24.05] factorio: 2.0.8 -> 2.0.10 #353803

merged 12 commits into from
Dec 2, 2024

Conversation

bmillwood
Copy link
Contributor

@bmillwood bmillwood commented Nov 5, 2024 •
edited
Loading

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-age and factorio_1 (= factorio) both start up OK.

91d76e3 required me to update my allowUnfreePredicate, which I assume isn't a big deal?

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.

@bmillwood bmillwood force-pushed the backport-350528-350727-to-release-24.05 branch 2 times, most recently from f67d961 to 1d8b392 Compare November 5, 2024 11:46
@bmillwood bmillwood changed the title [Backport release-24.05] factorio: 2.0.8 -> 2.0.10 [Backport release-24.05] factorio: 2.0.8 -> 2.0.11 Nov 5, 2024
@bmillwood bmillwood force-pushed the backport-350528-350727-to-release-24.05 branch from 1d8b392 to 4e59cf7 Compare November 5, 2024 11:50
@bmillwood bmillwood changed the title [Backport release-24.05] factorio: 2.0.8 -> 2.0.11 [Backport release-24.05] factorio: 2.0.8 -> 2.0.10 Nov 5, 2024
@bmillwood bmillwood marked this pull request as ready for review November 5, 2024 12:20
@ofborg ofborg bot added the 8.has: package (new) This PR adds a new package label Nov 5, 2024
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels Nov 5, 2024
@priegger
Copy link
Contributor

priegger commented Nov 8, 2024 •
edited
Loading

  • The diff lgtm. Thanks a lot!
  • I tested the regular and experimental versions of 1.x, 2.x and space-age as well as the demo.

Have not tested the headless versions yet.

Edit: I have not used the headless version(s) in a while, I don't have the time to test them at the moment.

@bmillwood
Copy link
Contributor Author

  • The diff lgtm. Thanks a lot!
  • I tested the regular and experimental versions of 1.x, 2.x and space-age as well as the demo.

Have not tested the headless versions yet.

Edit: I have not used the headless version(s) in a while, I don't have the time to test them at the moment.

out of curiosity, what testing do you do? I ask partly because I think when I tested 1.x it ate my achievements file (it didn't like reading the 2.x one, so it replaced it with a fresh one)

@priegger
Copy link
Contributor

priegger commented Nov 8, 2024

  • The diff lgtm. Thanks a lot!
  • I tested the regular and experimental versions of 1.x, 2.x and space-age as well as the demo.

Have not tested the headless versions yet.
Edit: I have not used the headless version(s) in a while, I don't have the time to test them at the moment.

out of curiosity, what testing do you do? I ask partly because I think when I tested 1.x it ate my achievements file (it didn't like reading the 2.x one, so it replaced it with a fresh one)

Thanks for asking, sorry I did not give more details. I only did minimal testing, started a new game and played some seconds. I did not test compatibility to existing data, since I don't have any.

Thanks for bringing this up.

@bmillwood
Copy link
Contributor Author

  • The diff lgtm. Thanks a lot!
  • I tested the regular and experimental versions of 1.x, 2.x and space-age as well as the demo.

Have not tested the headless versions yet.
Edit: I have not used the headless version(s) in a while, I don't have the time to test them at the moment.

out of curiosity, what testing do you do? I ask partly because I think when I tested 1.x it ate my achievements file (it didn't like reading the 2.x one, so it replaced it with a fresh one)

Thanks for asking, sorry I did not give more details. I only did minimal testing, started a new game and played some seconds. I did not test compatibility to existing data, since I don't have any.

Thanks for bringing this up.

to be clear, that's enough for me, although also it's not necessarily my opinion that matters 😅

@wegank wegank added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Nov 25, 2024
@bmillwood
Copy link
Contributor Author

(FWIW, now that nixos-24.11 is out, I think it's still OK to merge this, but I won't be making any more 24.05 backports)

lukegb and others added 10 commits December 2, 2024 01:14
@lukegb @bmillwood
factorio: migrate to by-name hierarchy
46cc2d1 
(cherry picked from commit f68438a)
@bmillwood
factorio: fix factorio_2 for by-name migration
7186978 
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.
@bmillwood
factorio: Drop erictapen as a maintainer
cd78f55 
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.
@lukegb @bmillwood
factorio: nixfmt
60ace15 
(cherry picked from commit 8a819d4)
@lukegb @bmillwood
factorio: change update.py to use the Factorio SHA256 hashes file
10efabb 
(cherry picked from commit 44754ac)
@lukegb @bmillwood
factorio: make update.py more robust about missing experimental versions
1fb641c 
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)
@lukegb @bmillwood
factorio-experimental: 2.0.8 -> 2.0.9
7d16faa 
(cherry picked from commit a9522ff)
@lukegb @bmillwood
factorio-space-age: name drv -space-age, rather than -experimental
c49ef33 
(cherry picked from commit 8387c16)
@lukegb @bmillwood
factorio: reformat update.py with ruff and make lint clean
a956600 
(cherry picked from commit 0d3fab3)
@lukegb @bmillwood
factorio: 2.0.8 -> 2.0.9
cf44b89 
(cherry picked from commit b79d605)
lukegb and others added 2 commits December 2, 2024 01:14
@lukegb @bmillwood
factorio-experimental: 2.0.9 -> 2.0.10
36e27c3 
(cherry picked from commit 33892f8)
@RaHoni @bmillwood
factorio: 2.0.9 -> 2.0.10
9afc506 
(cherry picked from commit 6db8aaf)
@bmillwood bmillwood force-pushed the backport-350528-350727-to-release-24.05 branch from 4e59cf7 to 9afc506 Compare December 2, 2024 01:14
@lukegb lukegb merged commit c1c8d3d into NixOS:release-24.05 Dec 2, 2024
8 of 10 checks passed
@bmillwood bmillwood deleted the backport-350528-350727-to-release-24.05 branch December 2, 2024 10:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@FliegendeWurst FliegendeWurst FliegendeWurst approved these changes

@elitak elitak Awaiting requested review from elitak

@Baughn Baughn Awaiting requested review from Baughn

@priegger priegger Awaiting requested review from priegger

@lukegb lukegb Awaiting requested review from lukegb

Assignees
No one assigned
Labels
8.has: package (new) This PR adds a new package 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 12.approvals: 1 This PR was reviewed and approved by one reputable person
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@bmillwood @priegger @FliegendeWurst @lukegb @wegank @RaHoni