[Nix-commits] [NixOS/nixpkgs] 2c021b: ocaml-oasis: 0.4.5 -> 0.4.6 (#15209)

2016-05-04 Thread vbgl
Branch: refs/heads/master Home: https://github.com/NixOS/nixpkgs Commit: 2c021bdbba762bb423f01a0a429152fea025871c https://github.com/NixOS/nixpkgs/commit/2c021bdbba762bb423f01a0a429152fea025871c Author: vbgl <v...@users.noreply.github.com> Date: 2016-05-04 (Wed, 04 Ma

[Nix-commits] [NixOS/nixpkgs] 60a7c6: hol-light: fix build with camlp5-6.16

2016-05-03 Thread vbgl
ps://github.com/NixOS/nixpkgs/commit/a95df7d800e7b26694063e2883f325de0abab4c0 Author: vbgl <v...@users.noreply.github.com> Date: 2016-05-03 (Tue, 03 May 2016) Changed paths: M pkgs/applications/science/logic/hol_light/Makefile.patch M pkgs/development/tools/ocaml/camlp5/defau

[Nix-commits] [NixOS/nixpkgs] f3536f: cairo: build cairo-xlib even on Darwin

2016-04-21 Thread vbgl
Author: vbgl <v...@users.noreply.github.com> Date: 2016-04-21 (Thu, 21 Apr 2016) Changed paths: M pkgs/development/libraries/cairo/default.nix Log Message: --- Merge pull request #14826 from vbgl/cairo-xlib-on-darwin cairo: build cairo-xlib even on Darwin Co

[Nix-commits] [NixOS/nixpkgs] eccfe7: qt4.8: darwin compatibility

2016-04-20 Thread vbgl
/NixOS/nixpkgs/commit/df681cda9a96ed21f4ec0362d6807f489b6d9deb Author: vbgl <v...@users.noreply.github.com> Date: 2016-04-20 (Wed, 20 Apr 2016) Changed paths: M pkgs/development/libraries/qt-4.x/4.8/default.nix M pkgs/top-level/all-packages.nix Log Message: ---

[Nix-commits] [NixOS/nixpkgs] 18b95e: ncmpcpp: 0.7.2 -> 0.7.3

2016-04-13 Thread vbgl
hanged paths: M pkgs/applications/audio/ncmpcpp/default.nix Log Message: --- ncmpcpp: 0.7.2 -> 0.7.3 Commit: c7b5cfc7d25eaf058e275f99cc9cb7bc66031dce https://github.com/NixOS/nixpkgs/commit/c7b5cfc7d25eaf058e275f99cc9cb7bc66031dce Author: vbgl <v...@users.norepl

[Nix-commits] [NixOS/nixpkgs] 77d79e: fsharp: 4.0.0.4 -> 4.0.1.1

2016-03-31 Thread vbgl
r 2016) Changed paths: M pkgs/development/compilers/fsharp/default.nix Log Message: --- fsharp: 4.0.0.4 -> 4.0.1.1 Commit: 149b9faac0b5411ae91631fe0c9249942e6ab4b4 https://github.com/NixOS/nixpkgs/commit/149b9faac0b5411ae91631fe0c9249942e6ab4b4 Author

[Nix-commits] [NixOS/nixpkgs] b40a25: scribus: 1.4.5 -> 1.4.6

2016-03-22 Thread vbgl
r 2016) Changed paths: M pkgs/applications/office/scribus/default.nix Log Message: --- scribus: 1.4.5 -> 1.4.6 Commit: 9bb2dd5e10adcf78cd6a0aa13ae04e1a9e429903 https://github.com/NixOS/nixpkgs/commit/9bb2dd5e10adcf78cd6a0aa13ae04e1a9e429903 Author

[Nix-commits] [NixOS/nixpkgs] f3336a: openal: 1.16.0 -> 1.17.2

2016-03-02 Thread vbgl
2a https://github.com/NixOS/nixpkgs/commit/dfe69e2f4fb5e14523839f1fc67bb943b2f5782a Author: vbgl <v...@users.noreply.github.com> Date: 2016-03-02 (Wed, 02 Mar 2016) Changed paths: M pkgs/development/libraries/openal-soft/default.nix M pkgs/top-level/all-packag

[Nix-commits] [NixOS/nixpkgs] c3fa09: gentium-book-basic: init at 1.102

2016-03-02 Thread vbgl
commit/7f422cf872b7d720f9619aabe2887e606cc387fe Author: vbgl <v...@users.noreply.github.com> Date: 2016-03-02 (Wed, 02 Mar 2016) Changed paths: A pkgs/data/fonts/gentium-book-basic/default.nix M pkgs/top-level/all-packages.nix Log Message: --- Merge pull request #13621 from DamienCassou/add-

[Nix-commits] [NixOS/nixpkgs] abfc9e: ocamlPackages.result: init at 1.1

2016-03-01 Thread vbgl
nit at 0.9.0 Commit: a99715c83bfe983a2ea6e9d13e84120989f38cb8 https://github.com/NixOS/nixpkgs/commit/a99715c83bfe983a2ea6e9d13e84120989f38cb8 Author: vbgl <v...@users.noreply.github.com> Date: 2016-03-01 (Tue, 01 Mar 2016) Changed paths: A pkgs/development/ocaml-modules/ocaml-

[Nix-commits] [NixOS/nixpkgs] c4644c: gdal: 2.0.1 -> 2.0.2 + netCDF format support

2016-02-24 Thread vbgl
S/nixpkgs/commit/a15f7c018e61c25f6a951bbe96b4798c750136bf Author: vbgl <v...@users.noreply.github.com> Date: 2016-02-24 (Wed, 24 Feb 2016) Changed paths: M pkgs/development/libraries/gdal/default.nix Log Message: --- Merge pull request #13129 from bzizou/gdal-netc

[Nix-commits] [NixOS/nixpkgs] 5b28d3: ocamlPackages.findlib: 1.5.3 -> 1.6.1

2016-02-24 Thread vbgl
https://github.com/NixOS/nixpkgs/commit/b05708ba0e39b0c777beb5a3015d1b5e5f057570 Author: vbgl <v...@users.noreply.github.com> Date: 2016-02-24 (Wed, 24 Feb 2016) Changed paths: M pkgs/development/tools/ocaml/findlib/default.nix M pkgs/development/tools/ocaml/findlib/instal

