swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-22 05:19:00 +02:00
Code Issues Packages Projects Releases Wiki Activity
98598 commits 5 branches 0 tags 27 GiB
Commit graph

85799 commits

Author SHA1 Message Date
Peter Simons c5f8c7fe36 Merge pull request #21722 from mimadrid/fix/r-modules 
Fix a lot of rPackages
 2017-01-07 12:19:42 +01:00
Franz Pletz db8b044651 Merge pull request #21685 from mayflower/fix/bind-outputs 
bind: fix collision of binaries in outputs
 2017-01-07 11:37:17 +01:00
Frederik Rietdijk c0c97c5793 Merge pull request #21729 from Ralith/matrix-synapse 
matrix-synapse: 0.18.6-rc3 -> 0.18.7-rc2
 2017-01-07 09:02:30 +01:00
Dmitry Kalinkin 44a78fb0da
rivet: fix runtime on darwin 2017-01-07 03:00:04 -05:00
Joachim F f1dc2dd552 Merge pull request #21694 from dtzWill/fix/skype-pax 
skype: paxmark to fix execution on PaX-enabled kernels
 2017-01-07 08:05:02 +01:00
Joachim Fasting 0f24e56728
dnscrypt-proxy: 1.9.0 -> 1.9.1 2017-01-07 08:02:53 +01:00
Joachim Fasting d6ff445f10
grsecurity: 4.8.15-201612301949 -> 4.8.16-201701062021 2017-01-07 08:01:41 +01:00
Dmitry Kalinkin 0f71012fe6
sherpa: add useful dependencies 2017-01-07 01:36:51 -05:00
Benjamin Saunders 7027bbfba3 matrix-synapse: 0.18.6-rc3 -> 0.18.7-rc2 2017-01-06 20:41:29 -08:00
Peter Hoeg 3674be1e98 peruse: 1.1 -> 1.2 
1.2 also ships Peruse Creator
 2017-01-07 11:53:48 +08:00
Shea Levy 845dd121f8 ghc-head: Put ./boot into commonPreConfigure 2017-01-06 22:10:29 -05:00
Shea Levy c5c7911ac2 libuv: disable getaddrinfo tests. 
Seem to require network access, at least on darwin
 2017-01-06 21:09:49 -05:00
Franz Pletz e6708cea37
bind: fix collision of binaries in outputs 
Using outputsToInstall the intended behaviour of including host and dnsutils
when bind is installed can be implemented instead of using symlinks to fix
installing all outputs individually with nix-env.

Fixes #19761.
 2017-01-07 02:44:54 +01:00
Daiderd Jordan 56cceca999 Merge pull request #21700 from polyrod/master 
sakura: fixed GLib-GIO-ERROR #21698
 2017-01-07 01:40:00 +01:00
Franz Pletz 887e703d42 Merge pull request #21640 from mguentner/cpp_ipfs_api_update 
cpp-ipfs-api: 2016-11-09 -> 2017-01-04
 2017-01-07 00:44:01 +01:00
Thomas Tuegel 7215118c1b Merge pull request #21704 from gnidorah/master 
kde-gtk-config: follow symlinks for cursors
 2017-01-06 16:51:27 -06:00
Tim Steinbach c1d20ea50c
kernel: 4.9.0 -> 4.9.1 2017-01-06 16:15:18 -05:00
Tim Steinbach ecf87b11f2
kernel: 4.8.15 -> 4.8.16 2017-01-06 16:15:02 -05:00
Tim Steinbach 8fda707027
kernel: 4.4.39 -> 4.4.40 2017-01-06 16:14:30 -05:00
Thomas Tuegel 8633dab72a Merge pull request #21650 from dbalan/ldns-1.7.0 
ldns 1.6.17 -> 1.7.0
 2017-01-06 14:46:18 -06:00
Ioannis Koutras f935115ce0 qtpass: 1.1.4 -> 1.1.6 2017-01-06 22:32:24 +02:00
Vladimír Čunát 1e253d54f5
libpng12: security 1.2.56 -> 1.2.57 
CVE-2016-10087
 2017-01-06 21:15:46 +01:00
