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.

Sign up for GitHub

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

Jump to bottom

fishnet: 2.2.4 -> 2.2.5 #113930

Merged
merged 1 commit into from
Mar 7, 2021
Merged

fishnet: 2.2.4 -> 2.2.5 #113930

merged 1 commit into from
Mar 7, 2021

Conversation

tu-maurice
Copy link
Contributor

@tu-maurice tu-maurice commented Feb 21, 2021 •
edited
Loading

Motivation for this change

Based on #113828 but with the necessary upgrade of the assets.

Closes #113828

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.

SuperSandro2000
SuperSandro2000 requested changes Feb 21, 2021
View reviewed changes
Copy link
Member

@SuperSandro2000 SuperSandro2000 left a comment

Choose a reason for hiding this comment

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

The assets don't build on darwin due to the usage of autoPatchelfHook. Can you mark it linux only?

@tu-maurice
Copy link
Contributor Author

tu-maurice commented Feb 22, 2021 •
edited
Loading

Sure. What would be the best way to handle the assets on darwin though? Could one just use the unpatched assets for darwin? E.g. just not use autoPatchelfHook on darwin? I sadly have no darwin machine to test this on.

@SuperSandro2000
Copy link
Member

I think you need to do it manually but I am actually not sure but if you do not have a darwin machine to test this on i don't want to force you into maintaining it for it.

@tu-maurice
Copy link
Contributor Author

Hm, yeah. If this would've been an easy fix I could as well just have added it, but this seems like more serious work to be done. Let's just leave it at linux only until someone with a darwin machine is willing to maintain this with me. Shall I set the main package linux only too or is it okay as long as one of the dependencies is linux only?

@SuperSandro2000
Copy link
Member

Shall I set the main package linux only too or is it okay as long as one of the dependencies is linux only?

Upstream mentions darwin support please mark it broken on darwin. If upstream never mentions darwin support please set platforms to Linux only.

@tu-maurice
Copy link
Contributor Author

Hm. fishnet upstream progressed to version 2.2.6 in the meantime, however one of the dependencies for 2.2.6 now requires the newest rust stable 1.50.0 which is not merged yet (#112792). We should probably wait for the rust update and then update fishnet to 2.2.6 in one step.

SuperSandro2000
SuperSandro2000 requested changes Mar 5, 2021
View reviewed changes
pkgs/servers/fishnet/default.nix Outdated
@@ -33,5 +33,6 @@ rustPlatform.buildRustPackage rec {
homepage = "https://github.com/niklasf/fishnet";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ tu-maurice ];
broken = !stdenv.isLinux || !(stdenv.isx86_64 || stdenv.isAarch64);
Copy link
Member

Choose a reason for hiding this comment

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

Can we set platforms to x86_64-linux instead?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Well, you told me earlier to mark it broken, but we sure can also just set the platforms instead.

@ofborg ofborg bot added 8.has: clean-up 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild and removed 10.rebuild-darwin: 1 10.rebuild-darwin: 1-10 labels Mar 6, 2021
@SuperSandro2000 SuperSandro2000 merged commit c2bede9 into NixOS:master Mar 7, 2021
@dmytrokyrychuk dmytrokyrychuk mentioned this pull request Oct 26, 2023
Merged
13 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@SuperSandro2000 SuperSandro2000 SuperSandro2000 requested changes

Assignees
No one assigned
Labels
8.has: clean-up 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild 10.rebuild-linux: 1-10 10.rebuild-linux: 1 11.by: package-maintainer This PR was created by the maintainer of the package it changes
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@tu-maurice @SuperSandro2000