[Nix-commits] [NixOS/nixpkgs] a9e8c7: proj: Add platforms.darwin and enable doCheck.

2016-02-22 Thread vbgl
Author: vbgl <v...@users.noreply.github.com> Date: 2016-02-22 (Mon, 22 Feb 2016) Changed paths: M pkgs/development/libraries/proj/default.nix Log Message: --- Merge pull request #13372 from knedlsepp/proj-on-darwin proj: Add platforms.darwin and enable doCheck. Co

[Nix-commits] [NixOS/nixpkgs] 2d7375: libao: add dependencies for Darwin frameworks

2016-02-11 Thread vbgl
commit/c9be67a331ed3d2c9a87b476361a73246d7f79f1 Author: vbgl <v...@users.noreply.github.com> Date: 2016-02-11 (Thu, 11 Feb 2016) Changed paths: M pkgs/development/libraries/libao/default.nix M pkgs/top-level/all-packages.nix Log Message: --- Merge pull request #12930 from taku0/

[Nix-commits] [NixOS/nixpkgs] 442ed8: pkgs.xorriso: 1.4.0 -> 1.4.2

2015-12-15 Thread vbgl
com/NixOS/nixpkgs/commit/3ebd2df8ddaa46942441bbc6a931a257ea2518e8 Author: vbgl <v...@users.noreply.github.com> Date: 2015-12-15 (Tue, 15 Dec 2015) Changed paths: M pkgs/tools/cd-dvd/xorriso/default.nix Log Message: --- Merge pull request #11630 from lancelotsix

[Nix-commits] [NixOS/nixpkgs] d39f9e: gsl: 1.16 -> 2.1

2015-12-10 Thread vbgl
— gsl-2.1: https://savannah.gnu.org/forum/forum.php?forum_id=8408 The bug-39055.patch is removed since it seems to be integrated in the 2.1 release. Commit: 251479f89209744b7d84c9eabc072af1b54d14d0 https://github.com/NixOS/nixpkgs/commit/251479f89209744b7d84c9eabc072af1b54d14d0 Author

[Nix-commits] [NixOS/nixpkgs] 35eef7: saga: 2.2.1 -> 2.2.2

2015-11-23 Thread vbgl
v 2015) Changed paths: M pkgs/applications/gis/saga/default.nix Log Message: --- saga: 2.2.1 -> 2.2.2 Commit: 33292cd618c5e50eab38cd50fce48565709e93ab https://github.com/NixOS/nixpkgs/commit/33292cd618c5e50eab38cd50fce48565709e93ab Author

[Nix-commits] [NixOS/nixpkgs] af56ac: youtube-dl: 2015.11.13 -> 2015.11.19

2015-11-20 Thread vbgl
20 Nov 2015) Changed paths: M pkgs/tools/misc/youtube-dl/default.nix Log Message: --- youtube-dl: 2015.11.13 -> 2015.11.19 Commit: eae62caf916bae65c40a69f88a088d540c6c7765 https://github.com/NixOS/nixpkgs/commit/eae62caf916bae65c40a69f88a088d540c6c7765 Author

[Nix-commits] [NixOS/nixpkgs] 5f6ce4: geany: 1.25 -> 1.26

2015-11-18 Thread vbgl
v 2015) Changed paths: M pkgs/applications/editors/geany/default.nix Log Message: --- geany: 1.25 -> 1.26 Commit: 58d0a1ca40cf338a490a8da6929bb008fbba3fdc https://github.com/NixOS/nixpkgs/commit/58d0a1ca40cf338a490a8da6929bb008fbba3fdc Author

[Nix-commits] [NixOS/nixpkgs] 6d1d73: closure-compiler: 20150609 -> 20151015

2015-11-18 Thread vbgl
v 2015) Changed paths: M pkgs/development/compilers/closure/default.nix Log Message: --- closure-compiler: 20150609 -> 20151015 Commit: 204685be8296c6e491480e1b374a9cab470fc307 https://github.com/NixOS/nixpkgs/commit/204685be8296c6e491480e1b374a9cab470fc307 Author

[Nix-commits] [NixOS/nixpkgs] 48cd71: cgal: 4.6.1 -> 4.7

2015-11-12 Thread vbgl
Author: vbgl <v...@users.noreply.github.com> Date: 2015-11-13 (Fri, 13 Nov 2015) Changed paths: M pkgs/development/libraries/CGAL/default.nix Log Message: --- Merge pull request #10965 from sjourdois/cgal cgal: 4.6.1 -> 4.7 Compare: https://github.com/Nix

[Nix-commits] [NixOS/nixpkgs] a3448f: youtube-dl: 2015.10.24 -> 2015.11.10

2015-11-11 Thread vbgl
11 Nov 2015) Changed paths: M pkgs/tools/misc/youtube-dl/default.nix Log Message: --- youtube-dl: 2015.10.24 -> 2015.11.10 Commit: 1e39eb4e00c262aa003868aed5d027a588fc28d6 https://github.com/NixOS/nixpkgs/commit/1e39eb4e00c262aa003868aed5d027a588fc28d6 Author

[Nix-commits] [NixOS/nixpkgs] 6cc033: menhir: refactor to generic; init at 20151110 for ...

2015-11-11 Thread vbgl
https://github.com/NixOS/nixpkgs/commit/b3d2a2874af5740f8394035650d3fa53a2f39d52 Author: vbgl <v...@users.noreply.github.com> Date: 2015-11-12 (Thu, 12 Nov 2015) Changed paths: M pkgs/development/ocaml-modules/menhir/default.nix A pkgs/development/ocaml-modules/menhir/gen

[Nix-commits] [NixOS/nixpkgs] 16f7b1: update mono to 4.0.4.1

2015-11-08 Thread vbgl
v 2015) Changed paths: M pkgs/development/compilers/mono/default.nix Log Message: --- update mono to 4.0.4.1 Commit: 6fa6ff9e2517dbc28fd0744b493c8a6b672dfa2c https://github.com/NixOS/nixpkgs/commit/6fa6ff9e2517dbc28fd0744b493c8a6b672dfa2c Author: v

[Nix-commits] [NixOS/nixpkgs] ccd16c: di: 4.35 -> 4.36

2015-11-05 Thread vbgl
01 Nov 2015) Changed paths: M pkgs/tools/system/di/default.nix Log Message: --- di: 4.35 -> 4.36 Commit: 81e78face8315b457fa1496387416ea6ac56d94a https://github.com/NixOS/nixpkgs/commit/81e78face8315b457fa1496387416ea6ac56d94a Author: vbgl <v...@users.norepl

