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

factorio: use real instead of sample in download help; warn about credentials in store #351555

Merged
merged 2 commits into from
Jan 3, 2025

Conversation

amarshall
Copy link
Member

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.

@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels Oct 27, 2024
@amarshall amarshall force-pushed the factorio-fetch-help branch from 2a4b23e to 2305d3d Compare October 27, 2024 13:37
@amarshall amarshall force-pushed the factorio-fetch-help branch from 2305d3d to b01332a Compare November 3, 2024 19:35
Copy link
Contributor

@bmillwood bmillwood left a comment

Choose a reason for hiding this comment

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

+1 on the ideas in this change, I haven't been able to test it myself yet though

];
system.extraDependencies = [
factorio.src
];
'';
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
'';
'';

this should make nixfmt CI pass I think

though, if you make other changes too, probably just want to run nixfmt yourself, here are the instructions from the failing check step:

pkgs/by-name/fa/factorio/package.nix: not formatted
Some new/changed Nix files are not properly formatted
Please go to the Nixpkgs root directory, run `nix-shell`, then:
nixfmt 'pkgs/by-name/fa/factorio/package.nix'
If you're having trouble, please ping [redacted, just in case @-pings work inside code blocks]


Note the ultimate "_" is replaced with "-" in the --name arg!
Note the ultimate "_" is replaced with "-" in the --name arg!
Copy link
Contributor

Choose a reason for hiding this comment

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

it's slightly awkward that we can no longer guarantee that this is true (or the only difference). I think it's acceptable to leave it as it is, but perhaps there's a rephrasing that is more accurate?

Copy link
Member Author

Choose a reason for hiding this comment

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

Perhaps it doesn’t matter so much to call this out now that folks should be able to just copy-paste as-is rather than bother manually munging the names.

Copy link
Contributor

Choose a reason for hiding this comment

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

yeah, I'm on board with getting rid of it entirely (though I'm not a maintainer or anything, so my opinion has no special weight :) )

Copy link
Member Author

Choose a reason for hiding this comment

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

Removed it.

@bmillwood
Copy link
Contributor

Copy link
Contributor

@Baughn Baughn left a comment

Choose a reason for hiding this comment

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

Definitely a good idea.

@wegank wegank added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Nov 4, 2024
@amarshall amarshall force-pushed the factorio-fetch-help branch from b01332a to f2c8cc4 Compare January 3, 2025 18:33
Makes it easier for the user since they should no longer have to
manually replace things. Remove the note about the name as it may no
longer be true, and the user now has to care less since the values are
more easily copy-pastable.
@amarshall amarshall force-pushed the factorio-fetch-help branch from f2c8cc4 to 5c358db Compare January 3, 2025 18:35
@amarshall
Copy link
Member Author

Rebased and fixed nixfmt errors.

@lukegb
Copy link
Contributor

lukegb commented Jan 3, 2025

:shipit:

@lukegb lukegb merged commit 9855f26 into NixOS:master Jan 3, 2025
22 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux 12.approvals: 1 This PR was reviewed and approved by one reputable person
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants