Commit graph

670 commits

Author SHA1 Message Date
Eelco Dolstra 1146f460d3 mtdutils: 1.5.1 -> 1.5.2
Fixes gcc 5 build failure.
2016-03-11 12:52:46 +01:00
Vladimír Čunát 09af15654f Merge master into closure-size
The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.
2016-03-08 09:58:19 +01:00
Franz Pletz e9fc4e7db6 Merge remote-tracking branch 'origin/master' into hardened-stdenv 2016-03-07 22:08:27 +01:00
joachifm 78bfda9cd6 Merge pull request #13446 from k0ral/sshfs
sshfsFuse: 2.5 -> 2.7
2016-03-06 17:52:45 +00:00
koral dc170b713d sshfs: 2.6 -> 2.7 2016-03-06 18:40:26 +01:00
koral 0d45943167 sshfsFuse: 2.5 -> 2.6 2016-03-06 16:26:42 +01:00
Franz Pletz aff1f4ab94 Use general hardening flag toggle lists
The following parameters are now available:

  * hardeningDisable
    To disable specific hardening flags
  * hardeningEnable
    To enable specific hardening flags

Only the cc-wrapper supports this right now, but these may be reused by
other wrappers, builders or setup hooks.

cc-wrapper supports the following flags:

  * fortify
  * stackprotector
  * pie (disabled by default)
  * pic
  * strictoverflow
  * format
  * relro
  * bindnow
2016-03-05 18:55:26 +01:00
Robin Gloster e2372a4183 ceph: fix for zip timestamps 2016-03-04 14:15:59 +00:00
Robin Gloster 84cc00b403 ceph: possible fix for zip timestamps 2016-03-03 16:55:17 +00:00
Robin Gloster 3b4765c9e5 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-02-28 16:32:57 +00:00
Arseniy Seroka 3030dec0d7 yandex-disk: 0.1.5.940 -> 0.1.5.948 2016-02-27 18:39:42 +03:00
Robin Gloster 3477e662e6 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-02-27 00:08:08 +00:00
Tobias Geerinckx-Rice c3ed0a2494 btrfs-progs: 4.4 -> 4.4.1
Bugfix release. Changes:
https://btrfs.wiki.kernel.org/index.php/Changelog#By_version_.28btrfs-progs.29
2016-02-26 23:23:01 +01:00
Jordan Mulcahey a2b8cc0aaf netatalk: 3.1.0 -> 3.1.7, new service module 2016-02-24 19:32:54 +01:00
Robin Gloster bc21db3692 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-02-19 21:16:14 +00:00
Frederik Rietdijk 4d06bf70f4 buildPythonApplication: use new function for Python applications 2016-02-19 13:16:41 +01:00
Balletie d0dcad3b91 hfsprogs: init at 332.25 2016-02-15 22:22:35 +01:00
Franz Pletz 41698c9efa Merge branch 'master' into hardened-stdenv 2016-02-15 20:05:29 +01:00
Michael Raskin 67ba412a8d gluseterfs: 3.7.6 -> 3.7.8 2016-02-14 21:17:07 +01:00
Vladimír Čunát d039c87984 Merge branch 'master' into closure-size 2016-02-14 08:33:51 +01:00
Robin Gloster dbf93c1772 fusesmb: turn off format hardening 2016-02-11 00:36:52 +00:00
Robin Gloster 801b80299c udftools: fix compiling with gcc5 and turn off fortify 2016-02-07 23:41:22 +00:00
Robin Gloster 9229e9c656 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-02-07 11:17:57 +00:00
Vladimír Čunát ae74c356d9 Merge recent 'staging' into closure-size
Let's get rid of those merge conflicts.
2016-02-03 16:57:19 +01:00
Franz Pletz 7e4f0b046e darling-dmg: cleanup
Version was wrong. Bumped to current version 1.0.4.

See #11561 for details.
2016-02-02 21:10:23 +01:00
Edgar Aroutiounian db5fe1f8f4 darling: init at Dec 8, 2015 2016-01-31 18:37:02 -08:00
Robin Gloster e721382448 jfsutils: add patch to build with format hardening 2016-01-30 16:36:57 +00:00
Jascha Geerds f8fae306a0 sshfs: Update homepage URL 2016-01-27 17:33:14 +01:00
Tobias Geerinckx-Rice ac33b4724a More version attribute tidying where maintainers |= nckx 2016-01-25 20:08:34 +01:00
Tobias Geerinckx-Rice 9fb8020e4e Add version attribute where maintainers |= nckx
This will probably be mandatory soon, and is a step in the right
direction. Removes the deprecated meta.version, and move some meta
sections to the end of the file where I should have put them in
the first place.
2016-01-25 17:35:21 +01:00
Tuomas Tynkkynen ed7dbb46a8 treewide: Mass replace 'zlib}/lib' to refer the 'out' output 2016-01-24 10:03:39 +02:00
Tuomas Tynkkynen f412f5f3ee treewide: Mass replace 'attr}/lib' to refer the 'out' output 2016-01-24 10:03:32 +02:00
Tobias Geerinckx-Rice 32d40f0f98 Remove no longer (or never) referenced patches
55 files changed, 6041 deletions. Tested with `nix-build -A tarball`.
2016-01-24 02:02:21 +01:00
aszlig 24ae34c0d7
nixpart0: Fix race condition in formatting devices
This adds a backport of rhinstaller/blivet#39 to the pinned blivet
version 0.17, it's addressing the following upstream bug:

https://bugzilla.redhat.com/show_bug.cgi?id=1196397

It has been reported at aszlig/nixpart#7 and tested by @manveru (the
issue reporter), thanks a lot.

Thanks also to @domenkozar for finding the upstream issue.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Reported-by: Michael Fellinger <m.fellinger@gmail.com>
Fixes: aszlig/nixpart#7
2016-01-22 13:30:43 +01:00
Vladimír Čunát 716aac2519 Merge branch 'staging' into closure-size 2016-01-19 09:55:31 +01:00
Tobias Geerinckx-Rice 9609eb8d10 btrfs-progs: 4.3.1 -> 4.4
Bugfixes:
- chunk recovery: fix floating point exception
- chunk recovery: endianity bugfix during rebuild
- mkfs with 64K pages and nodesize reported superblock checksum mismatch
- check: properly reset nlink of multi-linked file

