nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-10-03 13:30:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Octoprint: make sockjs-tornado and tornado_4_0_1 private

Browse Source 
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.

(cherry picked from commit 354c588cf2)
This commit is contained in:
Frederik Rietdijk
2016-10-06 10:05:54 +02:00
parent 234c7b526c
commit 5a793bce97
2 changed files with 37 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
pkgs/applications/misc/octoprint/default.nix
View File

@@ -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";

31
pkgs/top-level/python-packages.nix
View File

@@ -22210,26 +22210,7 @@ in modules // {
};
};
sockjs-tornado = buildPythonPackage rec {
name = "sockjs-tornado-${version}";
version = "1.0.2";
src = pkgs.fetchurl {
url = "mirror://pypi/s/sockjs-tornado/${name}.tar.gz";
sha256 = "15lcy40h2cm0l8aknbrk48p2sni5wzybsqjx1hxwpk9lfa1xryyv";
};
# This is needed for compatibility with OctoPrint
propagatedBuildInputs = with self; [ tornado_4_0_1 ];
meta = {
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 ];
};
};
sopel = buildPythonPackage rec {
name = "sopel-6.3.1";
@@ -26054,18 +26035,6 @@ in modules // {
};
};
tornado_4_0_1 = buildPythonPackage rec {
name = "tornado-${version}";
version = "4.0.1";
propagatedBuildInputs = with self; [ backports_ssl_match_hostname_3_4_0_2 certifi ];
src = pkgs.fetchurl {
url = "mirror://pypi/t/tornado/${name}.tar.gz";
sha256 = "00crp5vnasxg7qyjv89qgssb69vd7qr13jfghdryrcbnn9l8c1df";
};
};
tokenlib = buildPythonPackage rec {
name = "tokenlib-${version}";
version = "0.3.1";