[Nix-commits] [NixOS/nixpkgs] 62a7ba: ocaml-ppx_tools: init at 0.99.2

2015-11-04 Thread vbgl
Log Message: --- ocaml-lwt: enable ppx Commit: 343de3b64acf84c611bafdab74b5b292923e3907 https://github.com/NixOS/nixpkgs/commit/343de3b64acf84c611bafdab74b5b292923e3907 Author: vbgl <v...@users.noreply.github.com> Date: 2015-11-04 (Wed, 04 Nov 2015) Changed

[Nix-commits] [NixOS/nixpkgs] 8e9a8a: gdal: 1.11.2 -> 1.11.3

2015-11-03 Thread vbgl
essage: --- gdal: 1.11.2 -> 1.11.3 Commit: 95388b650095705d45b21ead44529c2a92bdb7c8 https://github.com/NixOS/nixpkgs/commit/95388b650095705d45b21ead44529c2a92bdb7c8 Author: vbgl <v...@users.noreply.github.com> Date: 2015-11-03 (Tue, 03 Nov 2015) Changed paths: M pk

[Nix-commits] [NixOS/nixpkgs] 7c9be4: gdal: 2.0.0 -> 2.0.1

2015-11-03 Thread vbgl
v 2015) Changed paths: M pkgs/development/libraries/gdal/default.nix Log Message: --- gdal: 2.0.0 -> 2.0.1 Commit: f9e681e09e8cfb00f1de84e2c267d8ef41a95d1d https://github.com/NixOS/nixpkgs/commit/f9e681e09e8cfb00f1de84e2c267d8ef41a95d1d Author

[Nix-commits] [NixOS/nixpkgs] 91e967: lmdb: fix on OSX

2015-10-28 Thread vbgl
t 2015) Changed paths: M pkgs/development/libraries/lmdb/default.nix Log Message: --- lmdb: fix on OSX Commit: 0ad5dc11e1b6c757113ac209b6b03d0ef6d29b7f https://github.com/NixOS/nixpkgs/commit/0ad5dc11e1b6c757113ac209b6b03d0ef6d29b7f Author: vbgl <v...@users.noreply.g

[Nix-commits] [NixOS/nixpkgs] f729d7: pkgs.units: 2.11 -> 2.12

2015-10-20 Thread vbgl
gs/commit/a6c3837e392f5f85fdd925670781eb68a56e203b Author: vbgl <v...@users.noreply.github.com> Date: 2015-10-20 (Tue, 20 Oct 2015) Changed paths: M pkgs/tools/misc/units/default.nix Log Message: --- Merge pull request #10495 from lancelotsix/update_gnu_units pkgs.units: 2.11 -&

[Nix-commits] [NixOS/nixpkgs] f2898b: pyquery: 1.2.4 -> 1.2.9

2015-10-18 Thread vbgl
t 2015) Changed paths: M pkgs/top-level/python-packages.nix Log Message: --- pyquery: 1.2.4 -> 1.2.9 Commit: d43a1125c3858e97aae8f7f7d9f60c78f9e0b259 https://github.com/NixOS/nixpkgs/commit/d43a1125c3858e97aae8f7f7d9f60c78f9e0b259 Author: vbgl <v...@users.norepl

[Nix-commits] [NixOS/nixpkgs] fca867: cssselect: 0.7.1 -> 0.9.1

2015-10-17 Thread vbgl
t 2015) Changed paths: M pkgs/top-level/python-packages.nix Log Message: --- cssselect: 0.7.1 -> 0.9.1 Commit: ed5ec7d1386809713ac597e81f27d387a9fd5fda https://github.com/NixOS/nixpkgs/commit/ed5ec7d1386809713ac597e81f27d387a9fd5fda Author

[Nix-commits] [NixOS/nixpkgs] 562847: saga: 2.2.0 -> 2.2.1

2015-10-12 Thread vbgl
t 2015) Changed paths: M pkgs/applications/gis/saga/default.nix Log Message: --- saga: 2.2.0 -> 2.2.1 Commit: d21347a9197fa5d302473995f7df1cbd3530ac8a https://github.com/NixOS/nixpkgs/commit/d21347a9197fa5d302473995f7df1cbd3530ac8a Author

[Nix-commits] [NixOS/nixpkgs] 36be2e: neovim: 2015-06-09 -> 2015-10-08

2015-10-11 Thread vbgl
t 2015) Changed paths: M pkgs/applications/editors/neovim/default.nix Log Message: --- neovim: 2015-06-09 -> 2015-10-08 Commit: 055f08dcf978ba4092f29524876c7f4303e958ff https://github.com/NixOS/nixpkgs/commit/055f08dcf978ba4092f29524876c7f4303e958ff Author

[Nix-commits] [NixOS/nixpkgs] ff308d: viewnior: 1.4 -> 1.5

2015-10-04 Thread vbgl
t 2015) Changed paths: M pkgs/applications/graphics/viewnior/default.nix Log Message: --- viewnior: 1.4 -> 1.5 Commit: ded3dfbce6ac486763f10482a17b81b48ec59e85 https://github.com/NixOS/nixpkgs/commit/ded3dfbce6ac486763f10482a17b81b48ec59e85 Author

[Nix-commits] [NixOS/nixpkgs] 6a238d: coq-ext-lib: c2c71a2a -> 0.9.0 & 1.0.0-beta2

2015-10-04 Thread vbgl
ixpkgs/commit/0de1939a777a77bb6e9362cf6eda004aad8efb8b Author: vbgl <v...@users.noreply.github.com> Date: 2015-10-05 (Mon, 05 Oct 2015) Changed paths: M pkgs/development/coq-modules/coq-ext-lib/default.nix M pkgs/top-level/all-packages.nix Log Message: --- Merge

[Nix-commits] [NixOS/nixpkgs] a3b5ae: pythonPackages ipython: add readline support, fixe...

2015-10-03 Thread vbgl
Author: vbgl <v...@users.noreply.github.com> Date: 2015-10-03 (Sat, 03 Oct 2015) Changed paths: M pkgs/top-level/python-packages.nix Log Message: --- Merge pull request #10196 from FRidh/ipython pythonPackages ipython: add readline support, fixes #10190 Compare: https:

[Nix-commits] [NixOS/nixpkgs] 5a7ad7: glpk: 4.52.1 -> 4.56

2015-10-02 Thread vbgl
t 2015) Changed paths: M pkgs/development/libraries/glpk/default.nix Log Message: --- glpk: 4.52.1 -> 4.56 Commit: 1e6f0cc139cb3b6d73995a9b0aa18ba01d695ff6 https://github.com/NixOS/nixpkgs/commit/1e6f0cc139cb3b6d73995a9b0aa18ba01d695ff6 Author

[Nix-commits] [NixOS/nixpkgs] 9a1245: hol_light: add support for camlp5 > 6.12

2015-09-29 Thread vbgl
t; 6.14 Commit: b02c07641b1fc697a5811aa090f9156231b6f11f https://github.com/NixOS/nixpkgs/commit/b02c07641b1fc697a5811aa090f9156231b6f11f Author: vbgl <v...@users.noreply.github.com> Date: 2015-09-29 (Tue, 29 Sep 2015) Changed paths: A pkgs/applications/science/logic/hol_light/M

[Nix-commits] [NixOS/nixpkgs] ad3193: byobu: fixup script paths

2015-09-15 Thread vbgl
p 2015) Changed paths: M pkgs/tools/misc/byobu/default.nix Log Message: --- byobu: fixup script paths Commit: 39af9df25baf7fab741e96e6f059247bde199ef6 https://github.com/NixOS/nixpkgs/commit/39af9df25baf7fab741e96e6f059247bde199ef6 Author: vbgl <v...@users.noreply.g

[Nix-commits] [NixOS/nixpkgs] 95e8e6: deluge: 1.3.11 -> 1.3.12

2015-09-14 Thread vbgl
p 2015) Changed paths: M pkgs/top-level/python-packages.nix Log Message: --- deluge: 1.3.11 -> 1.3.12 Commit: bc6c6f144461bb3ce020040db5fcefe6484c0502 https://github.com/NixOS/nixpkgs/commit/bc6c6f144461bb3ce020040db5fcefe6484c0502 Author

[Nix-commits] [NixOS/nixpkgs] 4501d4: gdal: fix standalone python programs

2015-09-10 Thread vbgl
24 Aug 2015) Changed paths: M pkgs/development/libraries/gdal/default.nix Log Message: --- gdal: fix standalone python programs Commit: 83fe2a4bfa9f77dd8a017ba3f066203d5c9a7a93 https://github.com/NixOS/nixpkgs/commit/83fe2a4bfa9f77dd8a017ba3f066203d5c9a7a93 Author

[Nix-commits] [NixOS/nixpkgs] cf660d: smtube: 15.5.17 - 15.8.0

2015-08-26 Thread vbgl
2015) Changed paths: M pkgs/applications/video/smtube/default.nix Log Message: --- smtube: 15.5.17 - 15.8.0 Commit: e5a402208cf87c2ed2d0dba007d100e16a4cbe0d https://github.com/NixOS/nixpkgs/commit/e5a402208cf87c2ed2d0dba007d100e16a4cbe0d Author: vbgl v

[Nix-commits] [NixOS/nixpkgs] 475527: compcert: 2.4 - 2.5

2015-08-26 Thread vbgl
/NixOS/nixpkgs/commit/70f2952ca6a154c377d247d398b9d979421afc2c Author: vbgl v...@users.noreply.github.com Date: 2015-08-26 (Wed, 26 Aug 2015) Changed paths: M pkgs/development/compilers/compcert/default.nix M pkgs/top-level/all-packages.nix Log Message: --- Merge pull

[Nix-commits] [NixOS/nixpkgs] b0d267: python-idna init at 2.0

2015-08-17 Thread vbgl
://github.com/NixOS/nixpkgs/commit/f2aeca77722815041ecefa54ecb3c1f297f329f1 Author: vbgl v...@users.noreply.github.com Date: 2015-08-17 (Mon, 17 Aug 2015) Changed paths: M pkgs/applications/misc/electrum/default.nix M pkgs/top-level/python-packages.nix Log Message

[Nix-commits] [NixOS/nixpkgs] ec5940: qgis: fix python console and processing plugin

2015-08-07 Thread vbgl
: vbgl v...@users.noreply.github.com Date: 2015-08-07 (Fri, 07 Aug 2015) Changed paths: M pkgs/applications/gis/qgis/default.nix Log Message: --- Merge pull request #9138 from vbgl/master qgis: fix python console and processing plugin Compare: https://github.com/NixOS/nixpkgs

[Nix-commits] [NixOS/nixpkgs] 3b5917: pythonPackages.iniparse: init at 0.4

2015-08-06 Thread vbgl
: --- tortoisehg: init at 3.4.2 Commit: 4d22b539b81b0fac713e8d211f09fc5b2a792532 https://github.com/NixOS/nixpkgs/commit/4d22b539b81b0fac713e8d211f09fc5b2a792532 Author: vbgl v...@users.noreply.github.com Date: 2015-08-06 (Thu, 06 Aug 2015) Changed paths: A pkgs/applications

[Nix-commits] [NixOS/nixpkgs] d516f1: camlp4: 4.02.0+1 - 4.02+6

2015-08-06 Thread vbgl
/b8a1e16f81c5904e82dbfbdaa78583b05b08ce47 Author: vbgl v...@users.noreply.github.com Date: 2015-08-06 (Thu, 06 Aug 2015) Changed paths: M pkgs/development/tools/ocaml/camlp4/default.nix M pkgs/development/tools/ocaml/utop/default.nix Log Message: --- Merge pull request #9028 from

[Nix-commits] [NixOS/nixpkgs] afdf98: pamixer: 1.2.1 - 1.3

2015-08-06 Thread vbgl
) Changed paths: M pkgs/applications/audio/pamixer/default.nix Log Message: --- pamixer: 1.2.1 - 1.3 Commit: 5a86eebadf05770c9c824f063d68f5cb78fec481 https://github.com/NixOS/nixpkgs/commit/5a86eebadf05770c9c824f063d68f5cb78fec481 Author: vbgl v

[Nix-commits] [NixOS/nixpkgs] 322358: flow: 0.1.0 - 0.13.1

2015-07-27 Thread vbgl
) Changed paths: M pkgs/development/tools/analysis/flow/default.nix Log Message: --- flow: 0.1.0 - 0.13.1 Commit: 93ec36702e3ced8202bd93f12d53e2dfb7c898e0 https://github.com/NixOS/nixpkgs/commit/93ec36702e3ced8202bd93f12d53e2dfb7c898e0 Author: vbgl v