Too many changes to list here. See:
https://btrfs.wiki.kernel.org/index.php/Changelog#By_version_.28btrfs-progs.29
2016-01-18 14:46:40 +01:00
Domen Kožar 9af5091992 f2fs-tools: add pkgconfig 2016-01-05 19:57:48 +01:00
Tobias Geerinckx-Rice fb5f7dd953 zfstools: 0.3.2 -> 0.3.3 2016-01-05 00:51:32 +01:00
Arseniy Seroka b5bbbd0fe3 f2fs-tools: 1.4.1 -> 1.5.0 2016-01-04 14:23:56 +03:00
Tobias Geerinckx-Rice 82419575aa btrfsProgs -> canonical btrfs-progs 2016-01-03 20:38:44 +01:00
Pascal Wittmann 18a53d6eda disorderfs: 0.4.1 -> 0.4.2 2016-01-03 19:42:59 +01:00
Michael Raskin 119de110a3 glusterfs: 3.7.3 -> 3.7.6 2016-01-01 12:30:17 +03:00
Vladimír Čunát f9f6f41bff Merge branch 'master' into closure-size
TODO: there was more significant refactoring of qtbase and plasma 5.5
on master, and I'm deferring pointing to correct outputs to later.
2015-12-31 09:53:02 +01:00
Austin Seipp 10a7021c83 nixpkgs: duperemove 0.09.4 -> 0.10
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-12-19 22:43:48 -06:00
Tobias Geerinckx-Rice 819ca0997e exfat: 1.2.2 -> 1.2.3
Fixes:
- Fixed clusters loss when file renaming replaces target.
2015-12-19 12:41:31 +01:00
Eelco Dolstra 79a3c8a952 9pfs: Add
This is a FUSE-based 9p client.
2015-12-16 20:31:14 +01:00
Eelco Dolstra 9dae6345f4 Typo 2015-12-16 20:31:14 +01:00
Luca Bruno 5b0352a6a4 Merge branch 'master' into closure-size 2015-12-11 18:31:00 +01:00
Emery Hemingway 2b6dcdfcd0 Rename 'emery' maintainer handle to 'ehmry', fixes #11493
Communication happens on Github so names should be consistent.
2015-12-05 23:06:20 +01:00
lethalman e0bacc0b39 Merge pull request #11159 from dezgeg/pr-xfsprogs-fix
xfsprogs: Extend patch to make xfs_mdrestore and xfs_quota work
2015-12-02 10:11:04 +01:00
Luca Bruno 920b1d3591 Merge branch 'master' into closure-size 2015-11-29 16:50:26 +01:00
Tobias Geerinckx-Rice 2798b02ad0 Convert some *Flags from strings to lists 2015-11-26 23:45:31 +01:00
Pascal Wittmann 6d25c0f1b3 Remove unneeded 'with's from meta.platforms 2015-11-25 23:06:09 +01:00
Luca Bruno a412927924 Merge remote-tracking branch 'origin/master' into closure-size 2015-11-25 21:37:30 +01:00
Tobias Geerinckx-Rice f7e64b00bd gpart 0.2.2 -> 0.3
Adds LVM2 and Btrfs support.
2015-11-25 02:41:48 +01:00
Joachim Fasting 4fb29f8d3b smbnetfs: reimplement using mkDerivation 2015-11-24 14:45:15 +01:00
Joachim Fasting 5ddd4812a9 udftools: reimplement using mkDerivation 2015-11-24 14:45:15 +01:00
Pascal Wittmann 26a9d2b27b tmsu: 0.5.2 -> 0.6.0 2015-11-23 10:45:15 +01:00
Pascal Wittmann 5e0dca6d06 disorderfs: init at 0.4.1 2015-11-22 12:04:48 +01:00
Arseniy Seroka 6dff9dc93a Merge pull request #11161 from cstrahan/zkfuse
zkfuse: init
2015-11-21 19:49:38 +03:00
Vladimír Čunát 333d69a5f0 Merge staging into closure-size
The most complex problems were from dealing with switches reverted in
the meantime (gcc5, gmp6, ncurses6).
It's likely that darwin is (still) broken nontrivially.
2015-11-20 14:32:58 +01:00
Charles Strahan 3b73b726d4 zkfuse: init 2015-11-19 19:55:44 -05:00
Tuomas Tynkkynen 24480efffc xfsprogs: Extend patch to make xfs_mdrestore and xfs_quota work
Previously these tools were failing to start with:

xfs_mdrestore: error while loading shared libraries: libxfs.so.0: \
        cannot open shared object file: No such file or directory
xfs_quota: error while loading shared libraries: libxcmd.so.0: \
        cannot open shared object file: No such file or directory

Extend the 4.2.0-sharedlibs.patch to make those programs work as well.
2015-11-20 00:17:23 +02:00
Eelco Dolstra aab90653af ceph: Don't use symlinks
No need to invent an ad-hoc symlink scheme when we can handle this
kind of indirection at the Nix expression level (e.g. by doing
"ceph-dev = ceph").
2015-11-19 14:25:16 +01:00
Eelco Dolstra adde71ea6e ceph: Remove old and git versions 2015-11-19 14:25:16 +01:00
William A. Kennington III 910e7a75ec btrfsProgs: 4.3 -> 4.3.1 2015-11-18 17:50:57 -08:00
William A. Kennington III cf1ca41bfa ceph: Fix hash 2015-11-17 17:10:51 -08:00
Tobias Geerinckx-Rice a5bad31da3 Merge pull request #11105 from nckx/add-gpart
gpart: init at 0.2.2
2015-11-17 23:38:03 +01:00
Tobias Geerinckx-Rice 7392ae1a3a gpart: init at 0.2.2 2015-11-17 23:09:04 +01:00
Pascal Wittmann 7fd2796e99 Replace 'with plaforms; platform' with 'platforms.platform' 2015-11-17 21:30:43 +01:00
Pascal Wittmann fece57da45 Merge pull request #11007 from makefu/mhddfs_init_master
mhddfs: init at 0.1.39
2015-11-16 20:21:39 +01:00
Pascal Wittmann 59bb76e894 snapraid: append the version to the name 2015-11-16 19:56:14 +01:00
William A. Kennington III 61402311cc ceph: Deduplicate the default 2015-11-16 05:15:19 -08:00
William A. Kennington III 6602f49495 Revert "Revert "Merge pull request #9543 from NixOS/staging.post-15.06""
This reverts commit 741bf840da.

