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

http2tcp: init at 0.5 #81895

Merged
merged 2 commits into from Mar 17, 2020
Merged

http2tcp: init at 0.5 #81895

merged 2 commits into from Mar 17, 2020

Conversation

clkamp
Copy link
Contributor

@clkamp clkamp commented Mar 6, 2020

Motivation for this change
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.

Comment on lines 11 to 13
src = fetchgit {
inherit rev;
url = "git://git.subdivi.de/~helmut/wsgitools.git";
sha256 = "17i939zlk5k1hai51qyhm234fi7f0xc83qgh14r396khg9zsjjnw";
};
Copy link
Contributor

Choose a reason for hiding this comment

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

can they do a new release on pypi? https://pypi.org/project/wsgitools/ seems 5 years out of date anyway

Copy link
Contributor Author

Choose a reason for hiding this comment

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

For http2tcp there is already a new release, for wsgitools I have asked for one.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

For http2tcp there is already a new release, for wsgitools I have asked for one.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Now wsgitools comes from pypi at 0.3.1

@clkamp clkamp changed the title http2tcp: init at 0.4postgit20190303 http2tcp: init at 0.5 Mar 9, 2020
}:

python3Packages.buildPythonApplication rec {

Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change

pkgs/tools/networking/http2tcp/default.nix Show resolved Hide resolved

propagatedBuildInputs = with python3Packages; [ wsgitools ];

format = "other";
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
format = "other";

Comment on lines +22 to +28
installPhase = ''
mkdir -p $out/{bin,share/${pname}}
cp http2tcp* $out/bin
cp Protocol $out/share/${pname}/
'';
Copy link
Contributor

Choose a reason for hiding this comment

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

this doesn't look to be a normal python installation, you probably want to wrap the program with a python interpreter using python.withPackage https://github.com/NixOS/nixpkgs/blob/master/doc/languages-frameworks/python.section.md#pythonwithpackages-function

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I have changed it that way

Copy link
Contributor

@jonringer jonringer left a comment

Choose a reason for hiding this comment

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

diff LGTM
shows usage

[7 built, 0.0 MiB DL]
https://github.com/NixOS/nixpkgs/pull/81895
4 package built:
http2tcp python27Packages.wsgitools python37Packages.wsgitools python38Packages.wsgitools

@jonringer
Copy link
Contributor

@GrahamcOfBorg build http2tcp python27Packages.wsgitools python37Packages.wsgitools python38Packages.wsgitools

@jonringer jonringer merged commit 403a4b1 into NixOS:master Mar 17, 2020
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