ag/strojnadzor
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Clean up requirements

Browse source
This commit is contained in:
Andrey Golovizin 2020-02-08 13:23:49 +01:00
parent 5ed136073a
commit a9f51afeb7
5 changed files with 47 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

22
default.nix
View file

@ -10,5 +10,25 @@ python.mkDerivation {
version = "0.0.1";
src = pkgs.nix-gitignore.gitignoreSource [] ./.;
buildInputs = [];
propagatedBuildInputs = builtins.attrValues python.packages;
propagatedBuildInputs = with python.packages; [
aldryn-forms
django-absolute
django-cms
django-emailit
django-filer
django-sekizai
django-simple-captcha
django-treebeard
djangocms-file
djangocms-googlemap
djangocms-icon
djangocms-link
djangocms-picture
djangocms-snippet
djangocms-style
djangocms-text-ckeditor
djangocms-video
easy-thumbnails
setuptools
];
}

34
requirements.nix
View file

@ -1,4 +1,4 @@
# generated using pypi2nix tool (version: 2.0.3)
# generated using pypi2nix tool (version: 2.0.4)
# See more at: https://github.com/nix-community/pypi2nix
#
# COMMAND:
@ -616,10 +616,10 @@ let
};
"djangocms-file" = python.mkDerivation {
name = "djangocms-file-2.3.0";
name = "djangocms-file-2.4.0";
src = pkgs.fetchurl {
url = "https://files.pythonhosted.org/packages/52/26/990e49388449ee55e857bc7709fd4f51fbc30872a2bde2fd4d90a1a5c3da/djangocms-file-2.3.0.tar.gz";
sha256 = "6fd29e9b8355bb44b3c57bbed30218308a8da80695d5cf9d4c3a669e43e6360e";
url = "https://files.pythonhosted.org/packages/4d/e1/92814d413d254275695d06864127d9e4986691e039f0872441416e61920d/djangocms-file-2.4.0.tar.gz";
sha256 = "dd5051465d44fa9a3728bac7943c2efc1b806edb316a741b9dbc171a361f27bf";
};
doCheck = commonDoCheck;
format = "setuptools";
@ -657,10 +657,10 @@ let
};
"djangocms-icon" = python.mkDerivation {
name = "djangocms-icon-1.4.2";
name = "djangocms-icon-1.5.0";
src = pkgs.fetchurl {
url = "https://files.pythonhosted.org/packages/f0/1f/5bb9ef17c3df4162766efd539e7e555809422ec5db8167b3bc7b96d8bd71/djangocms-icon-1.4.2.tar.gz";
sha256 = "3a2303ed9e275da23c744d9c812bd7124d163316113847e0b9608c4a352c3f85";
url = "https://files.pythonhosted.org/packages/f9/88/f5aeaddb8b86e971f50c4a53f653a8fdd73f60d43a9ce9f3d45c8b35aeb7/djangocms-icon-1.5.0.tar.gz";
sha256 = "ecca9bc62e2af9e2519b1a4c7ad24cd69bf52bc1d7c4981aa817cfd32e112648";
};
doCheck = commonDoCheck;
format = "setuptools";
@ -892,17 +892,17 @@ let
};
"lxml" = python.mkDerivation {
name = "lxml-4.4.2";
name = "lxml-4.5.0";
src = pkgs.fetchurl {
url = "https://files.pythonhosted.org/packages/e4/19/8dfeef50623892577dc05245093e090bb2bab4c8aed5cad5b03208959563/lxml-4.4.2.tar.gz";
sha256 = "eff69ddbf3ad86375c344339371168640951c302450c5d3e9936e98d6459db06";
url = "https://files.pythonhosted.org/packages/39/2b/0a66d5436f237aff76b91e68b4d8c041d145ad0a2cdeefe2c42f76ba2857/lxml-4.5.0.tar.gz";
sha256 = "8620ce80f50d023d414183bf90cc2576c2837b88e00bea3f33ad2630133bbb60";
};
doCheck = commonDoCheck;
format = "setuptools";
buildInputs = commonBuildInputs ++ [ ];
propagatedBuildInputs = [ ];
meta = with pkgs.stdenv.lib; {
homepage = "http://lxml.de/";
homepage = "https://lxml.de/";
license = licenses.bsdOriginal;
description = "Powerful and Pythonic XML processing library combining libxml2/libxslt with the ElementTree API.";
};
@ -1130,19 +1130,21 @@ let
};
"wheel" = python.mkDerivation {
name = "wheel-0.33.6";
name = "wheel-0.34.2";
src = pkgs.fetchurl {
url = "https://files.pythonhosted.org/packages/59/b0/11710a598e1e148fb7cbf9220fd2a0b82c98e94efbdecb299cb25e7f0b39/wheel-0.33.6.tar.gz";
sha256 = "10c9da68765315ed98850f8e048347c3eb06dd81822dc2ab1d4fde9dc9702646";
url = "https://files.pythonhosted.org/packages/75/28/521c6dc7fef23a68368efefdcd682f5b3d1d58c2b90b06dc1d0b805b51ae/wheel-0.34.2.tar.gz";
sha256 = "8788e9155fe14f54164c1b9eb0a319d98ef02c160725587ad60f14ddc57b6f96";
};
doCheck = commonDoCheck;
format = "setuptools";
buildInputs = commonBuildInputs ++ [ ];
buildInputs = commonBuildInputs ++ [
self."setuptools"
];
propagatedBuildInputs = [ ];
meta = with pkgs.stdenv.lib; {
homepage = "https://github.com/pypa/wheel";
license = licenses.mit;
description = "A built-package format for Python.";
description = "A built-package format for Python";
};
};

4
requirements.txt
View file

@ -19,7 +19,3 @@ Django<2.2
django-classy-tags>=0.9
django-sekizai>=1.0
django-mptt>0.9
html5lib>=1.0.1
Pillow>=3.0
six
pytz

6
requirements_frozen.txt
View file

@ -25,9 +25,9 @@ django-treebeard==4.3.1
djangocms-admin-style==1.4.0
djangocms-attributes-field==1.2.0
djangocms-bootstrap4==1.5.0
djangocms-file==2.3.0
djangocms-file==2.4.0
djangocms-googlemap==1.3.0
djangocms-icon==1.4.2
djangocms-icon==1.5.0
djangocms-link==2.5.0
djangocms-picture==2.3.0
djangocms-snippet==2.2.0
@ -39,7 +39,7 @@ et-xmlfile==1.0.1
html5lib==1.0.1
idna==2.8
jdcal==1.4.1
lxml==4.4.2
lxml==4.5.0
openpyxl==2.4.9
Pillow==7.0.0
premailer==3.6.1

5
requirements_override.nix
View file

@ -4,4 +4,9 @@ self: super: {
"tablib" = python.overrideDerivation super."tablib" (old: {
buildInputs = old.buildInputs ++ [ self."setuptools-scm" ];
});
# https://github.com/nix-community/pypi2nix-overrides/pull/17/files
"wheel" = super."wheel".overrideDerivation
(old: { pipInstallFlags = [ "--ignore-installed" ]; });
}