This reverts the fallout from reverting the major changes.
2015-11-14 12:32:51 -08:00
makefu dd8f31d1be mhddfs: init at 0.1.39 2015-11-14 16:40:53 +01:00
William A. Kennington III 9579c9ec7f Merge commit 'cb21b77' into master.upstream
This is a partial merge of staging for builds which are working
2015-11-13 15:53:10 -08:00
makefu a824242830 snapraid: init at 8.1 2015-11-13 15:06:22 +01:00
Vladimír Čunát 20336987f9 fuse-7z-ng: take longDescription from #8207 2015-11-11 15:45:52 +01:00
Tobias Geerinckx-Rice 81a7a3f652 exfat 1.2.1 -> 1.2.2
Changes:
- Improved reliability in case of a sudden unplug: FS will be in a clean
  state after closing all files and performing sync(1).
- Fixed compilation on Debian GNU/kFreeBSD and GNU/Hurd platforms.
- Updated mount.exfat-fuse man page.
2015-11-09 17:30:14 +01:00
William A. Kennington III 5149c03adc Merge branch 'master.upstream' into staging.upstream 2015-11-07 18:53:26 -08:00
William A. Kennington III 1c72ed0ffc btrfsProgs: 4.2.3 -> 4.3 2015-11-07 18:52:57 -08:00
William A. Kennington III 1e7aa4f17d Merge branch 'master.upstream' into staging.upstream 2015-11-05 18:30:11 -08:00
William A. Kennington III 452f1736d5 ceph: Major Update 0.94.4 -> 9.2.0 2015-11-05 18:22:48 -08:00
William A. Kennington III 4251612faa Merge branch 'master.upstream' into staging.upstream 2015-11-04 01:00:48 -08:00
William A. Kennington III 86ba275a99 ceph: 0.94.4 -> 0.94.5 2015-11-04 00:58:28 -08:00
William A. Kennington III 6e57f1c60c btrfsProgs: 4.2.2 -> 4.2.3 2015-11-04 00:58:28 -08:00
Vladimír Čunát c5579c9184 subversion: fixup some referrers after splitting 2015-10-28 10:22:59 +01:00
Vladimír Čunát 4917a4f8b3 Merge master into staging 2015-10-23 01:57:14 +02:00
William A. Kennington III 9882e09471 ceph: 0.94.3.2 -> 0.94.4 2015-10-21 22:12:36 -07:00
aszlig 3bf3d19759
nixpart0: Don't search for libudev using SO major.
The SO major is going to change in the upcoming update of the Hetzner
rescue system, which will cause NixOps to break because it's statically
using the SO major 0 while the new rescue system will have the major
number 1.

I'm still keeping the udevSoMajor attribute to retain backwards-
compatibility with older NixOps versions.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-10-21 17:15:17 +02:00
Arseniy Seroka 9dc707bc16 Merge pull request #10462 from igsha/fuse-7z-ng
fuse-7z-ng: init at git-2014-06-08
2015-10-18 23:09:42 +03:00
William A. Kennington III 7256b0a0ce btrfsProgs: 4.2.1 -> 4.2.2 2015-10-18 09:53:51 -07:00
Igor Sharonov 401b766299 fuse-7z-ng: init at git-2014-06-08 2015-10-18 19:21:12 +03:00
William A. Kennington III b6710cba15 ceph-git: 2015-09-22 -> 2015-10-16 2015-10-16 16:45:00 -07:00
William A. Kennington III b7c3a9647a ceph-dev: 9.0.3 -> 9.1.0 2015-10-16 16:44:46 -07:00
William A. Kennington III 21bb385af5 ceph: 0.94.3 -> 0.94.3.2 2015-10-16 16:44:34 -07:00
William A. Kennington III 8a44a36ca4 Merge branch 'master.upstream' into staging.upstream 2015-10-15 10:22:28 -07:00
Arseniy Seroka 91202fd475 djmount: add missing file 2015-10-14 20:20:30 +03:00
Arseniy Seroka 88cba6d8b5 yandex-disk: update 0.1.5.905 -> 0.1.5.940 2015-10-14 17:59:12 +03:00
Eelco Dolstra 741bf840da Revert "Merge pull request #9543 from NixOS/staging.post-15.06"
This reverts commit f61176c539, reversing
changes made to a27ca029ee.