[Nix-commits] [NixOS/nixpkgs] 485951: qgis: 2.8.2 - 2.10.0

2015-07-23 Thread vbgl
/5f6dd482ac7198a8d309eadb04b16b9a595a9282 Author: vbgl v...@users.noreply.github.com Date: 2015-07-23 (Thu, 23 Jul 2015) Changed paths: M pkgs/applications/gis/qgis/default.nix Log Message: --- Merge pull request #8837 from michelk/qgis/update qgis: 2.8.2 - 2.10.1 Compare: https://github.com/NixOS/nixpkgs

[Nix-commits] [NixOS/nixpkgs] b9f4c3: closure-compiler: 20150315 - 20150609

2015-07-21 Thread vbgl
) Changed paths: M pkgs/development/compilers/closure/default.nix Log Message: --- closure-compiler: 20150315 - 20150609 Commit: 72d46b8279feb64d042403f8c2d3bebbf7fa1e0c https://github.com/NixOS/nixpkgs/commit/72d46b8279feb64d042403f8c2d3bebbf7fa1e0c Author: vbgl v

[Nix-commits] [NixOS/nixpkgs] 135426: saga: update from 2.1.4 to 2.2.0

2015-07-06 Thread vbgl
) Changed paths: M pkgs/applications/gis/saga/default.nix Log Message: --- saga: update from 2.1.4 to 2.2.0 Commit: 3195ff9c947e5df0e868630580556fc0abc26d47 https://github.com/NixOS/nixpkgs/commit/3195ff9c947e5df0e868630580556fc0abc26d47 Author: vbgl v

[Nix-commits] [NixOS/nixpkgs] 90a4de: ocaml-bitstring: init at 2.0.4 and f1673f8

2015-06-27 Thread vbgl
: --- piqi-ocaml: init at 0.7.4 Commit: 742824bd78cce63870ce89d2cf4b3f8b018c4052 https://github.com/NixOS/nixpkgs/commit/742824bd78cce63870ce89d2cf4b3f8b018c4052 Author: vbgl v...@users.noreply.github.com Date: 2015-06-27 (Sat, 27 Jun 2015) Changed paths: M lib/maintainers.nix

[Nix-commits] [NixOS/nixpkgs] af3f91: mldonkey: move package out of ocamlPackages

2015-06-25 Thread vbgl
://github.com/NixOS/nixpkgs/commit/5c537f3bdd4542e5aaf979cef41b33bb2bb1116d Author: vbgl v...@users.noreply.github.com Date: 2015-06-25 (Thu, 25 Jun 2015) Changed paths: M pkgs/applications/science/logic/acgtk/default.nix M pkgs/applications/science/logic/coq/8.3.nix M pkgs

[Nix-commits] [NixOS/nixpkgs] e6b29c: coq-ssreflect: also build and install the document...

2015-06-19 Thread vbgl
/NixOS/nixpkgs/commit/087ded31331d762781a47e847efbe496b0293a71 Author: vbgl v...@users.noreply.github.com Date: 2015-06-19 (Fri, 19 Jun 2015) Changed paths: R pkgs/development/coq-modules/mathcomp/1.5.nix M pkgs/development/coq-modules/mathcomp/default.nix A pkgs/development/coq

[Nix-commits] [NixOS/nixpkgs] ae0e3c: add ericbmerritt to the maintainers list

2015-05-26 Thread vbgl
: add minimal version (1.6.0) to the system Commit: 2857d5d7a85659b289e3a49d807f89d2b5345715 https://github.com/NixOS/nixpkgs/commit/2857d5d7a85659b289e3a49d807f89d2b5345715 Author: vbgl v...@users.noreply.github.com Date: 2015-05-26 (Tue, 26 May 2015) Changed paths: M lib

[Nix-commits] [NixOS/nixpkgs] 1c19f9: opam: update from 1.2.1 to 1.2.2

2015-05-14 Thread vbgl
2015) Changed paths: M pkgs/development/tools/ocaml/opam/default.nix Log Message: --- opam: update from 1.2.1 to 1.2.2 Commit: d206cd8a269cd5c0e26887e3554642fca1574810 https://github.com/NixOS/nixpkgs/commit/d206cd8a269cd5c0e26887e3554642fca1574810 Author: vbgl v

[Nix-commits] [NixOS/nixpkgs] 61432a: qgis: update to 2.8.2

2015-05-13 Thread vbgl
) Changed paths: M pkgs/applications/gis/qgis/default.nix Log Message: --- qgis: update to 2.8.2 Commit: 13d78c03d4acc68a781f1be6cba7654b0b7cfac3 https://github.com/NixOS/nixpkgs/commit/13d78c03d4acc68a781f1be6cba7654b0b7cfac3 Author: vbgl v

[Nix-commits] [NixOS/nixpkgs]

2015-05-02 Thread vbgl
Branch: refs/heads/framac Home: https://github.com/NixOS/nixpkgs ___ nix-commits mailing list nix-commits@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits

[Nix-commits] [NixOS/nixpkgs] 4f2b5c: qscintilla: update to 2.9

2015-04-25 Thread vbgl
/35910404681a3812472d4463128b6adbeac9e0aa Author: vbgl v...@users.noreply.github.com Date: 2015-04-25 (Sat, 25 Apr 2015) Changed paths: M pkgs/applications/gis/qgis/default.nix M pkgs/development/libraries/qscintilla/default.nix Log Message: --- Merge pull request #6535 from

[Nix-commits] [NixOS/nixpkgs] 23f4f4: keepass: update from 2.28 to 2.29

2015-04-14 Thread vbgl
2015) Changed paths: M pkgs/applications/misc/keepass/default.nix Log Message: --- keepass: update from 2.28 to 2.29 Commit: ddfd81ec8882a49d644d9ce9c8020c93949b475c https://github.com/NixOS/nixpkgs/commit/ddfd81ec8882a49d644d9ce9c8020c93949b475c Author: vbgl v

[Nix-commits] [NixOS/nixpkgs] 163d6a: dmd update to 2.067.0

