From 82eaa207250c39a970e4daa5c527397bef81d93b Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 17:51:22 -0400 Subject: pythonPackages.mezzanine: refactor move to pyhton-modules required update and creation of new package to fix broken. --- .../python-modules/filebrowser_safe/default.nix | 4 +- .../python-modules/grappelli_safe/default.nix | 4 +- .../python-modules/mezzanine/default.nix | 70 ++++++++++++++++++++++ .../mezzanine/writable_settings.patch | 21 ------- pkgs/top-level/python-packages.nix | 54 +---------------- 5 files changed, 75 insertions(+), 78 deletions(-) create mode 100644 pkgs/development/python-modules/mezzanine/default.nix delete mode 100644 pkgs/development/python-modules/mezzanine/writable_settings.patch (limited to 'pkgs') diff --git a/pkgs/development/python-modules/filebrowser_safe/default.nix b/pkgs/development/python-modules/filebrowser_safe/default.nix index cbef81de8cd9..8e95d1e413e4 100644 --- a/pkgs/development/python-modules/filebrowser_safe/default.nix +++ b/pkgs/development/python-modules/filebrowser_safe/default.nix @@ -5,12 +5,12 @@ }: buildPythonPackage rec { - version = "0.3.6"; + version = "0.5.0"; pname = "filebrowser_safe"; src = fetchPypi { inherit pname version; - sha256 = "02bn60fdslvng2ckn65fms3hjbzgsa8qa5161a8lr720wbx8gpj2"; + sha256 = "5dcd31dd79684025139b43841f6515af1da5a4bb0de15bc4d88003db1970648e"; }; buildInputs = [ django ]; diff --git a/pkgs/development/python-modules/grappelli_safe/default.nix b/pkgs/development/python-modules/grappelli_safe/default.nix index f32246c90055..bbba074b3f52 100644 --- a/pkgs/development/python-modules/grappelli_safe/default.nix +++ b/pkgs/development/python-modules/grappelli_safe/default.nix @@ -4,12 +4,12 @@ }: buildPythonPackage rec { - version = "0.3.13"; + version = "0.5.1"; pname = "grappelli_safe"; src = fetchPypi { inherit pname version; - sha256 = "8b21b4724bce449cc4f22dc74ed0be9b3e841d968f3271850bf4836864304eb6"; + sha256 = "27660faa628186d74258781edfa03ef812555d49b4925cfe19c05bcd3da85e40"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/mezzanine/default.nix b/pkgs/development/python-modules/mezzanine/default.nix new file mode 100644 index 000000000000..1a7478b266ab --- /dev/null +++ b/pkgs/development/python-modules/mezzanine/default.nix @@ -0,0 +1,70 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, isPyPy +, pyflakes +, pep8 +, django +, django_contrib_comments +, filebrowser_safe +, grappelli_safe +, bleach +, tzlocal +, beautifulsoup4 +, requests +, requests_oauthlib +, future +, pillow +, chardet +}: + +buildPythonPackage rec { + version = "4.3.1"; + pname = "Mezzanine"; + + src = fetchPypi { + inherit pname version; + sha256 = "42c7909953cc5aea91921b47d804b61e14893bf48a2a476ce49a96559a0fa1d3"; + }; + + disabled = isPyPy; + + buildInputs = [ pyflakes pep8 ]; + propagatedBuildInputs = [ django django_contrib_comments filebrowser_safe grappelli_safe bleach tzlocal beautifulsoup4 requests requests_oauthlib future pillow chardet ]; + + # Tests Fail Due to Syntax Warning, Fixed for v3.1.11+ + doCheck = false; + # sed calls will be unecessary in v3.1.11+ + preConfigure = '' + sed -i 's/==/>=/' setup.py + ''; + + LC_ALL="en_US.UTF-8"; + + meta = with stdenv.lib; { + description = '' + A content management platform built using the Django framework + ''; + longDescription = '' + Mezzanine is a powerful, consistent, and flexible content + management platform. Built using the Django framework, Mezzanine + provides a simple yet highly extensible architecture that + encourages diving in and hacking on the code. Mezzanine is BSD + licensed and supported by a diverse and active community. + + In some ways, Mezzanine resembles tools such as Wordpress that + provide an intuitive interface for managing pages, blog posts, + form data, store products, and other types of content. But + Mezzanine is also different. Unlike many other platforms that + make extensive use of modules or reusable applications, + Mezzanine provides most of its functionality by default. This + approach yields a more integrated and efficient platform. + ''; + homepage = http://mezzanine.jupo.org/; + downloadPage = https://github.com/stephenmcd/mezzanine/releases; + license = licenses.free; + maintainers = with maintainers; [ prikhi ]; + platforms = platforms.linux; + }; + +} diff --git a/pkgs/development/python-modules/mezzanine/writable_settings.patch b/pkgs/development/python-modules/mezzanine/writable_settings.patch deleted file mode 100644 index 4b5be7b5950c..000000000000 --- a/pkgs/development/python-modules/mezzanine/writable_settings.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Nur mezzanine-3.1.10/mezzanine/bin/mezzanine_project.py mezzanine-3.1.10-patched/mezzanine/bin/mezzanine_project.py ---- mezzanine-3.1.10/mezzanine/bin/mezzanine_project.py 2014-08-30 07:12:19.000000000 +0200 -+++ mezzanine-3.1.10-patched/mezzanine/bin/mezzanine_project.py 2016-10-31 14:47:30.982401818 +0100 -@@ -5,6 +5,7 @@ - from distutils.dir_util import copy_tree - from optparse import OptionParser - import os -+import stat - from shutil import move - from uuid import uuid4 - -@@ -61,6 +62,9 @@ - copy_tree(os.path.join(package_path, "project_template"), project_path) - move(local_settings_path + ".template", local_settings_path) - -+ os.chmod(local_settings_path, -+ os.stat(local_settings_path).st_mode | stat.S_IWRITE) -+ - # Generate a unique SECRET_KEY for the project's setttings module. - with open(local_settings_path, "r") as f: - data = f.read() diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 022334913473..d95b17bcd7f2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2750,59 +2750,7 @@ in { metaphone = callPackage ../development/python-modules/metaphone { }; - mezzanine = buildPythonPackage rec { - version = "3.1.10"; - name = "mezzanine-${version}"; - - src = pkgs.fetchurl { - url = "https://github.com/stephenmcd/mezzanine/archive/${version}.tar.gz"; - sha256 = "1cd7d3dji8q4mvcnf9asxn8j109pd5g5d5shr6xvn0iwr35qprgi"; - }; - patches = [ ../development/python-modules/mezzanine/writable_settings.patch ]; - - disabled = isPyPy; - - buildInputs = with self; [ pyflakes pep8 ]; - propagatedBuildInputs = with self; [ - django filebrowser_safe grappelli_safe bleach tzlocal beautifulsoup4 - requests requests_oauthlib future pillow - ]; - - # Tests Fail Due to Syntax Warning, Fixed for v3.1.11+ - doCheck = false; - # sed calls will be unecessary in v3.1.11+ - preConfigure = '' - sed -i 's/==/>=/' setup.py - ''; - - LC_ALL="en_US.UTF-8"; - - meta = { - description = '' - A content management platform built using the Django framework - ''; - longDescription = '' - Mezzanine is a powerful, consistent, and flexible content management - platform. Built using the Django framework, Mezzanine provides a - simple yet highly extensible architecture that encourages diving in and - hacking on the code. Mezzanine is BSD licensed and supported by a - diverse and active community. - - In some ways, Mezzanine resembles tools such as Wordpress that provide - an intuitive interface for managing pages, blog posts, form data, store - products, and other types of content. But Mezzanine is also different. - Unlike many other platforms that make extensive use of modules or - reusable applications, Mezzanine provides most of its functionality by - default. This approach yields a more integrated and efficient platform. - ''; - homepage = http://mezzanine.jupo.org/; - downloadPage = https://github.com/stephenmcd/mezzanine/releases; - license = licenses.free; - maintainers = with maintainers; [ prikhi ]; - platforms = platforms.linux; - broken = true; # broken dependency of django within filebrowser_safe - }; - }; + mezzanine = callPackage ../development/python-modules/mezzanine { }; micawber = callPackage ../development/python-modules/micawber { }; -- cgit 1.4.1