diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-07-15 02:02:46 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-07-15 02:02:46 -0700 |
| commit | 25e60feb725f1ce58590a097ffe088bbf14717e2 (patch) | |
| tree | 1cccfe708e755ca59aaa18135d8c1bc516688298 /pkgs/development/python-modules | |
| parent | 333f145d7604f07e3b2164b459b46e075fea81f4 (diff) | |
| parent | 369febb9569bdd3ddb76d8de2db6e27441d13e9f (diff) | |
| download | nixpkgs-25e60feb725f1ce58590a097ffe088bbf14717e2.tar nixpkgs-25e60feb725f1ce58590a097ffe088bbf14717e2.tar.gz nixpkgs-25e60feb725f1ce58590a097ffe088bbf14717e2.tar.bz2 nixpkgs-25e60feb725f1ce58590a097ffe088bbf14717e2.tar.lz nixpkgs-25e60feb725f1ce58590a097ffe088bbf14717e2.tar.xz nixpkgs-25e60feb725f1ce58590a097ffe088bbf14717e2.tar.zst nixpkgs-25e60feb725f1ce58590a097ffe088bbf14717e2.zip | |
Merge branch 'master.upstream' into staging.upstream
Diffstat (limited to 'pkgs/development/python-modules')
| -rw-r--r-- | pkgs/development/python-modules/poezio/fix_requirements.patch | 11 | ||||
| -rw-r--r-- | pkgs/development/python-modules/poezio/make_default_config_writable.patch | 25 |
2 files changed, 36 insertions, 0 deletions
diff --git a/pkgs/development/python-modules/poezio/fix_requirements.patch b/pkgs/development/python-modules/poezio/fix_requirements.patch new file mode 100644 index 00000000000..99b022c0e78 --- /dev/null +++ b/pkgs/development/python-modules/poezio/fix_requirements.patch @@ -0,0 +1,11 @@ +--- a/setup.py 2014-03-20 22:27:14.000000000 +0100 ++++ b/setup.py 2015-07-10 21:18:30.156196111 +0200 +@@ -49,7 +49,7 @@ + scripts = ['scripts/poezio'], + data_files = [('share/man/man1/', ['data/poezio.1'])], + +- install_requires = ['sleekxmpp==1.2.4', ++ install_requires = ['sleekxmpp==1.2.5', + 'dnspython3>=1.11.1'], + extras_require = {'OTR plugin': 'python-potr>=1.0', + 'Screen autoaway plugin': 'pyinotify==0.9.4'} diff --git a/pkgs/development/python-modules/poezio/make_default_config_writable.patch b/pkgs/development/python-modules/poezio/make_default_config_writable.patch new file mode 100644 index 00000000000..aa431dcc928 --- /dev/null +++ b/pkgs/development/python-modules/poezio/make_default_config_writable.patch @@ -0,0 +1,25 @@ +diff -ruN a/src/config.py b/src/config.py +--- a/src/config.py 2014-03-20 22:27:05.000000000 +0100 ++++ b/src/config.py 2015-07-10 21:24:37.583136078 +0200 +@@ -18,6 +18,7 @@ + + import os + import logging ++import stat + + from configparser import RawConfigParser, NoOptionError, NoSectionError + from os import environ, makedirs, path, remove +@@ -279,6 +280,13 @@ + copy2(default, options.filename) + elif path.isfile(other): + copy2(other, options.filename) ++ ++ # Inside the nixstore, the reference file is readonly, so is the copy. ++ # Make it writable by the user who just created it. ++ if os.path.exists(options.filename): ++ os.chmod(options.filename, ++ os.stat(options.filename).st_mode | stat.S_IWUSR) ++ + firstrun = True + + try: |