diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2016-10-06 10:05:54 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2016-10-06 10:05:54 +0200 |
commit | 354c588cf2fd3caf7a232a5f74ab9197cc639764 (patch) | |
tree | 019679d03b8c4fe141bd00a8de7622e498756fad /pkgs/applications | |
parent | 548bcd0de130f9dfe3595d9e9f58b1071402fbf0 (diff) | |
download | nixlib-354c588cf2fd3caf7a232a5f74ab9197cc639764.tar nixlib-354c588cf2fd3caf7a232a5f74ab9197cc639764.tar.gz nixlib-354c588cf2fd3caf7a232a5f74ab9197cc639764.tar.bz2 nixlib-354c588cf2fd3caf7a232a5f74ab9197cc639764.tar.lz nixlib-354c588cf2fd3caf7a232a5f74ab9197cc639764.tar.xz nixlib-354c588cf2fd3caf7a232a5f74ab9197cc639764.tar.zst nixlib-354c588cf2fd3caf7a232a5f74ab9197cc639764.zip |
Octoprint: make sockjs-tornado and tornado_4_0_1 private
Tornado 4.0.1 is old and insecure, however, a package still depends on it. We now move the package from the main Python package set into the expression of the package that needs it.
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/misc/octoprint/default.nix | 39 |
1 files changed, 37 insertions, 2 deletions
diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix index b39b73c830ff..fa0097272ffb 100644 --- a/pkgs/applications/misc/octoprint/default.nix +++ b/pkgs/applications/misc/octoprint/default.nix @@ -1,6 +1,41 @@ -{ stdenv, fetchFromGitHub, pythonPackages }: +{ stdenv, fetchFromGitHub, pythonPackages, fetchurl }: -pythonPackages.buildPythonApplication rec { +let + + tornado_4_0_1 = pythonPackages.buildPythonPackage rec { + name = "tornado-${version}"; + version = "4.0.1"; + + propagatedBuildInputs = with pythonPackages; [ backports_ssl_match_hostname_3_4_0_2 certifi ]; + + src = fetchurl { + url = "mirror://pypi/t/tornado/${name}.tar.gz"; + sha256 = "00crp5vnasxg7qyjv89qgssb69vd7qr13jfghdryrcbnn9l8c1df"; + }; + }; + + sockjs-tornado = pythonPackages.buildPythonPackage rec { + name = "sockjs-tornado-${version}"; + version = "1.0.2"; + + src = fetchurl { + url = "mirror://pypi/s/sockjs-tornado/${name}.tar.gz"; + sha256 = "15lcy40h2cm0l8aknbrk48p2sni5wzybsqjx1hxwpk9lfa1xryyv"; + }; + + # This is needed for compatibility with OctoPrint + propagatedBuildInputs = [ tornado_4_0_1 ]; + + meta = with stdenv.lib; { + description = "SockJS python server implementation on top of Tornado framework"; + homepage = http://github.com/mrjoes/sockjs-tornado/; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ abbradar ]; + }; + }; + +in pythonPackages.buildPythonApplication rec { name = "OctoPrint-${version}"; version = "1.2.15"; |