2015-04-14 Thread vbgl
://github.com/NixOS/nixpkgs/commit/7c7ccf37bb3e31c6613d2f11aabe048f17442bd3 Author: vbgl v...@users.noreply.github.com Date: 2015-04-14 (Tue, 14 Apr 2015) Changed paths: M pkgs/development/compilers/dmd/default.nix M pkgs/development/compilers/rdmd/default.nix M pkgs/development/tools

[Nix-commits] [NixOS/nixpkgs] 4b7d39: gecode: update from 4.3.3 to 4.4.0

2015-04-14 Thread vbgl
2015) Changed paths: M pkgs/development/libraries/gecode/default.nix Log Message: --- gecode: update from 4.3.3 to 4.4.0 Commit: d8db514f68ebfac455721ea681718c9530e2a164 https://github.com/NixOS/nixpkgs/commit/d8db514f68ebfac455721ea681718c9530e2a164 Author: vbgl v

[Nix-commits] [NixOS/nixpkgs] a5fb20: opam: update to 1.2.1

2015-03-23 Thread vbgl
: bc5692f3ec0ba731e83cd11cb89eb2d538ead0cc https://github.com/NixOS/nixpkgs/commit/bc5692f3ec0ba731e83cd11cb89eb2d538ead0cc Author: vbgl v...@users.noreply.github.com Date: 2015-03-23 (Mon, 23 Mar 2015) Changed paths: R pkgs/development/tools/ocaml/opam/1.2.0-src_ext-Makefile.patch R pkgs

[Nix-commits] [NixOS/nixpkgs] 7f07b3: Add ocaml-xml-light

2015-03-13 Thread vbgl
/5dcedbb6e4224ccf6bd27dcc4a54f4018f41d1d5 Author: vbgl v...@users.noreply.github.com Date: 2015-03-13 (Fri, 13 Mar 2015) Changed paths: A pkgs/development/ocaml-modules/xml-light/default.nix M pkgs/top-level/all-packages.nix Log Message: --- Merge pull request #6791 from romildo/xml-light Add

[Nix-commits] [NixOS/nixpkgs] 5be852: profanity: 0.4.5 - 0.4.6

2015-03-04 Thread vbgl
command. Commit: b7bcd30dbe9a45f2fd4e073a8eab9f2a64758b09 https://github.com/NixOS/nixpkgs/commit/b7bcd30dbe9a45f2fd4e073a8eab9f2a64758b09 Author: vbgl v...@users.noreply.github.com Date: 2015-03-05 (Thu, 05 Mar 2015) Changed paths: M pkgs/applications/networking/instant

[Nix-commits] [NixOS/nixpkgs] 6248bf: ncmpcpp: 0.6.2 - 0.6.3

2015-03-04 Thread vbgl
paths: M pkgs/applications/audio/ncmpcpp/default.nix Log Message: --- ncmpcpp: 0.6.2 - 0.6.3 Commit: 46aa9f1e754579d0f19c237a4945ad8c5dfcfc0f https://github.com/NixOS/nixpkgs/commit/46aa9f1e754579d0f19c237a4945ad8c5dfcfc0f Author: vbgl v...@users.noreply.github.com Date

[Nix-commits] [NixOS/nixpkgs] 3ae27d: requests2 2.4.3 - 2.5.1

2015-02-25 Thread vbgl
) Changed paths: M pkgs/top-level/python-packages.nix Log Message: --- requests2 2.4.3 - 2.5.1 Commit: 8db9bd23fa8897138db0107613cafe4a3b4ec3d9 https://github.com/NixOS/nixpkgs/commit/8db9bd23fa8897138db0107613cafe4a3b4ec3d9 Author: vbgl v...@users.noreply.github.com

[Nix-commits] [NixOS/nixpkgs] 45856c: FreeRDP: build server as well

2015-02-25 Thread vbgl
) Changed paths: M pkgs/applications/networking/remote/freerdp/unstable.nix Log Message: --- FreeRDP: build server as well Commit: 5f5ebcd74f7d7f4f1362d9a120a212d999e797fb https://github.com/NixOS/nixpkgs/commit/5f5ebcd74f7d7f4f1362d9a120a212d999e797fb Author: vbgl v

[Nix-commits] [NixOS/nixpkgs] 32a5c4: cherrytree: update to 0.35.7

2015-02-25 Thread vbgl
) Changed paths: M pkgs/applications/misc/cherrytree/default.nix Log Message: --- cherrytree: update to 0.35.7 Commit: 5db0a40bfa4aefc6468ab69651fb552a2368bde7 https://github.com/NixOS/nixpkgs/commit/5db0a40bfa4aefc6468ab69651fb552a2368bde7 Author: vbgl v

[Nix-commits] [NixOS/nixpkgs] 0c2297: gdal: update to 1.11.2

2015-02-24 Thread vbgl
https://github.com/NixOS/nixpkgs/commit/8300898f98e235dcfa321887d52b7f72f80b5ad5 Author: vbgl v...@users.noreply.github.com Date: 2015-02-24 (Tue, 24 Feb 2015) Changed paths: M pkgs/development/libraries/gdal/default.nix Log Message: --- Merge pull request #6533 from

[Nix-commits] [NixOS/nixpkgs] bca50d: emscripten: update from 1.29.3 to 1.29.10.

2015-02-23 Thread vbgl
/6668a05abcbdaabd64e2fe6ebd39b424f1af723a Author: vbgl v...@users.noreply.github.com Date: 2015-02-23 (Mon, 23 Feb 2015) Changed paths: M pkgs/development/compilers/emscripten-fastcomp/default.nix M pkgs/development/compilers/emscripten/default.nix Log Message

[Nix-commits] [NixOS/nixpkgs] f2f3c5: Update Elixir to v.1.0.3

2015-02-21 Thread vbgl
Author: vbgl v...@users.noreply.github.com Date: 2015-02-21 (Sat, 21 Feb 2015) Changed paths: M pkgs/development/interpreters/elixir/default.nix Log Message: --- Merge pull request #6484 from Havvy/patch-2 Update Elixir to v.1.0.3 Compare: https://github.com/NixOS

[Nix-commits] [NixOS/nixpkgs] 66097d: julia: 0.3.5 - 0.3.6

2015-02-19 Thread vbgl
) Changed paths: M pkgs/development/compilers/julia/0.3.nix Log Message: --- julia: 0.3.5 - 0.3.6 Commit: b34d63e722981bb81a88659e3d5f978223d17a9d https://github.com/NixOS/nixpkgs/commit/b34d63e722981bb81a88659e3d5f978223d17a9d Author: vbgl v...@users.noreply.github.com

[Nix-commits] [NixOS/nixpkgs] b19da5: gecode: update from 4.3.0 to 4.3.3

2015-02-17 Thread vbgl
2015) Changed paths: M pkgs/development/libraries/gecode/default.nix Log Message: --- gecode: update from 4.3.0 to 4.3.3 Commit: 82312e3b7b9926f8a6aeb4adcef533c4327c0572 https://github.com/NixOS/nixpkgs/commit/82312e3b7b9926f8a6aeb4adcef533c4327c0572 Author: vbgl v

[Nix-commits] [NixOS/nixpkgs] 65152a: Update OUnit to version 2.0.0

2015-02-16 Thread vbgl
: 0c4ac4b936d36eb8eb704d20efc03e651d1b3690 https://github.com/NixOS/nixpkgs/commit/0c4ac4b936d36eb8eb704d20efc03e651d1b3690 Author: vbgl v...@users.noreply.github.com Date: 2015-02-16 (Mon, 16 Feb 2015) Changed paths: M pkgs/development/ocaml-modules/ounit/default.nix Log Message

[Nix-commits] [NixOS/nixpkgs] 3f7917: gnumeric: make use of GIO_EXTRA_MODULES in wrapper

2015-02-13 Thread vbgl
Author: vbgl v...@users.noreply.github.com Date: 2015-02-13 (Fri, 13 Feb 2015) Changed paths: M pkgs/applications/office/gnumeric/default.nix Log Message: --- Merge pull request #6331 from bobvanderlinden/gnumeric-gio-extra-modules gnumeric: make use

[Nix-commits] [NixOS/nixpkgs] 155652: Removes monodevelop (obsolete and broken)

2015-01-21 Thread vbgl
Author: vbgl v...@users.noreply.github.com Date: 2015-01-21 (Wed, 21 Jan 2015) Changed paths: R pkgs/applications/editors/monodevelop/builder.sh M pkgs/applications/editors/monodevelop/default.nix R pkgs/applications/editors/monodevelop/prefix.patch R pkgs/applications

[Nix-commits] [NixOS/nixpkgs] 20d994: grass: tag as broken

2015-01-19 Thread vbgl
: M pkgs/applications/gis/qgis/default.nix Log Message: --- qgis: update from 2.4.0 to 2.6.1 Commit: 413acf4b9f78c0336c0c437ceb6332485e19ad10 https://github.com/NixOS/nixpkgs/commit/413acf4b9f78c0336c0c437ceb6332485e19ad10 Author: vbgl v...@users.noreply.github.com

[Nix-commits] [NixOS/nixpkgs] 0f15ee: Python: pygments: update 1.6 - 2.0.1; add licence...

2015-01-16 Thread vbgl
/91bd762f640750c81638993f8925fea4edea6e4d Author: vbgl v...@users.noreply.github.com Date: 2015-01-16 (Fri, 16 Jan 2015) Changed paths: M pkgs/top-level/python-packages.nix Log Message: --- Merge pull request #5760 from nckx/pygments Python: pygments: update 1.6 - 2.0.1; add licence; maintain Compare

[Nix-commits] [NixOS/nixpkgs] b964fd: Bump version of vinyl to 0.5

2015-01-13 Thread vbgl
) Changed paths: M pkgs/development/libraries/haskell/vinyl/default.nix Log Message: --- Bump version of vinyl to 0.5 Commit: 7c03e66ebeae115462449af94f4f6a4e200246a8 https://github.com/NixOS/nixpkgs/commit/7c03e66ebeae115462449af94f4f6a4e200246a8 Author: vbgl v

[Nix-commits] [NixOS/nixpkgs] 570904: mkvtoolnix: 7.3.0 - 7.5.0

2015-01-10 Thread vbgl
paths: M pkgs/applications/video/mkvtoolnix/default.nix Log Message: --- mkvtoolnix: 7.3.0 - 7.5.0 Commit: 967f343245baa76a604833c2290fe7eb0cf5 https://github.com/NixOS/nixpkgs/commit/967f343245baa76a604833c2290fe7eb0cf5 Author: vbgl v...@users.noreply.github.com

[Nix-commits] [NixOS/nixpkgs] b7d72d: Upgrading Riemann 0.26 - 0.27

2015-01-10 Thread vbgl
paths: M pkgs/servers/monitoring/riemann/default.nix Log Message: --- Upgrading Riemann 0.26 - 0.27 Commit: 0b09d520857b72c7fd5c4aea743010b3a79938bf https://github.com/NixOS/nixpkgs/commit/0b09d520857b72c7fd5c4aea743010b3a79938bf Author: vbgl v

[Nix-commits] [NixOS/nixpkgs] 37e233: Update mpg321 from 0.2.13-2 to 0.3.2.

2015-01-10 Thread vbgl
: c07db339417ad5d881f2f9751f6986d39bcede72 https://github.com/NixOS/nixpkgs/commit/c07db339417ad5d881f2f9751f6986d39bcede72 Author: vbgl v...@users.noreply.github.com Date: 2015-01-10 (Sat, 10 Jan 2015) Changed paths: M pkgs/applications/audio/mpg321/default.nix Log Message: --- Merge pull request

[Nix-commits] [NixOS/nixpkgs] b00649: Add package 'bibtool'.

2015-01-06 Thread vbgl
: vbgl v...@users.noreply.github.com Date: 2015-01-06 (Tue, 06 Jan 2015) Changed paths: A pkgs/tools/misc/bibtool/default.nix M pkgs/top-level/all-packages.nix Log Message: --- Merge pull request #5588 from rycee/package/bibtool Add package 'bibtool'. Compare: https

[Nix-commits] [NixOS/nixpkgs] b59ac4: update Calibre to latest version 2.15.0

2015-01-05 Thread vbgl
) Changed paths: M pkgs/applications/misc/calibre/default.nix Log Message: --- update Calibre to latest version 2.15.0 Commit: 956054094028e636f1301380fc5f806269c6e828 https://github.com/NixOS/nixpkgs/commit/956054094028e636f1301380fc5f806269c6e828 Author: vbgl v

[Nix-commits] [NixOS/nixpkgs] fe5949: Update pythonPackages.mutag

2014-12-27 Thread vbgl
) Changed paths: M pkgs/top-level/python-packages.nix Log Message: --- Update pythonPackages.mutag Commit: baeb69626e152154f1e75bd4630de26dce98bba3 https://github.com/NixOS/nixpkgs/commit/baeb69626e152154f1e75bd4630de26dce98bba3 Author: vbgl v

[Nix-commits] [NixOS/nixpkgs] 7137ae: Add Gtk2 (and required Pango, Cairo Glib) Perl b...

2014-12-25 Thread vbgl
management Commit: e553cbee5a6582b24d6ad0eb7059364f6f2c0726 https://github.com/NixOS/nixpkgs/commit/e553cbee5a6582b24d6ad0eb7059364f6f2c0726 Author: vbgl v...@users.noreply.github.com Date: 2014-12-25 (Thu, 25 Dec 2014) Changed paths: A pkgs/applications/virtualization

[Nix-commits] [NixOS/nixpkgs] f48400: Printrun: Update to printrun-20140801, add depende...

2014-12-25 Thread vbgl
/58c283f0dd6c082bfed1126b80d7fd7adde7fb1a Author: vbgl v...@users.noreply.github.com Date: 2014-12-25 (Thu, 25 Dec 2014) Changed paths: M pkgs/applications/misc/printrun/default.nix Log Message: --- Merge pull request #5359 from ambrop72/printrun Printrun: Update to printrun-20140801, add dependencies

[Nix-commits] [NixOS/nixpkgs] 98c2b1: ncmpcpp: 0.6.1 - 0.6.2

2014-12-23 Thread vbgl
paths: M pkgs/applications/audio/ncmpcpp/default.nix Log Message: --- ncmpcpp: 0.6.1 - 0.6.2 Commit: d5ab3fb887d5ac405ed17afb15d27f1c07fb7b7b https://github.com/NixOS/nixpkgs/commit/d5ab3fb887d5ac405ed17afb15d27f1c07fb7b7b Author: vbgl v...@users.noreply.github.com Date

[Nix-commits] [NixOS/nixpkgs] 2c8ff5: plan9port: fix destination path in sources; add my...

2014-12-18 Thread vbgl
/nixpkgs/commit/78ae54bf49bd64437f80c4161e30aa29de4a801f Author: vbgl v...@users.noreply.github.com Date: 2014-12-18 (Thu, 18 Dec 2014) Changed paths: M pkgs/tools/system/plan9port/builder.sh M pkgs/tools/system/plan9port/default.nix Log Message: --- Merge pull request

[Nix-commits] [NixOS/nixpkgs] e65bd0: gdal: update to 1.11.1 and compiling with proj

2014-12-15 Thread vbgl
/nixpkgs/commit/fed9a36f74d622f625ae097fa5611f30ed83074f Author: vbgl v...@users.noreply.github.com Date: 2014-12-15 (Mon, 15 Dec 2014) Changed paths: M pkgs/development/libraries/gdal/default.nix Log Message: --- Merge pull request #5296 from michelk/gdal-1.11.1 gdal

[Nix-commits] [NixOS/nixpkgs] 167ffb: alock: update the package

2014-12-10 Thread vbgl
) Changed paths: M pkgs/misc/screensavers/alock/default.nix Log Message: --- alock: update the package Commit: de9609056f5627813ecfdb786dd4d9845b16997b https://github.com/NixOS/nixpkgs/commit/de9609056f5627813ecfdb786dd4d9845b16997b Author: vbgl v

[Nix-commits] [NixOS/nixpkgs] 3826c3: nixpkgs: darktable 1.4.2 - 1.6.0

2014-12-09 Thread vbgl
) Changed paths: M pkgs/applications/graphics/darktable/default.nix Log Message: --- nixpkgs: darktable 1.4.2 - 1.6.0 Commit: 7930abd1a5db6a4d72d15798ba086bc0cc850c7f https://github.com/NixOS/nixpkgs/commit/7930abd1a5db6a4d72d15798ba086bc0cc850c7f Author: vbgl v

[Nix-commits] [NixOS/nixpkgs] c77ae0: urweb: updated to version 20141206

2014-12-07 Thread vbgl
) Changed paths: M pkgs/development/compilers/urweb/default.nix Log Message: --- urweb: updated to version 20141206 Commit: bd5ace443fb220295529c29f729f577d50bfdbef https://github.com/NixOS/nixpkgs/commit/bd5ace443fb220295529c29f729f577d50bfdbef Author: vbgl v

[Nix-commits] [NixOS/nixpkgs] 5fd15e: ccl: fix paths to coreutils

2014-12-01 Thread vbgl
paths: M pkgs/development/compilers/ccl/default.nix Log Message: --- ccl: fix paths to coreutils Commit: 5a410c4d795384e185f0ff6eaa6bdf0c4aeeddc0 https://github.com/NixOS/nixpkgs/commit/5a410c4d795384e185f0ff6eaa6bdf0c4aeeddc0 Author: vbgl v...@users.noreply.github.com

[Nix-commits] [NixOS/nixpkgs] a8dd23: saga: update from 2.1.2 to 2.1.4 and re-enable bui...

2014-11-26 Thread vbgl
/ee31a41da5e52bfb90a9c2d14f47da113c182af2 Author: vbgl v...@users.noreply.github.com Date: 2014-11-26 (Wed, 26 Nov 2014) Changed paths: M pkgs/applications/gis/saga/default.nix Log Message: --- Merge pull request #5033 from michelk/saga_2.1.4 saga: update from 2.1.2 to 2.1.4 and re-enable build on x86_64

[Nix-commits] [NixOS/nixpkgs] fdbd5e: New package: git-extras

2014-11-25 Thread vbgl
https://github.com/NixOS/nixpkgs/commit/7f4f44d85a89a7cf50fdd74f1f3eee08f9348398 Author: vbgl v...@users.noreply.github.com Date: 2014-11-26 (Wed, 26 Nov 2014) Changed paths: M lib/maintainers.nix M pkgs/applications/version-management/git-and-tools/default.nix A pkgs

[Nix-commits] [NixOS/nixpkgs] 222366: girara: provided an alternative installation that ...

2014-11-24 Thread vbgl
/commit/d04875f83fc2d5c8c4caf021d6f3b03e43fd1a24 Author: vbgl v...@users.noreply.github.com Date: 2014-11-24 (Mon, 24 Nov 2014) Changed paths: M pkgs/applications/misc/girara/default.nix M pkgs/top-level/all-packages.nix Log Message: --- Merge pull request #5098 from

  1   2   >