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

target-isns: init at 0.6.8 #108866

Merged
merged 1 commit into from Jan 14, 2021
Merged

Conversation

markuskowa
Copy link
Member

Motivation for this change

Daemon that registers iSCSI exports from the Linux LIO target with an iSNS server.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

install(FILES target-isns.8 DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man8/)
if (SUPPORT_SYSTEMD)
- install(FILES target-isns.service DESTINATION /usr/lib/systemd/system/)
+ install(FILES target-isns.service DESTINATION ${CMAKE_INSTALL_PREFIX}/usr/lib/systemd/system/)
Copy link
Member

@ajs124 ajs124 Jan 9, 2021

Choose a reason for hiding this comment

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

I don't think this should include /usr.

If these are meant to be used with systemd.packages, I think that only works in lib/systemd/system. I might be wrong about that, though.

Copy link
Contributor

Choose a reason for hiding this comment

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

Copy link
Member Author

@markuskowa markuskowa Jan 9, 2021

Choose a reason for hiding this comment

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

OK, now the systemd files get actually installed, and end up in lib/systemd/system.
I am a bit hesitant when comes to upstreaming such nix specific patches. It may take more time energy to explain the patch than just keeping in it nixpkgs.

Copy link
Contributor

Choose a reason for hiding this comment

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

CMAKE_INSTALL_PREFIX is not Nix specific, it's CMake-specific. It is also mentioned in their own tutorial: https://cmake.org/cmake/help/latest/guide/tutorial/index.html

Copy link
Member Author

@markuskowa markuskowa Jan 9, 2021

Choose a reason for hiding this comment

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

Sure, CMAKE_INSTALL_PREFIX is a cmake feature. However, as it is now the patch breaks a standard FHS distro's installation: the config file would end up in e.g. /usr/etc or /usr/local/etc instead of /etc. I am not too familiar with cmake. What would be the right way to do this?

pkgs/top-level/all-packages.nix Outdated Show resolved Hide resolved
@zaninime
Copy link
Contributor

zaninime commented Jan 9, 2021

Did you consider delivering the patch upstream as well? I'm pretty sure they just never had to install their software anywhere else than the default location(s), /etc and /usr.

@SuperSandro2000
Copy link
Member

This is a semi-automatic executed nixpkgs-review which does not build all packages (e.g. lumo, tensorflow or pytorch)
If you find some bugs or got suggestions for further things to search or run please reach out to SuperSandro2000 on IRC.

Result of nixpkgs-review pr 108866 run on x86_64-linux 1

1 package built:
  • target-isns

@markuskowa
Copy link
Member Author

@ajs124 @zaninime Should we move forward with the PR or are there still open questions thats need to be addressed?

@SuperSandro2000 SuperSandro2000 merged commit 22d184a into NixOS:master Jan 14, 2021
@markuskowa markuskowa deleted the new-targetisns branch January 14, 2021 20:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants