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/podman: sort files into directories #149769

Merged
merged 1 commit into from
Dec 9, 2021
Merged

nixos/podman: sort files into directories #149769

merged 1 commit into from
Dec 9, 2021

Conversation

zowoq
Copy link
Contributor

@zowoq zowoq commented Dec 9, 2021

Motivation for this change

Makes codeowners, git history, etc. a bit simpler now that podman has expanded beyond the original single file module and test.

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • 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/)
  • 22.05 Release Notes (or backporting 21.11 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
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

cc @NixOS/podman @roberth

Makes codeowners, git history, etc. a bit simpler now that podman has expanded beyond the original single file module and test.
@zowoq zowoq marked this pull request as ready for review December 9, 2021 03:07
@github-actions github-actions bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: policy discussion 8.has: module (update) This PR changes an existing module in `nixos/` labels Dec 9, 2021
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild 10.rebuild-linux: 1-10 labels Dec 9, 2021
@zowoq
Copy link
Contributor Author

zowoq commented Dec 9, 2021

@ofborg build podman.tests

@ofborg test podman podman-dnsname podman-tls-ghostunnel

@adisbladis adisbladis merged commit 273018e into NixOS:master Dec 9, 2021
@zowoq zowoq deleted the podman-sort branch December 9, 2021 06:50
Comment on lines +12 to +14
imports = [
./network-socket-ghostunnel.nix
];
Copy link
Member

Choose a reason for hiding this comment

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

This import is unnecessary because it is not a dependency.
There's a dependency relation between the two modules, but it's the other way around: network-socket-ghostunnel.nix can not exist without podman-network-socket.nix, so it's actually inverted.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Not sure I understand if you're suggesting a change or not?

Do you want it moved here with the other imports?

imports = [
./dnsname.nix
./network-socket.nix
(lib.mkRenamedOptionModule [ "virtualisation" "podman" "libpod" ] [ "virtualisation" "containers" "containersConf" ])
];

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 6.topic: policy discussion 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 10.rebuild-linux: 1-10
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants