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

fishnet: init at 2.2.3 #111366

Merged
merged 1 commit into from Feb 2, 2021
Merged

Conversation

tu-maurice
Copy link
Contributor

@tu-maurice tu-maurice commented Jan 31, 2021

Motivation for this change

Requested in #110678. A little hacky probably maybe someone has some suggestions how to better patch the assets.

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.

pkgs/servers/fishnet/assets.nix Outdated Show resolved Hide resolved
pkgs/servers/fishnet/assets.nix Outdated Show resolved Hide resolved
pkgs/servers/fishnet/assets.nix Outdated Show resolved Hide resolved
pkgs/servers/fishnet/default.nix Outdated Show resolved Hide resolved
pkgs/servers/fishnet/default.nix Outdated Show resolved Hide resolved
@tu-maurice
Copy link
Contributor Author

This will probably also need a service module, though I don't have much time today, so probably sometime next week, either in this PR or in a new one.

@tu-maurice
Copy link
Contributor Author

tu-maurice commented Jan 31, 2021

I'm confused. Ofborg sees stdenv.lib? Is it the stdenv.cc.cc.lib that's bothering Ofborg? But why was this no issue with the previous commit?

@SuperSandro2000
Copy link
Member

I'm confused. Ofborg sees stdenv.lib? Is it the stdenv.cc.cc.lib that's bothering Ofborg? But why was this no issue with the previous commit?

It is probably because a stdenv.lib got merged into master.

@ofborg eval

@tu-maurice
Copy link
Contributor Author

I wrote a nixos module for fishnet but then I realized I have no way to test it easily as my only NixOS machine is on 20.09, and therefore am probably unable to be the maintainer for that. So I'd rather go ahead with the PR as is and post my work on the module to the original issue if maybe someone else can do that.

@tu-maurice tu-maurice marked this pull request as ready for review February 1, 2021 20:01
@SuperSandro2000 SuperSandro2000 merged commit ad29e42 into NixOS:master Feb 2, 2021
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

2 participants