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

nixos/services.factorio: fix escapeShellArg #339115

Merged
merged 1 commit into from
Sep 3, 2024

Conversation

Stunkymonkey
Copy link
Contributor

@Stunkymonkey Stunkymonkey commented Sep 2, 2024

Description of changes

follow-up #338052

ping @Daholli

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.

@github-actions github-actions bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` labels Sep 2, 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 Sep 2, 2024
@Daholli
Copy link
Contributor

Daholli commented Sep 3, 2024

I will test it after work today! Thanks for the quick reaction

@Daholli
Copy link
Contributor

Daholli commented Sep 3, 2024

nix-shell -p nixpkgs-review --run "nixpkgs-review pr https://github.com/NixOS/nixpkgs/pull/339115"

when I try to run this it only builds disko, might have to do with it being a draft, but i assume that this should be the fix regardless

@philiptaron
Copy link
Contributor

nix-shell -p nixpkgs-review --run "nixpkgs-review pr https://github.com/NixOS/nixpkgs/pull/339115"

when I try to run this it only builds disko, might have to do with it being a draft, but i assume that this should be the fix regardless

This is a NixOS module, not a package, so that's expected. disko builds because it takes a dependency on everything in nixos (indirectly, through nixos-install-tools)

@Daholli
Copy link
Contributor

Daholli commented Sep 3, 2024

ohhhhh! sorry :D I am still fairly new in the ecosystem. That does make some sense then, is there a way to make sure it would buld in a derivation?

I guess i could change the flake input to point to his repo and check it that way?

@philiptaron
Copy link
Contributor

I guess i could change the flake input to point to his repo and check it that way?

Yep!

@Daholli
Copy link
Contributor

Daholli commented Sep 3, 2024

yup that works!

@philiptaron philiptaron marked this pull request as ready for review September 3, 2024 20:32
@philiptaron philiptaron merged commit 9e244d3 into NixOS:master Sep 3, 2024
28 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants