nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-09-29 19:30:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #97637 from erikarvstedt/fix-pypkgs-20.09

Browse Source 
[20.09] Fix paperless and other Python pkgs
This commit is contained in:
WORLDofPEACE
2020-09-10 13:15:32 -04:00
committed by GitHub
parent 6ce30567ba 83bc4e3caa
commit d8845663d9
4 changed files with 60 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
pkgs/applications/office/paperless/default.nix
View File

@@ -106,26 +106,26 @@ let
};
python = python3.override {
packageOverrides = self: super: {
# Paperless only supports Django 2.0
django = django_2_0 super;
packageOverrides = self: super: let
customPkgs = import ./python-modules super fetchFromGitHub; in
{
pyocr = pyocrWithUserTesseract super;
# Paperless only supports Django 2.0
django = customPkgs.django_2_0;
# Paperless is incompatible with factory_boy >= 3
factory_boy = customPkgs.factory_boy_2_12_0;
# The current version of django_extensions is incompatible with django 2.0
django_extensions = customPkgs.django_extensions_2_2_8;
# These are pre-release versions, hence they are private to this pkg
django-filter = self.callPackage ./python-modules/django-filter.nix {};
django-crispy-forms = self.callPackage ./python-modules/django-crispy-forms.nix {};
};
};
django_2_0 = pyPkgs: pyPkgs.django_2_2.overrideDerivation (_: rec {
pname = "Django";
version = "2.0.12";
name = "${pname}-${version}";
src = pyPkgs.fetchPypi {
inherit pname version;
sha256 = "15s8z54k0gf9brnz06521bikm60ddw5pn6v3nbvnl47j1jjsvwz2";
};
});
runtimePackages = with python.pkgs; [
dateparser
dateutil

30
pkgs/applications/office/paperless/python-modules/default.nix Normal file
View File

@@ -0,0 +1,30 @@
pyPkgs: fetchFromGitHub:
{
django_2_0 = pyPkgs.django_2_2.overridePythonAttrs (old: rec {
version = "2.0.12";
src = pyPkgs.fetchPypi {
inherit (old) pname;
inherit version;
sha256 = "15s8z54k0gf9brnz06521bikm60ddw5pn6v3nbvnl47j1jjsvwz2";
};
});
django_extensions_2_2_8 = pyPkgs.django_extensions.overridePythonAttrs (old: rec {
version = "2.2.8";
src = fetchFromGitHub {
owner = old.pname;
repo = old.pname;
rev = version;
sha256 = "1gd3nykwzh3azq1p9cvgkc3l5dwrv7y86sfjxd9llbyj8ky71iaj";
};
});
factory_boy_2_12_0 = pyPkgs.factory_boy.overridePythonAttrs (old: rec {
version = "2.12.0";
src = pyPkgs.fetchPypi {
inherit (old) pname;
inherit version;
sha256 = "0w53hjgag6ad5i2vmrys8ysk54agsqvgbjy9lg8g0d8pi9h8vx7s";
};
});
}

4
pkgs/development/python-modules/django-extensions/default.nix
View File

@@ -18,13 +18,13 @@
buildPythonPackage rec {
pname = "django-extensions";
version = "2.2.8";
version = "3.0.8";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
sha256 = "1gd3nykwzh3azq1p9cvgkc3l5dwrv7y86sfjxd9llbyj8ky71iaj";
sha256 = "1z2si9wpc8irqhi5i2wp4wr05dqxyw4mn2vj3amp0rvsvydws92c";
};
LC_ALL = "en_US.UTF-8";

19
pkgs/development/python-modules/django-picklefield/default.nix
View File

@@ -1,16 +1,27 @@
{ lib, buildPythonPackage, fetchPypi, django }:
{ lib, buildPythonPackage, fetchFromGitHub, django, pytest, pytest-django }:
buildPythonPackage rec {
pname = "django-picklefield";
version = "3.0.1";
src = fetchPypi {
inherit pname version;
sha256 = "15ccba592ca953b9edf9532e64640329cd47b136b7f8f10f2939caa5f9ce4287";
# The PyPi source doesn't contain tests
src = fetchFromGitHub {
owner = "gintas";
repo = pname;
rev = "v${version}";
sha256 = "0ni7bc86k0ra4pc8zv451pzlpkhs1nyil1sq9jdb4m2mib87b5fk";
};
propagatedBuildInputs = [ django ];
checkInputs = [ pytest pytest-django ];
checkPhase = ''
PYTHONPATH="$(pwd):$PYTHONPATH" \
DJANGO_SETTINGS_MODULE=tests.settings \
pytest tests/tests.py
'';
meta = {
description = "A pickled object field for Django";
homepage = "https://github.com/gintas/django-picklefield";