mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-24 06:31:02 +00:00
Code Issues Wiki Activity

Merge pull request #19290 from FRidh/octo

Browse source 
Octoprint: make sockjs-tornado and tornado_4_0_1 private
This commit is contained in:
Nikolay Amiantov 2016-10-06 12:26:31 +04:00 committed by GitHub
parent 91f947130f 354c588cf2
commit bb2c20bb0a
2 changed files with 37 additions and 33 deletions
Show stats 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

@ -22846,26 +22846,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";
@ -26784,18 +26765,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";