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

laminar: 0.8 -> 1.0 #108334

Merged
merged 1 commit into from Feb 14, 2021
Merged

laminar: 0.8 -> 1.0 #108334

merged 1 commit into from Feb 14, 2021

Conversation

maralorn
Copy link
Member

@maralorn maralorn commented Jan 3, 2021

Bumped version and updated javascript dependencies.
Had to modify the no-network patch as well because of the changed
javascript libs.

Upstream changed the handling CMAKE_INSTALL_PREFIX in
ohwgiles/laminar@1bb545e
so I decided to patch around that as well.

@andir told me that an enableSystemd option is not necessary. The
systemd files wouldn‘t be installed without user intervention anyways.

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.

@zakame
Copy link
Member

zakame commented Jan 4, 2021

Result of nixpkgs-review pr 108334 run on other x86_64-linux 1

1 package built:
  • laminar

@maralorn
Copy link
Member Author

maralorn commented Jan 4, 2021

Mentioning @KAction as maintainer, since that apparently hadn‘t happened automatically.

@KAction
Copy link
Contributor

KAction commented Jan 10, 2021

It does not look to me that you can just drop "enableSystemd" option:

(ins)[nix-shell:~/.cache/nixpkgs-review/pr-108334-1]$ find ./results/laminar/|grep service
./results/laminar/lib/systemd/system/laminar.service

@maralorn
Copy link
Member Author

Why not? Yes, the files are now in there. But do they do any harm?

@KAction
Copy link
Contributor

KAction commented Jan 11, 2021

I ask "are they needed", not "do they harm". Probably even better solution would be to put it into separate output.

@aanderse
Copy link
Member

This .service file is a simple text file that can do nothing without full sysadmin privileges. Yes, the .service file is needed by anyone who wants to run this as a systemd service... A separate output seems unnecessary.

@maralorn @andir are you good to merge this? Aside from laminard version xx-unversioned started text spitting out on startup it looks fine to me after doing some simple testing.

@andir
Copy link
Member

andir commented Feb 11, 2021

I think we should just remove that upstream systemd unit entirely. There is almost no point in having it in the package as the file doesn't work without spilling files into hardcoded locations (that we have to infer from the upstream unit). We should be fully declarative and just write the units ourselvs.

Bumped version and updated javascript dependencies.
Had to modify the no-network patch as well because of the changed
javascript libs.

Upstream changed the handling CMAKE_INSTALL_PREFIX in
ohwgiles/laminar@1bb545e
so I decided to patch around that as well.

Removing systemd units and config file because they should be defined
declaratively
@maralorn
Copy link
Member Author

@aanderse Thanks for picking up on this!
@andir Thanks for the solution.

I have decided to get rid of systemd units and the config file. Because they have no use. I also added myself as a maintainer for good measure.

Is this okay for you @KAction ?

Once this is merged I will approach the quest of upstreaming my laminar module.

@aanderse
Copy link
Member

Great! Thank you for your work on this.

Once this is merged I will approach the quest of upstreaming my laminar module.

I look forward to seeing this and the design choices you have made.

rm -r $out/lib # it contains only systemd unit file
'');
rm -rf $out/lib # remove upstream systemd units
rm -rf $out/etc # remove upstream config file
Copy link
Member

@andir andir Feb 11, 2021

Choose a reason for hiding this comment

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

I am find with removing the files if they provide no value. Do we have proper manpages for the configuration or is the configuration file a good example?

Copy link
Member Author

Choose a reason for hiding this comment

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

That configuration file contains decent documentation for the variables, but it’s completely redundant to the man page man laminard.

Copy link
Member

@aanderse aanderse left a comment

Choose a reason for hiding this comment

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

LGTM 👍

Merge?

@maralorn
Copy link
Member Author

Let's give @KAction the weekend for a reply. They are the maintainer.

@KAction
Copy link
Contributor

KAction commented Feb 14, 2021

Yes, I am perfectly fine with what you came with.

@maralorn maralorn merged commit 57d929c into NixOS:master Feb 14, 2021
@maralorn maralorn deleted the laminar branch February 14, 2021 18:26
@aanderse
Copy link
Member

Thanks everyone!

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

5 participants