Conflicts:
	pkgs/development/libraries/ncurses/default.nix
2015-10-06 15:24:20 +02:00
Vladimír Čunát b44d846990 udev: complete rework
- systemd puts all into one output now (except for man),
  because I wasn't able to fix all systemd/udev refernces
  for NixOS to work well
- libudev is now by default *copied* into another path,
  which is what most packages will use as build input :-)
- pkgs.udev = [ libudev.out libudev.dev ]; because there are too many
  references that just put `udev` into build inputs (to rewrite them all),
  also this made "${udev}/foo" fail at *evaluation* time
  so it's easier to catch and change to something more specific
2015-10-04 10:03:53 +02:00
Vladimír Čunát f361938b21 Merge staging into closure-size
This makes gcc5 the default builder, etc.
2015-10-03 15:23:13 +02:00
Vladimír Čunát 5227fb1dd5 Merge commit staging+systemd into closure-size
Many non-conflict problems weren't (fully) resolved in this commit yet.
2015-10-03 13:33:37 +02:00
Tobias Geerinckx-Rice 9594fcf5ec duff: 0.5.2 -> 2014-07-03 2015-10-02 05:34:36 +02:00
Matthias Beyer 6e7a8808d6 avfs: 1.0.2 -> 1.0.3 2015-09-29 10:41:00 +02:00
michael bishop 569baff20d bonnie++: init at 1.03e
[Bjørn: sort alphabetically in all-packages.nix, shorten
meta.description.]
2015-09-26 21:46:09 +02:00
Tobias Geerinckx-Rice 0d08b2c599 exfat: 1.2.0 -> 1.2.1
Upstream changes:
- Fixed compatibility with Zalman VE-200: now newly created directories do
  not have archive bit set.
- Fixed heap corruption: malformed FS can use invalid sector or cluster size.
- Fixed hang on mount: malformed FS can have cyclic references in the
  clusters map.
2015-09-24 13:29:52 +02:00
William A. Kennington III cc698a2986 ceph-git: 2015-09-11 -> 2015-09-22 2015-09-23 12:30:00 -07:00
Matej Cotman 346c744530 xtreemfs: repackage and update 2015-09-22 21:45:36 +02:00
William A. Kennington III b038770579 btrfsProgs: 4.2.0 -> 4.2.1 2015-09-21 11:33:41 -07:00
William A. Kennington III 26c3d3f060 ceph: Fix .la files 2015-09-18 14:52:52 -07:00
William A. Kennington III 5293bc1302 xfsprogs: 3.2.2 -> 4.2.0 2015-09-18 14:52:52 -07:00
William A. Kennington III e968dd9be5 btrfsProgs: 4.1.2 -> 4.2 2015-09-13 15:55:49 -07:00
William A. Kennington III 25e25b1be2 ceph-git: 2015-09-04 -> 2015-09-11 2015-09-11 16:21:07 -07:00
William A. Kennington III 476b70c39c ceph-dev: Fix for i686-linux 2015-09-11 16:21:07 -07:00
Tobias Geerinckx-Rice c92ac3b1d6 exfat-{fuse,utils}: merge
Both packages have been merged as https://github.com/relan/exfat.
Follow suit.
2015-09-11 22:39:54 +02:00
Tobias Geerinckx-Rice 3c47829cb5 exfat-fuse: 1.1.0 -> 1.2.0
Remove underscore & use standard name (also used by upstream).

