3
0
Fork 0
forked from mirrors/nixpkgs

Merge pull request #20019 from lsix/19989-fix-mezzanine-for-python3

python33Packages.mezzanine Fix
This commit is contained in:
Frederik Rietdijk 2016-11-02 13:44:52 +01:00 committed by GitHub
commit 1558b09a32
2 changed files with 28 additions and 0 deletions

View file

@ -0,0 +1,21 @@
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()

View file

@ -9761,6 +9761,9 @@ in {
name = "Django-${version}";
version = "1.6.11";
# Support to python-3.4 and higher was introduced in django_1_7
disabled = !(isPy26 || isPy27 || isPy33);
src = pkgs.fetchurl {
url = "http://www.djangoproject.com/m/releases/1.6/${name}.tar.gz";
sha256 = "0misvia78c14y07zs5xsb9lv54q0v217jpaindrmhhw4wiryal3y";
@ -10748,6 +10751,9 @@ in {
buildInputs = [ self.django ];
# There is no test embedded
doCheck = false;
meta = {
description = "A snapshot of django-filebrowser for the Mezzanine CMS";
longDescription = ''
@ -14003,6 +14009,7 @@ in {
url = "https://github.com/stephenmcd/mezzanine/archive/${version}.tar.gz";
sha256 = "1cd7d3dji8q4mvcnf9asxn8j109pd5g5d5shr6xvn0iwr35qprgi";
};
patches = [ ../development/python-modules/mezzanine/writable_settings.patch ];
disabled = isPyPy;