mimadrid 8954412fcc
r-modules: fix snpStats package 2017-01-06 21:07:25 +01:00
mimadrid b5a0925663
r-modules: fix VariantAnnotation package 2017-01-06 21:07:25 +01:00
mimadrid 6540b6507d
r-modules: fix rtracklayer package 2017-01-06 21:07:25 +01:00
mimadrid baf65d5000
r-modules: fix Rsubread package 2017-01-06 21:07:25 +01:00
mimadrid 9ebab25442
r-modules: fix gmapR package 2017-01-06 21:07:25 +01:00
mimadrid 286e86f3a5
r-modules: fix oligo package 2017-01-06 21:07:25 +01:00
mimadrid afd1a4c933
r-modules: fix affyio package 2017-01-06 21:07:25 +01:00
mimadrid 4c0c3c7493
r-modules: fix BitSeq package 2017-01-06 21:07:24 +01:00
mimadrid 272b447ea7
r-modules: fix bamsignals package 2017-01-06 21:07:24 +01:00
mimadrid c5e4754ca7
r-modules: fix affyPLM package 2017-01-06 21:07:24 +01:00
mimadrid 1d7fd8f3c4
r-modules: fix xml2 package 2017-01-06 21:07:24 +01:00
mimadrid 5b813c2ab0
r-modules: fix XBRL package 2017-01-06 21:07:24 +01:00
mimadrid 512be9e14a
r-modules: fix WhopGenome package 2017-01-06 21:07:24 +01:00
mimadrid f9d84f8b65
r-modules: fix tkrplot package 2017-01-06 21:07:24 +01:00
mimadrid 0b3e62bb12
r-modules: fix tiff package 2017-01-06 21:07:23 +01:00
mimadrid 9420fa23c6
r-modules: fix TAQMNGR package 2017-01-06 21:07:23 +01:00
mimadrid 2303e63116
r-modules: fix spate package 2017-01-06 21:07:23 +01:00
mimadrid fcbed4b654
r-modules: fix showtext package 2017-01-06 21:07:23 +01:00
mimadrid 8a6b58d51d
r-modules: fix seqminer package 2017-01-06 21:07:23 +01:00
mimadrid e1a5eeef06
r-modules: fix seqinr package 2017-01-06 21:07:22 +01:00
mimadrid 1ef67b9e78
r-modules: fix RVowpalWabbit package 2017-01-06 21:05:54 +01:00
mimadrid ae2723a144
r-modules: fix rtiff package 2017-01-06 21:05:54 +01:00
mimadrid d7ac90dd0c
r-modules: fix rtfbs package 2017-01-06 21:05:53 +01:00
mimadrid fd175e4084
r-modules: fix Rssa package 2017-01-06 21:05:52 +01:00
mimadrid bd2aaada6e
r-modules: fix RSclient package 2017-01-06 21:05:52 +01:00
mimadrid 53235dbe14
r-modules: fix rphast package 2017-01-06 21:05:52 +01:00
mimadrid 780fb79e32
r-modules: fix Rmpfr package 2017-01-06 21:05:51 +01:00
mimadrid a58db75ccb
r-modules: fix rmatio package 2017-01-06 21:05:51 +01:00
mimadrid 674a2077dd
r-modules: fix rJava package 2017-01-06 21:05:51 +01:00
mimadrid 13a582688f
r-modules: fix RJaCGH package 2017-01-06 21:05:51 +01:00
mimadrid 9922867fa8
r-modules: fix Rhtslib package 2017-01-06 21:05:50 +01:00
mimadrid bb60f939ae
r-modules: fix Rhpc package 2017-01-06 21:05:50 +01:00
mimadrid e1bc505da9
r-modules: fix rggobi package 2017-01-06 21:05:50 +01:00
mimadrid 9f2b5e0425
r-modules: fix RGtk2 package 2017-01-06 21:05:50 +01:00
mimadrid 3342f8bd59
r-modules: fix RcppOctave package 2017-01-06 21:05:50 +01:00
mimadrid ba86a39645
r-modules: fix RcppCNPy package 2017-01-06 21:05:49 +01:00
mimadrid dd159d06b6
r-modules: fix rcdd package 2017-01-06 21:05:49 +01:00
mimadrid 8b229baf33
r-modules: fix rbamtools package 2017-01-06 21:05:49 +01:00
mimadrid 558f67e85f
r-modules: fix R2SWF package 2017-01-06 21:05:48 +01:00
mimadrid 277efe9896
r-modules: fix sysfonts package 2017-01-06 21:05:48 +01:00
mimadrid 062c9037d1
r-modules: fix PopGenome package 2017-01-06 21:05:48 +01:00
mimadrid c5ef08cc65
r-modules: fix PKI package 2017-01-06 21:05:48 +01:00
mimadrid 1e9071948f
r-modules: fix mwaved package 2017-01-06 21:05:48 +01:00
mimadrid 4e7de52c26
r-module: fix kza package 2017-01-06 21:05:47 +01:00
mimadrid debb12ce1a
r-module: fix jpeg package 2017-01-06 21:05:47 +01:00
mimadrid e3a2c97c7b
r-modules: fix gmp package 2017-01-06 21:05:47 +01:00
mimadrid 72eb6a8644
r-modules: fix fftwtools package 2017-01-06 21:05:47 +01:00
mimadrid 427c4d954a
r-modules: fix fftw package 2017-01-06 21:05:47 +01:00
mimadrid b88b8ea05b
r-modules: fix devEMF package 2017-01-06 21:05:47 +01:00
mimadrid 6c6aab3e5b
r-modules: fix cairoDevice package 2017-01-06 21:05:47 +01:00
mimadrid f717538866
r-modules: fix git2r package 2017-01-06 21:05:47 +01:00
mimadrid 88fcfafafe
r-modules: fix BayesXsrc package 2017-01-06 21:05:46 +01:00
mimadrid 6f9124e118
r-modules: fix Cairo package 2017-01-06 21:05:46 +01:00
c0bw3b 6d3183e7da
nghttp2: refactor (close #21029) 
Turning the dependencies unrelated to the base libnghttp2 into proper
options.  vcunat modified the commit slightly.
 2017-01-06 21:03:11 +01:00
Frederik Rietdijk f70f898dae Merge pull request #21710 from peterhoeg/f/gitup 
git-up: not a python package
 2017-01-06 20:51:44 +01:00
Domen Kožar f3381f0be2
electron: 1.2.2 -> 1.4.13 2017-01-06 19:00:17 +01:00
Anmol Sethi 3799f9322a neovim: removed unncessary man configuration 
Latest neovim uses a rewritten man plugin that does not need
these changes.
 2017-01-06 18:31:11 +01:00
3noch 7f99fd086b
nginx: add 'cache_purge' module for purging FastCGI cache 2017-01-06 11:27:48 -05:00
Peter Simons fb2e0e1eaa Merge pull request #21718 from mimadrid/fix/r-modules 
r-modules: fix seewave package
 2017-01-06 16:59:31 +01:00
Shea Levy 7ee897a3b3 libuv: Tests fail when cross-compiling 2017-01-06 10:37:04 -05:00
Vladimír Čunát 07bf828bd9
Merge branch 'staging'; security /cc #21642 2017-01-06 16:32:47 +01:00
mimadrid 321d5a01b6
r-modules: fix seewave package 2017-01-06 16:31:30 +01:00
Vladimír Čunát d442a0ffc0
wine*: fixup build by using older flex 2017-01-06 16:25:37 +01:00
Vladimír Čunát cf1d3677d3
flex: bring back 2.6.1 as an option 
Some breakages after flex update aren't so easy to fix,
and I can't really afford to spend much time on it ATM.
 2017-01-06 16:17:46 +01:00
Pascal Wittmann 99c8e8e71f Merge pull request #21711 from mimadrid/fix/picard 
picard: fix compilation and remove unused buildInputs
 2017-01-06 14:50:08 +01:00
Shea Levy 3c2cbd3259 ghc-head: bump 2017-01-06 08:39:12 -05:00
Vladimír Čunát 75fc704cfe
treewide: more fixes of phases after bash 4.3 -> 4.4 2017-01-06 14:05:22 +01:00
mimadrid 0b3e1e0486
picard: remove unused buildInputs 2017-01-06 12:46:38 +01:00
mimadrid 9fc4536ac8
mutagen: 1.34 -> 1.36 2017-01-06 12:46:05 +01:00
Frederik Rietdijk 39bb4fe0ee Merge pull request #21689 from rzetterberg/godot-2.1.1-stable-init 
godot: init at 2.1.1-stable
 2017-01-06 12:43:35 +01:00
Michael Raskin 39b84bb803 Merge pull request #21709 from nhooyr/fzf-man 
fzf: install manpage
 2017-01-06 11:31:36 +00:00
Richard Zetterberg 4799971895 godot: init at 2.1.1-stable 
Adds the [godot engine](https://godotengine.org/) at the latest stable
version.

Produced binary contains the tools and the engine itself.
 2017-01-06 12:07:19 +01:00
Gabriel Ebner 74a97421ce lean: 2016-12-30 -> 2017-01-06 2017-01-06 11:57:40 +01:00
Peter Hoeg 98c9db00d8 git-up: not a python package 
1. git-up is a python package as such but an application, so move it out of python-packages.nix
2. get rid of the tests (we've already run the tests)
 2017-01-06 18:56:26 +08:00
Michael Raskin 5ebee164fa mpd: 0.9.19 -> 0.20 
Add support for no-minor-version

@grahamc:
This includes 0.19.21 fix for some ffmpeg-related crash, do we expect
this to be a security issue worth updating in stable? Is it OK to just
put 0.20 there or do we want to have 0.9.21 bugfix release there?
 2017-01-06 11:39:35 +01:00
Vladimír Čunát 29e93555ec
firefox*: fixup build after updating sed 
I failed to simply patch the bad [:space:] usage; I don't know why.
 2017-01-06 11:22:28 +01:00
Maurizio Di Pietro 25e34e0bae sakura: fixed GLib-GIO-ERROR #21698 #21700 2017-01-06 11:02:05 +01:00
Peter Simons f8a1e87e07 git-annex: update to latest version 2017-01-06 11:01:54 +01:00
Peter Simons d2e344616c hackage-packages.nix: automatic Haskell package set update 
This update was generated by hackage2nix v2.0.4-7-g48fad11 from Hackage revision
c6ccb98171.
 2017-01-06 11:01:48 +01:00
Peter Simons 0761b0bc5b configuration-hackage2nix.yaml: don't follow LTS Haskell's version constraints on hledger-* 2017-01-06 11:01:13 +01:00
Peter Simons a0c197102e configuration-hackage2nix.yaml: keep aeson 1.0.x around for stack 2017-01-06 11:01:13 +01:00
William Casarin ac9b3d64ce configuration-hackage2nix.yaml: update jb55's packages 2017-01-06 11:01:13 +01:00
Maurizio Di Pietro ba9803079c chase: avoided using fq attribute names 2017-01-06 11:00:43 +01:00
Vladimír Čunát cb70a594cb
sed: bring back 4.2.2 temporarily 
It will be useful to fixup compatibility problems with [:space:].
 2017-01-06 10:53:25 +01:00
Anmol Sethi d65be2eb12 fzf: install manpage 
Closes #21706
 2017-01-06 04:27:35 -05:00
Gabriel Ebner ad507954fa emscriptenfastcomp-wrapped: disable hardening 
The hardening flags break webassembly generation, at least in some
cases.
 2017-01-06 09:43:52 +01:00
Frederik Rietdijk d30a17bc2c Merge pull request #21707 from paperdigits/darktable-2.2.1 
darktable 2.2.0 -> 2.2.1
 2017-01-06 08:32:52 +01:00
Frederik Rietdijk d0aa7cd7d8 Merge pull request #21699 from elasticdog/transcrypt 
transcrypt: 1.0.0 -> 1.0.1
 2017-01-06 08:31:52 +01:00
Frederik Rietdijk 4187179f7b Merge pull request #21455 from puffnfresh/package/Natron 
natron: init at 2.1.9
 2017-01-06 08:22:08 +01:00
Frederik Rietdijk 572f2f1fe6 Merge pull request #21705 from Ralith/matrix-synapse 
matrix-synapse: 0.18.6-rc2 -> 0.18.6-rc3
 2017-01-06 08:19:31 +01:00
Mica Semrick 8f22697c62 darktable 2.2.0 -> 2.2.1 2017-01-05 21:46:33 -08:00
Gabriel Ebner b0ccbb395c Merge pull request #21658 from acowley/mu-no-mug 
mu: allow gtk-free builds
 2017-01-06 00:22:30 -05:00
Brian McKenna f133475370 natron: init at 2.1.9 2017-01-06 15:49:35 +11:00
Benjamin Saunders 62e4cfa887 matrix-synapse: 0.18.6-rc2 -> 0.18.6-rc3 2017-01-05 19:53:47 -08:00
Alex Ivanov 5fad2a943b kde-gtk-config: follow symlinks for cursors 2017-01-06 06:18:26 +03:00
spy-tech 7115ed6783
awscli: 1.11.30 -> 1.11.35 2017-01-05 21:58:18 -05:00
Tim Steinbach f2502c9d86
atom: 1.12.8 -> 1.12.9 2017-01-05 19:48:25 -05:00
Aaron Bull Schaefer 196eb75b88 transcrypt: 1.0.0 -> 1.0.1 2017-01-05 16:20:45 -08:00
Jörg Thalheim 7ab5bf4bb6 Merge pull request #21695 from nshalman/shfmt-1.1.0 
shfmt: 0.2.0 -> 1.1.0
 2017-01-06 00:28:14 +01:00
Anthony Cowley 8ca70e358d mu: allow gtk-free builds 
The gtk components are enabled by default when stdenv.isLinux is true.
 2017-01-05 17:55:54 -05:00
Jascha Geerds 40f9eb1f22 Merge pull request #21693 from dtzWill/update/discord 
discord: 0.0.11 -> 0.0.13, PaX fix.
 2017-01-05 23:40:05 +01:00
Nahum Shalman 1a80edba7d shfmt: 0.2.0 -> 1.1.0 2017-01-05 17:34:25 -05:00
Will Dietz 3f9cb55dce skype: paxmark to fix execution on PaX-enabled kernels 2017-01-05 16:26:35 -06:00
Yannis Koutras 8d029efdfd skrooge: 2.5.0 -> 2.6.0 (#21690) 2017-01-05 23:20:36 +01:00
Will Dietz 4e84742798 discord: 0.0.11 -> 0.0.13 2017-01-05 16:13:31 -06:00
Will Dietz 92be17aef4 discord: paxmark to fix execution 2017-01-05 15:52:34 -06:00
Vladimír Čunát 789b811e7d
thunderbird: fixup build after updating sed 2017-01-05 22:40:30 +01:00
John Wiegley 52e74ddc62
pythonPackages.pyev: Remove duplication from last commit 2017-01-05 13:36:29 -08:00
John Wiegley bae778e86c
pythonPackages.pyev: Fix expression to work on Darwin 2017-01-05 13:34:19 -08:00
volth 1181bdd717 chromium, google-chrome: add commandLineArgs 2017-01-05 18:19:44 +00:00
Michael Raskin efb6c30d10 Merge pull request #21656 from zimbatm/packer-0.12.1 
packer: 0.10.1 -> 0.12.1
 2017-01-05 17:54:55 +00:00
Michael Raskin 2523323ffa Merge pull request #21673 from jokogr/f/dvdrwtool 
dvdplusrwtools: apply multiple fixes
 2017-01-05 17:32:55 +00:00
Matthias Beyer c3f3e56697 dictd-db: Add deu2eng / eng2deu 2017-01-05 18:07:22 +01:00
Franz Pletz c58ac7e4d6
irssi: 0.8.20 -> 0.8.21 (security) 
Fixes four security vulnerabilities:

  https://irssi.org/security/irssi_sa_2017_01.txt

No CVEs were assigned yet at the time of this commit.

cc #21642
 2017-01-05 17:25:07 +01:00
Franz Pletz 2102fa0d6d
smack: 3.4.1 -> 4.1.9, fixe CVE-2016-10027 
cc #21642
 2017-01-05 17:22:08 +01:00
nzupec 0b22e6254b libmemcached: update sha256 hash 2017-01-05 15:48:49 +01:00
Jörg Thalheim ca0d747d6d Merge pull request #21578 from Mic92/zfs 
zfs: add unstable variant
 2017-01-05 12:52:56 +01:00
Tuomas Tynkkynen be2a2db0f1 grub2: Workaround flex bug 
I think the flex update in 6bded45883
causes this failure, presumably due to upstream breakage:

````
gcc -DHAVE_CONFIG_H -I.  -Wall -W -DGRUB_UTIL=1 -D_FILE_OFFSET_BITS=64 -I./include -DGRUB_FILE=\"grub_script.yy.c\" -I. -I. -I. -I. -I./include -I./include -I./grub-core/lib/libgcrypt-grub/src/  -I./grub-core/lib/minilzo -I./grub-core/lib/xzembed -DMINILZO_HAVE_CONFIG_H -D_FILE_OFFSET_BITS=64 -Wall -W -Wshadow -Wpointer-arith -Wundef -Wchar-subscripts -Wcomment -Wdeprecated-declarations -Wdisabled-optimization -Wdiv-by-zero -Wfloat-equal -Wformat-extra-args -Wformat-security -Wformat-y2k -Wimplicit -Wimplicit-function-declaration -Wimplicit-int -Wmain -Wmissing-braces -Wmissing-format-attribute -Wmultichar -Wparentheses -Wreturn-type -Wsequence-point -Wshadow -Wsign-compare -Wswitch -Wtrigraphs -Wunknown-pragmas -Wunused -Wunused-function -Wunused-label -Wunused-parameter -Wunused-value  -Wunused-variable -Wwrite-strings -Wnested-externs -Wstrict-prototypes -Wcast-align  -Wextra -Wattributes -Wendif-labels -Winit-self -Wint-to-pointer-cast -Winvalid-pch -Wmissing-field-initializers -Wnonnull -Woverflow -Wvla -Wpointer-to-int-cast -Wstrict-aliasing -Wvariadic-macros -Wvolatile-register-var -Wpointer-sign -Wmissing-include-dirs -Wmissing-prototypes -Wmissing-declarations -Wformat=2 -Werror  -fno-builtin -Wno-undef  -c -o libgrubmods_a-grub_script.yy.o `test -f 'grub_script.yy.c' || echo './'`grub_script.yy.c
./grub-core/script/yylex.l:34:0: error: "yyalloc" redefined [-Werror]
 #define yyalloc(size, scanner)   (grub_malloc((size)))
 ^
grub_script.yy.c:104:0: note: this is the location of the previous definition

 ^
./grub-core/script/yylex.l:35:0: error: "yyfree" redefined [-Werror]
 #define yyfree(ptr, scanner)   (grub_free((ptr)))
 ^
grub_script.yy.c:108:0: note: this is the location of the previous definition

 ^
./grub-core/script/yylex.l:36:0: error: "yyrealloc" redefined [-Werror]
 #define yyrealloc(ptr, size, scanner) (grub_realloc((ptr), (size)))
 ^
grub_script.yy.c:106:0: note: this is the location of the previous definition

 ^
cc1: all warnings being treated as errors
make[2]: *** [Makefile:7540: libgrubmods_a-grub_script.yy.o] Error 1
````

Work around it for now.
 2017-01-05 12:53:43 +02:00
Jason A. Donenfeld 1ba9a3cd9b wireguard: 0.0.20161230 -> 0.0.20170105 
Version bump that contains some new tools.

fixes #21666
 2017-01-05 10:38:58 +00:00
jgertm 52a7b6549f bitbucket-server-cli: init at 0.7.0 (#21616) 2017-01-05 10:21:06 +00:00
Michael Raskin 2b44ec2e13 Merge pull request #21674 from fduraffourg/glusterfs 
glusterfs: fix mount.glusterfs installation
 2017-01-05 10:20:05 +00:00
Vladimír Čunát 5d3563f80c
treewide: more fixes of phases after bash 4.3 -> 4.4 
I'm surprised that the packages ever worked.
 2017-01-05 11:07:04 +01:00
Frederik Rietdijk 3b7193604f pythonPackages.pycrypto: dummy depending on pycryptodome, closes #21671 2017-01-05 11:01:07 +01:00
Frederik Rietdijk 0be446fbfa pythonPackages.credstash: 1.11.0 -> 1.13.2 2017-01-05 10:59:56 +01:00
Ioannis Koutras 60c88c48d1 dvdplusrwtools: apply multiple fixes 
Upstream version of dvd+rw-tools is quite old and many Linux
distributions apply multiple patches to keep it working on newer
systems. This commit includes those patches.

This closes #21024.
 2017-01-05 11:41:34 +02:00
Domen Kožar 28c06567f8 haskellPackages.hakyll: fix build 2017-01-05 10:24:07 +01:00
Frederik Rietdijk 8f046ce0c0 Merge pull request #21670 from berdario/python36-xdis-zopetesting 
Python3.6 compatibility upgrade for xdis zopetesting
 2017-01-05 10:12:44 +01:00
Florian Duraffourg 06e16f00c4 Fix mount.glusterfs installation 2017-01-05 10:02:33 +01:00