Changes: https://github.com/relan/exfat/blob/master/ChangeLog
2015-09-11 22:28:41 +02:00
William A. Kennington III 362d3396c2 ceph-git: 2015-08-29 -> 2015-09-04 2015-09-04 11:42:42 -07:00
William A. Kennington III acd17d21b3 mtpfs: Fix accidental deletion 2015-09-02 17:39:42 -07:00
William A. Kennington III b50567912a mtpfs: Update to 2015-08-01 and move to go-packages 2015-09-02 17:36:23 -07:00
William A. Kennington III bada26d5ab ceph-dev: 9.0.2 -> 9.0.3 2015-09-01 00:26:20 -07:00
Arseniy Seroka c0ed5753ac yandex-disk: update 0.1.5.870 -> 0.1.5.905 2015-08-31 23:56:55 +03:00
Tobias Geerinckx-Rice 21a5df097c reiser4progs: 1.0.9 -> 1.1.0 2015-08-31 20:49:00 +02:00
Arseniy Seroka 167f1891c3 Merge pull request #9565 from nbarbey/fuseiso
fuseiso: init at 20070708
2015-08-31 00:58:12 +03:00
Nicolas Barbey b4215fdda5 fuseiso: init at 20070708 2015-08-30 22:28:39 +02:00
William A. Kennington III 0210ecab70 ceph-git: 2015-08-18 -> 2015-08-29 2015-08-30 10:57:16 -07:00
William A. Kennington III 6d83b13734 ceph: 0.94.2 -> 0.94.3 2015-08-28 17:49:03 -07:00
Arseniy Seroka e8d96bdcf7 Merge pull request #9301 from ssgen/fatresize
Fatresize
2015-08-20 16:18:18 +03:00
Jaka Hudoklin 4ecf102ebf s3fs: 1.78 -> 1.79 2015-08-19 23:50:27 +02:00
ssgen 62e2b2124a fatresize: init at 1.0.2 2015-08-20 00:43:34 +03:00
William A. Kennington III 2d40eeceda ceph-git: 2015-08-07 -> 2015-08-18 2015-08-18 14:45:11 -07:00
Michael Raskin 462ce2a65e GlusterFS: 3.7.2 -> 3.7.3 2015-08-08 21:01:31 +03:00
William A. Kennington III 2f620f5767 ceph-git: 2015-08-05 -> 2015-08-07 2015-08-07 14:18:39 -07:00
William A. Kennington III 56c62ad12a ceph-git: 2015-07-32 -> 2015-08-05 2015-08-06 09:55:40 -07:00
lethalman 8282baacc0 Merge pull request #9106 from lancelotsix/add_hubicfuse
hubicfuse: init at 2.1.0
2015-08-06 11:42:19 +02:00
William A. Kennington III 666629f30b ceph-pre: Update 2015-08-05 21:52:00 -07:00
William A. Kennington III 34fbb41500 ceph: Support newer git version 2015-08-05 21:51:52 -07:00
Lancelot SIX d165ea2329 hubicfuse: init at 2.1.0 2015-08-06 00:22:18 +02:00
William A. Kennington III 10d10b000a ceph: Add 0.94 pre 2015-08-04 17:14:06 -07:00
William A. Kennington III 58d1a1b073 ceph: Make python fixes more reliable 2015-08-01 18:45:23 -07:00
William A. Kennington III 1b20c87d1f ceph-git: 2015-07-29 -> 2015-07-31 2015-08-01 18:05:51 -07:00
William A. Kennington III dd41013dba ceph: Remove leaveDotGit as it is non-deterministic 2015-08-01 18:05:51 -07:00
Tobias Geerinckx-Rice 6c6201a99b Remove unnecessary rec{s from "my" packages 2015-07-31 02:02:07 +02:00
William A. Kennington III 49caeecdaa ceph-git: 2015-07-23 -> 2015-07-29 2015-07-29 18:15:08 -07:00
William A. Kennington III fdc076c986 ceph: Enable accelio only on 10+ 2015-07-29 18:15:08 -07:00
Vladimír Čunát a2f16fdcff Merge branch 'staging' 2015-07-24 15:12:28 +02:00
William A. Kennington III 0e1d8f0d7d ceph-git: 2015-07-20 -> 2015-07-23 2015-07-23 15:15:02 -07:00
William A. Kennington III 6d30af58a0 ceph: Fix detection of git versioning 2015-07-23 15:14:50 -07:00
Vladimír Čunát 2cacf77c13 Merge branch 'master' into staging 2015-07-22 22:33:55 +02:00
William A. Kennington III 17d045c74b ceph-git: 2015-07-15 -> 2015-07-20 2015-07-20 18:07:16 -07:00