Merge older staging
There are some regressions, but not that many and I want the security update of openssl fast.
This commit is contained in:
26
pkgs/development/python-modules/TurboCheetah/default.nix
Normal file
26
pkgs/development/python-modules/TurboCheetah/default.nix
Normal file
@@ -0,0 +1,26 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, cheetah
|
||||
, nose
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "TurboCheetah";
|
||||
version = "1.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "9e4c7ecb0d061bfb58281363ee1b09337083f013a8b4d0355326a5d8668f450c";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ cheetah ];
|
||||
|
||||
checkInputs = [ nose ];
|
||||
|
||||
meta = {
|
||||
description = "TurboGears plugin to support use of Cheetah templates";
|
||||
homepage = http://docs.turbogears.org/TurboCheetah;
|
||||
license = lib.licenses.mit;
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,26 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pytest
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
if !(pythonOlder "3.3") then null else buildPythonPackage rec {
|
||||
pname = "backports.shutil_get_terminal_size";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "713e7a8228ae80341c70586d1cc0a8caa5207346927e23d09dcbcaf18eadec80";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
pytest
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "A backport of the get_terminal_size function from Python 3.3’s shutil.";
|
||||
homepage = https://github.com/chrippa/backports.shutil_get_terminal_size;
|
||||
license = with lib.licenses; [ mit ];
|
||||
};
|
||||
}
|
||||
@@ -9,9 +9,9 @@ let
|
||||
};
|
||||
setuptools_source = fetchPypi {
|
||||
pname = "setuptools";
|
||||
version = "36.7.1";
|
||||
version = "38.2.3";
|
||||
format = "wheel";
|
||||
sha256 = "eaacfa35eb11199d0b017df416421781a75209817bff3f94820556e36c49bd77";
|
||||
sha256 = "0c4j3jiiwc0h1bdv4xklinp90spgvgiv5fsxp119hif9934nfxfs";
|
||||
};
|
||||
|
||||
# TODO: Shouldn't be necessary anymore for pip > 9.0.1!
|
||||
|
||||
33
pkgs/development/python-modules/cheetah/default.nix
Normal file
33
pkgs/development/python-modules/cheetah/default.nix
Normal file
@@ -0,0 +1,33 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, markdown
|
||||
, isPy3k
|
||||
, TurboCheetah
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "cheetah";
|
||||
version = "2.4.4";
|
||||
|
||||
disabled = isPy3k;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "be308229f0c1e5e5af4f27d7ee06d90bb19e6af3059794e5fd536a6f29a9b550";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ markdown ];
|
||||
|
||||
doCheck = false; # Circular dependency
|
||||
|
||||
checkInputs = [
|
||||
TurboCheetah
|
||||
];
|
||||
|
||||
meta = {
|
||||
homepage = http://www.cheetahtemplate.org/;
|
||||
description = "A template engine and code generation tool";
|
||||
license = lib.licenses.mit;
|
||||
};
|
||||
}
|
||||
@@ -1,6 +1,7 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, unittest2
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@@ -13,9 +14,11 @@ buildPythonPackage rec {
|
||||
sha256 = "509f9419ee91cdd00ba34443217d5ca51f5a364a404e1dce9e8979cea969ca48";
|
||||
};
|
||||
|
||||
checkInputs = [ unittest2 ];
|
||||
|
||||
meta = {
|
||||
description = "Backports and enhancements for the contextlib module";
|
||||
homepage = http://contextlib2.readthedocs.org/;
|
||||
license = lib.licenses.psfl;
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gst-python";
|
||||
version = "1.12.2";
|
||||
version = "1.12.3";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
|
||||
31
pkgs/development/python-modules/pathlib2/default.nix
Normal file
31
pkgs/development/python-modules/pathlib2/default.nix
Normal file
@@ -0,0 +1,31 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, six
|
||||
, pythonOlder
|
||||
, scandir
|
||||
, glibcLocales
|
||||
}:
|
||||
|
||||
if !(pythonOlder "3.4") then null else buildPythonPackage rec {
|
||||
pname = "pathlib2";
|
||||
version = "2.2.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "ce9007df617ef6b7bd8a31cd2089ed0c1fed1f7c23cf2bf1ba140b3dd563175d";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ six ] ++ lib.optional (pythonOlder "3.5") scandir;
|
||||
checkInputs = [ glibcLocales ];
|
||||
|
||||
preCheck = ''
|
||||
export LC_ALL="en_US.UTF-8"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "This module offers classes representing filesystem paths with semantics appropriate for different operating systems.";
|
||||
homepage = https://pypi.python.org/pypi/pathlib2/;
|
||||
license = with lib.licenses; [ mit ];
|
||||
};
|
||||
}
|
||||
@@ -8,13 +8,13 @@
|
||||
# Should use buildPythonPackage here somehow
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "setuptools";
|
||||
version = "36.7.1";
|
||||
version = "38.2.3";
|
||||
name = "${python.libPrefix}-${pname}-${version}";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "543becf5d33d8989dc5222403997488e9dc3872bdecdabb0f57184ca253ec1e8";
|
||||
sha256 = "124jlg72bbk2xxv5wqbwcl4h5cdslslzk92rxjxiplg79l499hv3";
|
||||
};
|
||||
|
||||
buildInputs = [ python wrapPython unzip ];
|
||||
|
||||
Reference in New Issue
Block a user