Commit Graph

2650 Commits

Author SHA1 Message Date
R. RyanTM
300c205cf9 src: 1.24 -> 1.25 (#61427)
* src: 1.24 -> 1.25
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/src/versions

* src: license is now BSD-2
+ move makeWrapper into nativeBuildInputs
+ add meta.changelog
2019-05-13 15:37:27 +02:00
lewo
694b1c9e7d
Merge pull request #60653 from callahad/fast-export-v190107
gitAndTools.gitFastExport: (old) -> v190107
2019-05-13 11:53:17 +02:00
R. RyanTM
12ae350d36 gitAndTools.svn-all-fast-export: 1.0.13 -> 1.0.16
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/svn-all-fast-export/versions
2019-05-12 22:59:47 -07:00
Spencer Baugh
4b8803dae6 switch users of "gnupg1" to plain "gnupg"
gnupg is gnupg 2.2. gnupg1 is also gnupg 2.2, just with a few extra
symlinks in the bin directory. None of these packages need those
symlinks, and it's confusing for them to say they're depending on
"gnupg1", so switch their dep to plain "gnupg".
2019-05-12 20:08:50 +02:00
Dan Callahan
1d13eb119d
gitAndTools.gitFastExport: (old) -> v190107 2019-05-12 14:40:15 +01:00
kolaente
29d35a9ddb maintainers: add kolaente 2019-05-11 02:01:08 +02:00
kolaente
bad4902dc2 gitea: 1.8.0 -> 1.8.1 2019-05-11 01:51:25 +02:00
Renaud
ac63101188
subversion: fix configure missing APR_INT64_T_FMT
configurePhase fails when building Python bindings or subversionClient
> configure: error: failed to recognize APR_INT64_T_FMT on this platform

Adding "-P" CPPFLAG solves the issue.
See also: https://issues.apache.org/jira/browse/SVN-4813
2019-05-09 15:59:18 +02:00
c0bw3b
4f99ea8128 subversion: 1.11.1 -> 1.12.0
v1.12 is a regular release replacing v1.11
https://subversion.apache.org/docs/release-notes/1.12.html
https://subversion.apache.org/roadmap.html#release-planning
2019-05-08 12:19:34 +02:00
c0bw3b
78c545fe83 subversion19: 1.9.9 -> 1.9.10
https://subversion.apache.org/docs/release-notes/1.9
2019-05-08 12:09:54 +02:00
c0bw3b
1685f80b97 subversion18: remove because EOL
Subversion 1.8 is EOL since the publication of 1.10 in April 2018
https://subversion.apache.org/docs/release-notes/1.10.html#svn-1.8-deprecation
2019-05-08 11:56:22 +02:00
Robin Gloster
2ec5786a4d
gitaly: fix build 2019-05-06 19:11:43 +02:00
Florian Klink
d237c8a182 gitlab-ee: 11.9.11 -> 11.10.4 2019-05-03 20:22:08 +02:00
Florian Klink
02124aa8fb gitlab-ce: 11.9.11 -> 11.10.4 2019-05-03 20:21:55 +02:00
Florian Klink
41d95302c0 gitlab-workhorse: 8.3.3 -> 8.5.2 2019-05-03 20:21:12 +02:00
Florian Klink
030bc8086b gitaly: 1.27.2 -> 1.34.1 2019-05-03 20:20:20 +02:00
Florian Klink
61bf39c5a1 gitlab-shell: 8.7.1 -> 9.0.0 2019-05-03 20:20:01 +02:00
Florian Klink
847eb76cf8 gitlab: update.py: properly sort version numbers, ignore invalid versions 2019-05-03 20:18:14 +02:00
Mario Rodas
14fa46a3f8
Merge pull request #60677 from royneary/git-bug-0.5.0
gitAndTools.git-bug: 0.4.0 -> 0.5.0
2019-05-03 10:50:08 -05:00
royneary
71a3f9f9e9 gitAndTools.git-bug: remove deps.nix 2019-05-03 17:13:14 +02:00
Mario Rodas
1b816da6c3
Merge pull request #60726 from r-ryantm/auto-update/pre-commit
gitAndTools.pre-commit: 1.15.1 -> 1.15.2
2019-05-03 06:30:45 -05:00
R. RyanTM
045078f096 tortoisehg: 4.9 -> 4.9.1 (#60806)
* tortoisehg: 4.9 -> 4.9.1

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/tortoisehg/versions

* tortoisehg: update meta.homepage
2019-05-03 11:14:31 +02:00
Alyssa Ross
bcd07bbf74
Merge pull request #60391 from cohei/update-ghq
ghq: 0.8.0 -> 0.10.2
2019-05-02 16:29:38 +00:00
R. RyanTM
0a46fab9cb gitAndTools.pre-commit: 1.15.1 -> 1.15.2
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/pre-commit/versions
2019-05-02 00:33:58 -07:00
royneary
29678b9b7d gitAndTools.git-bug: fix --version output 2019-05-02 00:47:42 +02:00
royneary
70c2e3633a gitAndTools.git-bug: 0.4.0 -> 0.5.0 2019-05-01 23:44:44 +02:00
Robin Gloster
d9876f6f28
Merge pull request #60637 from flokli/gitlab-11.9.11
gitlab: 11.9.8 -> 11.9.11
2019-05-01 20:56:44 +00:00
Renaud
33924117c6
Merge pull request #60212 from seqizz/g_gita92
gitAndTools.gita: 0.8.2 -> 0.9.2
2019-05-01 19:17:42 +02:00
Florian Klink
cc785b3b9a gitaly: 1.27.1 -> 1.27.2 2019-05-01 14:49:16 +02:00
Florian Klink
5d6f6d5d94 gitlab-ee: 11.9.8 -> 11.9.11 2019-05-01 14:48:58 +02:00
Florian Klink
b9df035cb7 gitlab-ce: 11.9.8 -> 11.9.11 2019-05-01 14:48:27 +02:00
Gürkan Gür
7ef359f21b gitAndTools.gita: 0.8.2 -> 0.9.2 2019-04-30 22:23:52 +02:00
R. RyanTM
f286a29c35 cvs_fast_export: 1.47 -> 1.48
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/cvs-fast-export/versions
2019-04-30 07:33:51 -07:00
TANIGUCHI Kohei
0c8f9b8831 ghq: 0.8.0 -> 0.10.2 2019-04-29 04:57:52 +09:00
R. RyanTM
e7f46f34f6 git-review: 1.27.0 -> 1.28.0 (#59513)
* git-review: 1.27.0 -> 1.28.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/git-review/versions

* git-review: refactor

- do not use fetchurl on mutable GitHub archives
- postPatch is unneeded as argparse has been removed from requirements.txt upstream
2019-04-25 23:50:43 +02:00
Renaud
260e5642f0
Merge pull request #58290 from neonfuz/gogs-fix
gogs: fixed buildtime tags bug
2019-04-24 23:22:13 +02:00
worldofpeace
f5d3418b0c
Merge pull request #58994 from zookatron/sublime-merge
sublime-merge: init at 1107
2019-04-24 09:21:07 -04:00
Tim Zook
148119b9a6 sublime-{merge,text}: make common.nix files have a similar structure
In the future it's desired to unify Sublime packages expressions.
So them having a shared structure will make this more achievable.
2019-04-24 09:14:50 -04:00
Mario Rodas
1e8ebd96ac
Merge pull request #60040 from woffs/gitflow-1.12.2
gitflow: 1.11.0 -> 1.12.2
2019-04-23 23:28:00 -05:00
Florian Klink
cba32c8a75
Merge pull request #60061 from flokli/gitlab-11.9.8
gitlab: 11.9.1 -> 11.9.8
2019-04-23 09:46:04 +02:00
Florian Klink
33423e52c6 gitlab-ee: 11.9.1 -> 11.9.8 2019-04-22 23:41:32 +02:00
Florian Klink
04b5eb10c0 gitlab-ce: 11.9.1 -> 11.9.8 2019-04-22 23:41:32 +02:00
Florian Klink
74eb807f83 gitlab-workhorse: 8.3.1 -> 8.3.3 2019-04-22 23:41:32 +02:00
markuskowa
d0e70ac2d3
Merge pull request #60010 from JohnAZoidberg/https-urls
HTTPS urls
2019-04-22 23:37:07 +02:00
Frank Doepper
a5f4a13214 gitflow: 1.11.0.-> 1.12.2 2019-04-22 21:56:43 +02:00
Elis Hirwing
fe691b13b2
gitea: 1.7.6 -> 1.8.0
Changelog: https://github.com/go-gitea/gitea/releases/tag/v1.8.0
2019-04-22 11:41:57 +02:00
Daniel Schaefer
bac4d95aa2 treewide: Change URLs to HTTPS
Lots of URLs were HTTP redirect to HTTPS. Changed those and checked them
if there's actual content. Inspired by
https://github.com/NixOS/nixpkgs/issues/60004
2019-04-22 10:19:54 +02:00
Joachim F
302a770a51
Merge pull request #59605 from montag451/git-annex-remote-dbx
git-annex-remote-dbx: init at 1.0.3
2019-04-21 07:43:03 +00:00
Maximilian Bosch
f1c559057e
Merge pull request #59889 from sondr3/sondr3/git-ignore-1.0.0
git-ignore: 0.2.0 -> 1.0.0
2019-04-20 13:12:30 +02:00
Andrew Childs
c5c4d59ed6 rcs: fix darwin build 2019-04-20 18:34:07 +09:00
Maximilian Bosch
dd5ac26e78
git-ignore: split outputs
Use a separate `man` output[1]. All outputs will be installed when using
the package i.e. with `nix-env -f . -iA gitAndTools.git-ignore`.

[1] https://nixos.org/nix/manual/#ssec-derivation
2019-04-20 08:00:24 +02:00
Sondre Nilsen
c5e963f36c
git-ignore: 0.2.0 -> 1.0.0 2019-04-19 16:34:40 +02:00
Robin Gloster
afe4f8ace5
Merge pull request #59666 from r-ryantm/auto-update/pre-commit
gitAndTools.pre-commit: 1.14.4 -> 1.15.1
2019-04-17 18:12:39 +00:00
Alyssa Ross
2df0437695
Merge pull request #57730 from alyssais/git-remote-hg
gitAndTools.git-remote-hg: 0.2-e716a9e1a9e460a45663694ba4e9e8894a8452b2 -> 1.0.0
2019-04-16 09:37:05 +00:00
R. RyanTM
7b60fb4bb7 gitAndTools.pre-commit: 1.14.4 -> 1.15.1
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/pre-commit/versions
2019-04-15 20:06:06 -07:00
montag451
7744ae3d77 git-annex-remote-dbx: init at 1.0.3 2019-04-15 17:10:17 +02:00
Will Dietz
4e3b5a0753 hub: 2.11.1 -> 2.11.2 (#59502)
https://github.com/github/hub/releases/tag/v2.11.2
2019-04-15 13:29:48 +02:00
Florian Klink
7578ec44dc gitea: 1.7.5 -> 1.7.6
From [release notes](https://github.com/go-gitea/gitea/releases/tag/v1.7.6):

SECURITY: Prevent remote code execution vulnerability with mirror repo URL settings
2019-04-13 11:52:16 +02:00
rnhmjoj
5ea4160b33
treewide: fixup bcf54ce
fix the executable bit for scripts installed with substituteAll
and some remaining shebangs.
2019-04-12 09:09:22 +02:00
Frederik Rietdijk
230c67f43b Merge master into staging-next 2019-04-11 07:50:23 +02:00
Sarah Brofeldt
82b5a823b7
Merge pull request #59059 from aanderse/redmine
redmine: 3.4.9 -> 3.4.10, redmine_4: 4.0.2 -> 4.0.3
2019-04-10 17:40:29 +02:00
Frederik Rietdijk
d108b49168 Merge master into staging-next 2019-04-09 16:38:35 +02:00
R. RyanTM
9527de1cdd mercurialFull: 4.9 -> 4.9.1 (#58723)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/mercurial-full/versions
2019-04-08 21:04:33 +02:00
Tim Steinbach
f53ffadbc5
git: Add update script 2019-04-07 09:15:28 -04:00
Frederik Rietdijk
4a125f6b20 Merge master into staging-next 2019-04-07 08:33:41 +02:00
Jan Tojnar
566d4d934a
Revert "meld: 3.20.0 -> 3.20.1"
This reverts commit c7990f8add.
2019-04-06 21:58:44 +02:00
lewo
aa5c3b0e7d
Merge pull request #58722 from r-ryantm/auto-update/meld
meld: 3.20.0 -> 3.20.1
2019-04-06 19:27:38 +02:00
Aaron Andersen
a597c88ec1 redmine: 4.0.2 -> 4.0.3 2019-04-06 08:21:06 -04:00
Aaron Andersen
b6b3287897 redmine: 3.4.9 -> 3.4.10 2019-04-06 08:20:54 -04:00
Meghea Iulian
fb1c65490c gitraken: 5.0.1 -> 5.0.4 (#59052) 2019-04-06 10:04:55 +00:00
Tim Zook
b59b31e36c sublime-merge: init at 1107 2019-04-05 18:49:45 -05:00
Ryan Mulligan
77f7764865
Merge pull request #58891 from r-ryantm/auto-update/subgit
gitAndTools.subgit: 3.2.4 -> 3.3.6
2019-04-05 09:36:08 -07:00
worldofpeace
b22b5a2874
meld: 3.20.0 > 3.20.1
https://gitlab.gnome.org/GNOME/meld/tags/3.20.1
2019-04-05 12:14:10 +02:00
Jan Tojnar
cb1a20499a
Merge branch 'master' into staging 2019-04-05 11:37:15 +02:00
R. RyanTM
ca0fe4bd77 gitAndTools.subgit: 3.2.4 -> 3.3.6
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/subgit/versions
2019-04-02 21:04:34 -07:00
R. RyanTM
c7990f8add meld: 3.20.0 -> 3.20.1
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/meld/versions
2019-04-01 17:06:47 -07:00
John Ericson
4ccb74011f Merge commit '18aa59b0f26fc707e7313f8467e67159e61600c2' from master into staging
There was one conflict in the NixOS manual; I checked that it still
built after resolving it.
2019-04-01 00:40:03 -04:00
Matthias Beyer
a9d4d87f05 qgit: Fix meta.homepage
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
2019-03-31 21:48:30 +02:00
R. RyanTM
72397be198 cvs_fast_export: 1.45 -> 1.47 (#58045)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/cvs-fast-export/versions
2019-03-31 00:38:59 +01:00
Sarah Brofeldt
7b6430984b gitea: Fix sqlite support and baked-in tags 2019-03-30 17:21:06 +01:00
Elis Hirwing
c94d027510
gitea: 1.7.3 -> 1.7.5
Changelogs:
https://github.com/go-gitea/gitea/releases/tag/v1.7.5
https://github.com/go-gitea/gitea/releases/tag/v1.7.4
2019-03-30 11:23:35 +01:00
Florian Klink
ef047e711c
Merge pull request #58545 from bgamari/gitaly-fixup-gitlab-shell
nixos/gitlab: Install and fixup vendorised gitlab-shell
2019-03-29 23:41:02 +01:00
Ben Gamari
50a4de7326 nixos/gitlab: Install and fixup vendorised gitlab-shell
gitaly now ships its own vendorised version of gitlab-shell. Previously
we failed to install this, resulting in
https://gitlab.com/gitlab-org/gitlab-ce/issues/59403.
2019-03-29 11:53:07 -04:00
Will Dietz
b10d09901b gitAndTools.hub: 2.11.0 -> 2.11.1 2019-03-29 10:51:53 -05:00
Will Dietz
89e15afa66 gitAndTools.hub: 2.10.0 -> 2.11.0
https://github.com/github/hub/releases/tag/v2.11.0
https://github.com/github/hub/releases/tag/v2.10.2
https://github.com/github/hub/releases/tag/v2.10.1
2019-03-29 02:48:53 -05:00
Florian Klink
ec319793b4 gitlab: 11.9.0 -> 11.9.1 2019-03-26 21:00:04 +01:00
Florian Klink
e558347243 gitaly: 1.27.0 -> 1.27.1 2019-03-26 20:59:46 +01:00
Sage Raflik
a03e461b5f Fixed gogs bug pertaining to passing tags 2019-03-25 13:41:51 -07:00
Ben Gamari
d8c16f11a6 gitlab: 11.8.2 -> 11.9.0 2019-03-25 15:25:11 -04:00
Ben Gamari
0ba98bb64c gitlab: 11.7.5 -> 11.8.2 2019-03-25 15:25:06 -04:00
Frederik Rietdijk
23e431387b Merge staging-next into staging 2019-03-23 09:20:09 +01:00
xeji
deea6dde76
subversion_1_10: 1.10.3 -> 1.10.4 (#57958)
bugfix release for CVE-2018-11803 [0].

[0] https://subversion.apache.org/security/CVE-2018-11803-advisory.txt
2019-03-22 19:20:13 +01:00
Wael M. Nasreddine
5af0780492
Merge remote-tracking branch 'origin/master' into staging
* origin/master: (693 commits)
  buildGoModule: use go_1_12 instead of go_1_11 (#58103)
  gitAndTools.lab: 0.15.2 -> 0.15.3 (#58091)
  signal-desktop: 1.22.0 -> 1.23.0
  added missing semicolon to documentation
  terminus_font_ttf: 4.46.0 -> 4.47.0
  buildGoModule: remove SSL env vars in favor of cacert in buildInputs (#58071)
  dav1d: init at 0.2.1
  dropbox-cli: 2018.11.28 -> 2019.02.14
  atlassian-confluence: 6.14.1 -> 6.14.2
  maintainers: update email for dywedir
  python.pkgs.hglib: use patch to specify hg path (#57926)
  chkrootkit: 0.52 -> 0.53
  radare2-cutter: 1.7.2 -> 1.8.0
  autorandr: 1.7 -> 1.8
  pythonPackages.pyhepmc: fix build
  llvm-polly/clang-polly: use latest llvm
  apulse: 0.1.11.1 -> 0.1.12, cleanup
  factorio: experimental 0.17.14 → 0.17.16 (#58000)
  sequeler: 0.6.7 -> 0.6.8
  nasc: 0.5.1 -> 0.5.2
  ...
2019-03-21 21:01:25 -07:00
Wael Nasreddine
52dae14f0c
buildGoModule: use go_1_12 instead of go_1_11 (#58103) 2019-03-21 20:40:07 -07:00
Will Dietz
31600452bc gitAndTools.lab: 0.15.2 -> 0.15.3 (#58091)
https://github.com/zaquestion/lab/releases/tag/v0.15.3
2019-03-21 18:13:33 -07:00
Will Dietz
68ded8b4ec gitAndTools.lab: simplify by moving to buildGoModule! 2019-03-20 14:55:05 -05:00
Will Dietz
3d8170098f lab: generate and install zsh completion
Env variables are set to dummy values
so `lab` doesn't get stuck trying to helpfully
interact with user for initial configuration.
2019-03-20 14:55:04 -05:00
Andreas Rammhold
a6bb05be45 subversion_1_10: 1.10.3 -> 1.10.4
bugfix release for CVE-2018-11803 [0].

[0] https://subversion.apache.org/security/CVE-2018-11803-advisory.txt
2019-03-20 13:37:03 +01:00
Tor Hedin Brønner
4a75888544 meld: fix checkPhase
Needs some more inputs after checkInputs went native.

(cherry picked from commit 99fac0a967e76ef85303f16a051208627995703b)
2019-03-18 18:52:42 +01:00
xeji
bc92dd657b
Merge pull request #56376 from artemist/git-2.21.0
git: 2.19.2 -> 2.21.0
2019-03-16 00:29:54 +01:00
Alyssa Ross
58a1c542ca
gitAndTools.git-remote-hg: 0.2-e716a9e1a9e460a45663694ba4e9e8894a8452b2 -> 1.0.0
The current version no longer works with our packaged Mecurial.[1]

The original repository appears to no longer be maintained, but there is
a maintained fork, which is now used for the Debian package.

[1]: https://github.com/felipec/git-remote-hg/issues/72
2019-03-15 23:01:47 +00:00
talyz
3f1fdb8bf5 gitAndTools.gitRemoteGcrypt: Add missing dependencies (#57637)
Add the runtime dependencies coreutils, gawk, gnused and gnugrep.
2019-03-14 22:16:40 +01:00
Will Dietz
f22aa01c7b
Merge pull request #57607 from dtzWill/update/lab-0.15.2
gitAndTools.lab: 0.14.0 -> 0.15.2
2019-03-14 15:01:10 -05:00
Meghea Iulian
e6069617cb gitkraken: 4.2.2 -> 5.0.1 (#57655)
gitkraken: 4.2.2 -> 5.0.1
2019-03-14 19:45:37 +01:00
Will Dietz
ce6fada508 lab: manually fixup deps.nix to fix build (via 'replace' in go.mod) 2019-03-13 17:28:55 -05:00
Will Dietz
536f2696dc gitAndTools.lab: 0.14.0 -> 0.15.2
https://github.com/zaquestion/lab/releases/tag/v0.15.0
https://github.com/zaquestion/lab/releases/tag/v0.15.1
https://github.com/zaquestion/lab/releases/tag/v0.15.2
2019-03-13 17:28:53 -05:00
worldofpeace
64c8f268df gnome3.meld: fix gobject-introspection
See: https://github.com/NixOS/nixpkgs/issues/56943
2019-03-13 17:05:23 -04:00
R. RyanTM
6eb1869902 tortoisehg: 4.8.2 -> 4.9 (#57491)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/tortoisehg/versions
2019-03-13 00:55:30 +02:00
Jascha Geerds
ffedc3e4a9 misc: Remove myself from list of maintainers
Unfortunately I don't have the time anymore to maintain those
packages.
2019-03-12 23:50:52 +01:00
Ryan Mulligan
8af1639be1
Merge pull request #57432 from r-ryantm/auto-update/pre-commit
gitAndTools.pre-commit: 1.14.2 -> 1.14.4
2019-03-12 06:09:27 -07:00
R. RyanTM
e954144fab gitAndTools.pre-commit: 1.14.2 -> 1.14.4
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/pre-commit/versions
2019-03-11 11:51:54 -07:00
Wael M. Nasreddine
483d823ec4
gitlab-shell: export GOCACHE in the installPhase
TMPDIR, in `GOCACHE = "$TMPDIR";`, will not be intepreted  when it's set
outside of a phase.
2019-03-11 09:59:15 -07:00
Ryan Mulligan
6aa7c9d776
Merge pull request #56828 from seqizz/g_gita080
gitAndTools.gita: 0.7.2 -> 0.8.2
2019-03-06 21:34:27 -08:00
Matthew Bauer
5bc72b87b1
Merge pull request #52714 from furrycatherder/gitea-pam
gogs, gitea: add PAM support
2019-03-06 10:05:11 -05:00
Gürkan Gür
0f87efb60c gitAndTools.gita: 0.7.2 -> 0.8.2 2019-03-04 16:31:03 +01:00
Jörg Thalheim
27cb0669c6
Merge pull request #56500 from kalbasit/nixpkgs_add-support-go-1-12
go_1_12: init at go 1.12
2019-03-04 14:22:27 +00:00
Andreas Wiese
1673a3c939 gogs: 0.11.66 -> 0.11.86 (#56819)
This release especially addresses CVE-2018-20303.
2019-03-04 15:19:04 +01:00
R. RyanTM
93109d5032 git-secrets: 1.2.1 -> 1.3.0 (#56677)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/git-secrets/versions
2019-03-04 13:18:10 +01:00
R. RyanTM
663fde8c39 src: 1.22 -> 1.24
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/src/versions
2019-03-03 09:17:18 +01:00
Elis Hirwing
365d199173
Merge pull request #56734 from petabyteboy/feature/update-gitea
gitea: 1.7.1 -> 1.7.3
2019-03-03 08:52:35 +01:00
worldofpeace
aeb38763d4
Merge pull request #56676 from r-ryantm/auto-update/git-hub
gitAndTools.git-hub: 1.0.1 -> 1.0.3
2019-03-02 21:54:30 -05:00
Milan Pässler
1246a736b1 gitea: 1.7.1 -> 1.7.3 2019-03-02 23:42:36 +01:00
Wael M. Nasreddine
6ef04cabd4
go_1_12: init at go 1.12 2019-03-02 14:24:17 -08:00
Michael Raskin
7093aa51b8
Merge pull request #56557 from aanderse/redmine-pkg-update
redmine: 3.4.8 -> 3.4.9 & 4.0.1 -> 4.0.2
2019-03-02 19:55:23 +00:00
R. RyanTM
3063f1332d gitAndTools.git-hub: 1.0.1 -> 1.0.3
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/git-hub/versions
2019-03-02 01:05:13 -08:00
R. RyanTM
488da5ad7d fossil: 2.7 -> 2.8
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/fossil/versions
2019-03-01 23:13:33 -08:00
Frederik Rietdijk
2fcb11a244 Merge staging-next into master 2019-03-01 09:06:20 +01:00
Aaron Andersen
79c8da230b redmine: 3.4.8 -> 3.4.9 & 4.0.1 -> 4.0.2 2019-02-28 20:51:21 -05:00
Will Dietz
46c4100552 gitAndTools.hub: simplify 2019-02-27 15:37:23 -06:00
Will Dietz
0185daf3ab gitAndTools.hub: 2.9.0 -> 2.10.0
https://github.com/github/hub/releases/tag/v2.10.0
2019-02-27 14:02:25 -06:00
Jörg Thalheim
8aa34227e8
Merge pull request #55308 from plumelo/feature/gitraken-gsettings
gitkraken: 4.2.1 -> 4.2.2 & fix missing gsettings schemas
2019-02-26 12:29:38 +00:00
Artemis Tosini
fc917e5346
git: 2.19.2 -> 2.21.0 2019-02-25 19:21:45 +00:00
Sondre Nilsen
4e0b4a2f50 git-ignore: init at v0.2.0 (#56248)
A small program to quickly and easily fetch .gitignore templates from
www.gitignore.io
2019-02-25 16:47:18 +01:00
Matthew Bauer
73061742af Merge remote-tracking branch 'NixOS/master' into staging 2019-02-24 18:54:32 -05:00
Ryan Mulligan
6cdcc10016
Merge pull request #53465 from borisbabic/master
gitAndTools.pre-commit: 1.11.1 -> 1.14.2
2019-02-24 13:31:51 -08:00
Frederik Rietdijk
c2eac6741b Merge master into staging-next 2019-02-24 09:19:12 +01:00
R. RyanTM
8292fa14ee mercurialFull: 4.8.2 -> 4.9 (#55247)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/mercurial-full/versions
2019-02-24 01:35:01 +01:00
Frederik Rietdijk
5871da418f Merge staging into python-unstable 2019-02-21 08:02:10 +01:00
Frederik Rietdijk
e2cd07b997 Merge staging-next into staging 2019-02-21 07:54:33 +01:00
Matthias Beyer
f1f4f38909 Revert "Remove maintainership"
I'm baaaaack!

This patch reverts my patch where I removed myself as maintainer because
of my traveling. I'm back now and I want to maintain these packages
again.

This reverts commit ce1c1e3093.
2019-02-20 19:57:34 +01:00
Meghea Iulian
7022210b31 gitkraken: refactor wrapGAppsHook 2019-02-20 20:51:18 +02:00
Meghea Iulian
e53f68800b gitkraken: use wrapGAppsHook 2019-02-20 20:51:18 +02:00
Meghea Iulian
a21cbcb4a2 gitkraken: 4.2.1 -> 4.2.2 2019-02-20 20:51:17 +02:00
Meghea Iulian
f2fa842eed gitkraken: fix missing gsettings schemas 2019-02-20 20:51:17 +02:00
Vladimír Čunát
32767d139f
Merge branch 'staging-next'
This round is without the systemd CVE,
as we don't have binaries for that yet.
BTW, I just ignore darwin binaries these days,
as I'd have to wait for weeks for them.
2019-02-20 09:38:45 +01:00
Pierre Bourdon
ce15dafc7d
git: build diff-highlight if Perl support is enabled
Fixes #27671.

git/git@0c977dbc81 made that script
require an extra build step.
2019-02-20 01:11:32 +01:00
Franz Pletz
341f42b647
Merge pull request #55942 from flokli/gitlab-11.7.5
gitlab 11.7.4 -> 11.7.5
2019-02-19 23:25:02 +00:00
Matthew Bauer
b1bbd94bb6 Merge remote-tracking branch 'NixOS/master' into staging 2019-02-18 20:36:48 -05:00
Frederik Rietdijk
815b77cbe6 Merge master into staging-next 2019-02-18 14:18:04 +01:00
worldofpeace
96ac29b2e0 gitAndTools.hub: 2.7.0 -> 2.9.0
We need to add git to PATH to build the manual
as they execute `hub version | tail -1` to get the version
to embed into it.

Though git is really only needed because it runs `git version`
as well.
2019-02-17 11:54:29 -05:00
Frederik Rietdijk
d2c3fd5af0 Python: fix outfall after setting strictDeps = true; 2019-02-17 14:40:54 +01:00
Bob van der Linden
550852b617
git-cola: 3.2 -> 3.3 2019-02-17 13:52:23 +01:00
Florian Klink
f4a7c16bd9 gitlab-ee: 11.7.4 -> 11.7.5 2019-02-17 13:43:52 +01:00
Florian Klink
7f6351a21d gitlab: 11.7.4 -> 11.7.5 2019-02-17 13:43:38 +01:00
Florian Klink
75f66b19dd gitlab-workhorse: 8.0.1 -> 8.0.2 2019-02-17 13:42:35 +01:00
Vladimír Čunát
f7f1a2f54e
Merge branch 'master' into staging-next
A mass darwin rebuild from master (#55784).
2019-02-17 08:05:24 +01:00
Will Dietz
c904c2ec09
Merge pull request #55595 from dtzWill/update/git-extras-4.7.0
git-extras: 4.6.0 -> 4.7.0
2019-02-17 00:11:17 -06:00
Frederik Rietdijk
6fe10d2779 Merge master into staging-next 2019-02-16 09:29:54 +01:00
Frederik Rietdijk
a25d48cd4f Merge master into staging 2019-02-14 11:35:50 +01:00
Jan Tojnar
606ceda352
gnome3: stop using aliases 2019-02-14 02:31:15 +01:00
Michael Raskin
8384cfe455
Merge pull request #55129 from oxij/tree/move-defaults-to-package-files
all-packages.nix: move defaults to package files
2019-02-13 20:04:08 +00:00
Frederik Rietdijk
7257dedd7c Merge master into staging-next 2019-02-13 12:33:29 +01:00
Will Dietz
bbbf4b9037 git-extras: 4.6.0 -> 4.7.0
https://github.com/tj/git-extras/releases/tag/4.7.0
2019-02-11 17:23:06 -06:00
Gurkan
936c9f4118 gitAndTools.gita: init at 0.7.3 (#55533) 2019-02-11 11:24:43 +01:00
Markus Kowalewski
89e7e12cd3
qgit: add markuskowa as maintainer 2019-02-09 20:49:24 +01:00
Matthew Bauer
5c09d977c7 Merge remote-tracking branch 'origin/master' into staging 2019-02-09 12:14:06 -05:00
Matthew Bauer
3e0616683d
Merge pull request #54853 from r-ryantm/auto-update/cvs-fast-export
cvs_fast_export: 1.32 -> 1.45
2019-02-08 17:34:07 -05:00
Jeff Slight
8c043d3c7b gitlab: 11.6.3 -> 11.7.4 2019-02-06 00:30:29 +01:00
aanderse
b8a9c3fbfd redmine: 3.4.8 -> 4.0.1 (#55234)
* redmine: 3.4.8 -> 4.0.1

* nixos/redmine: update nixos test to run against both redmine 3.x and 4.x series

* nixos/redmine: default new installs from 19.03 onward to redmine 4.x series, while keeping existing installs on redmine 3.x series

* nixos/redmine: add comment about default redmine package to 19.03 release notes

* redmine: add aandersea as a maintainer
2019-02-05 11:51:33 +00:00
Boris Babic
02a3a15bfd gitAndTools.pre-commit: 1.11.1 -> 1.14.2 2019-02-04 21:54:36 +01:00
Jan Malakhovski
1b784e5f6f subversion: move defaults to package file 2019-02-03 15:30:36 +00:00
Franz Pletz
7568981df9
Merge pull request #54923 from marsam/fix-lab-package
gitAndTools.lab: specify subPackages
2019-02-03 09:07:09 +00:00
R. RyanTM
3f864c454a gitAndTools.diff-so-fancy: 1.2.0 -> 1.2.5
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/diff-so-fancy/versions
2019-02-03 08:59:31 +00:00
Elis Hirwing
ae0c47b4b7
gitea: 1.7.0 -> 1.7.1
Changelog: https://github.com/go-gitea/gitea/releases/tag/v1.7.1
2019-02-02 23:29:42 +01:00
Vladimír Čunát
8ba516664b
Merge branch 'staging-next' into staging 2019-02-01 09:42:53 +01:00
Léo Gaspard
85ff56cdde
Merge branch 'pr-54933'
* pr-54933:
  redmine: 3.4.6 -> 3.4.8
2019-01-31 23:52:53 +01:00
Aaron Andersen
0f3ecc630c redmine: 3.4.6 -> 3.4.8 2019-01-30 07:37:24 -05:00
Mario Rodas
048016e8c8
gitAndTools.lab: specify subPackages
Otherwise it builds an internal `docs` command.
2019-01-30 06:44:59 -05:00
Andreas Rammhold
4fbce625ed
gitAndTools.grv: use buildGoPackage instead of buildGo19Package 2019-01-30 01:16:18 +01:00
R. RyanTM
c36c08e8ca cvs_fast_export: 1.32 -> 1.45
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/cvs-fast-export/versions
2019-01-28 15:27:34 -08:00
Silvan Mosberger
7088d3f2ed
Merge pull request #54177 from baracoder/smartigt-18_2_4
smartgithg: 18_1_5 -> 18.2.4
2019-01-28 15:04:28 +01:00
Herman Fries
e036a3d616 smartgithg: 18_1_5 -> 18.2.4
This PR is committed using the new version.
The never version requires JRE 10, actually the changelog mentions
downgrading from JDK11 to 10 because of a bug related to https
but this seams to be fixed by now
https://bugs.openjdk.java.net/browse/JDK-8210005

Also I did not find a `jre` output in jdk11, so the closure size
might increase due to it.
2019-01-28 14:42:27 +01:00
Matthew Bauer
92f0f8dd68 Merge remote-tracking branch 'NixOS/master' into staging 2019-01-27 00:01:13 -05:00
R. RyanTM
4866cbe341 tortoisehg: 4.8.1 -> 4.8.2 (#54651)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/tortoisehg/versions
2019-01-27 06:41:29 +02:00
Elis Hirwing
fae5a99b51
Merge pull request #53673 from plumelo/feature/gitraken-4.2.0
gitkraken: 4.1.1 -> 4.2.1
2019-01-26 12:38:16 +01:00
Meghea Iulian
db3b270f79 gitkraken: 4.2.0 -> 4.2.1 2019-01-26 01:06:26 +02:00
Meghea Iulian
0590170c79 gitkraken: 4.1.1 -> 4.2.0 2019-01-26 01:02:01 +02:00
Victor SENE
f5d69f88b7 gitea: 1.6.4 -> 1.7.0 2019-01-25 12:37:17 +01:00
Vladimír Čunát
3fe32b675e
Merge branch 'master' into staging 2019-01-22 15:59:42 +01:00
Frederik Rietdijk
d531da6f8a
Merge pull request #54094 from rnhmjoj/shell
treewide: use ${stdenv.shell} instead of /bin/sh where possible
2019-01-19 14:15:51 +01:00
Michael Weiss
cc5f7d9091
gitRepo: Cleanup the patchPhase
This variant should be easier to read (it was pretty messy before...).
The end result stays the same.
2019-01-19 12:30:08 +01:00
worldofpeace
92e684b062
Merge pull request #54210 from r-ryantm/auto-update/git-secret
git-secret: 0.2.4 -> 0.2.5
2019-01-18 01:44:58 +00:00
R. RyanTM
6c9493e92d git-secret: 0.2.4 -> 0.2.5
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/git-secret/versions
2019-01-17 12:59:36 -08:00
Danylo Hlynskyi
bfd31e29c8
Merge pull request #53684 from dtzWill/update/mercurial-4.8.2
mercurial: 4.8.1 -> 4.8.2
2019-01-17 22:19:02 +02:00
rnhmjoj
bcf54ce5bb
treewide: use ${stdenv.shell} instead of /bin/sh where possible 2019-01-16 20:37:15 +01:00
worldofpeace
cddd36e48a
Merge pull request #54031 from etu/gitea-upgrade
gitea: 1.6.3 -> 1.6.4
2019-01-16 19:04:54 +00:00
Bjørn Forsman
3dee561c34 gitolite: 3.6.10 -> 3.6.11
From https://github.com/sitaramc/gitolite/blob/master/CHANGELOG:

2019-01-08  v3.6.11 fix security issue in 'rsync' (bundle helper); see commit
                    5df2b81 for more
2019-01-16 13:37:01 +01:00
Eelco Dolstra
5a434d0034
Merge pull request #54047 from r-ryantm/auto-update/subversion-client
subversionClient: 1.11.0 -> 1.11.1
2019-01-16 13:18:28 +01:00
R. RyanTM
cd055b2f58 subversionClient: 1.11.0 -> 1.11.1
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/subversion-client/versions
2019-01-16 04:00:13 -08:00
Bjørn Forsman
9e1b5f1115 gitolite: change patchPhase to postPatch
Overriding patchPhase is bad practice, it prevents customizing the
package with "patches = []".
2019-01-16 12:52:04 +01:00
Elis Hirwing
6de48b291d
gitea: 1.6.3 -> 1.6.4
Release notes: https://github.com/go-gitea/gitea/releases/tag/v1.6.4
2019-01-16 08:12:12 +01:00
Michael Weiss
afb6a7fe00
gitRepo: 1.13.1 -> 1.13.2 2019-01-15 22:20:17 +01:00
R. RyanTM
27609af220 meld: 3.18.3 -> 3.20.0 (#53595)
Update and enable tests
2019-01-13 22:05:01 +01:00
Eelco Dolstra
ac97ba25ae
Revert "libgit2: 0.26.6 → 0.27.7"
This reverts commit cc50638176 because
it breaks cargo (again, see fca4fbeba9):

  $ cargo build
      Updating crates.io index
  Segmentation fault
2019-01-11 14:58:45 +01:00
Andreas Rammhold
590f267c5b
gitAndTools.grv: 0.3.0 -> 0.3.1 2019-01-09 22:16:22 +01:00
Will Dietz
b28752f255 mercurial: 4.8.1 -> 4.8.2
https://www.mercurial-scm.org/wiki/WhatsNew#Mercurial_4.8.2_.282018-01-07.29
2019-01-08 21:33:44 -06:00
Robin Gloster
f11b1aceaa
Merge pull request #52750 from flokli/gitlab-11.6.0
gitlab: 11.5.5 -> 11.6.3
2019-01-07 20:47:41 +00:00
Robin Gloster
8fac37db00
gitlab: 11.6.0 -> 11.6.3 2019-01-07 20:08:15 +01:00
Kirill Elagin
047def418e
git: Do not split gitweb output
This partially reverts 9029ed933c as
`git-instaweb`, which comes with git, needs on gitweb and having them in
separate outputs results in a cycle.
2019-01-06 16:14:49 +03:00
Kirill Elagin
813c6d4664
git, gitweb: Fix git-instaweb
* Make the build system embed the correct path to gitweb into git-instaweb
* Move gitweb fixups to the git expression, to make sure that gitweb
used by git-instaweb is functional
* This will increase the closure size of git, but only with perlSupport
2019-01-06 14:56:54 +03:00
Vladimír Čunát
10a12194e3
Merge #53490: fix treewide linking errors after #51770
Issue #53001.  This might not be all of them, but let's not wait.
2019-01-06 12:14:52 +01:00
Vladimír Čunát
d84a33d85b
Merge branch 'master' into staging-next
A few more rebuilds (~1k on x86_64-linux).
2019-01-05 15:02:04 +01:00
Elis Hirwing
eeb35be95d gitea: 1.6.2 -> 1.6.3
Changelog: https://github.com/go-gitea/gitea/releases/tag/v1.6.3
2019-01-04 19:38:40 -05:00
Piotr Bogdan
4477dedfba gitAndTools.svn-all-fast-export: link with libsvn_fs-1 explicitly 2019-01-04 21:44:18 +00:00
Frederik Rietdijk
2da31b80bb Merge master into staging-next 2019-01-03 20:07:35 +01:00
Renaud
27726eed82
Merge pull request #52650 from blargg/submit/yadm-completion
yadm: install bash and zsh completions
2019-01-03 11:42:51 +01:00
Frederik Rietdijk
092e3b50a8 Merge master into staging-next 2019-01-02 21:08:27 +01:00
Meghea Iulian
496b2ddff2 gitkraken: 4.0.5 -> 4.1.1 (#53066) 2019-01-01 20:30:56 +01:00
R. RyanTM
4bf76de51c gitAndTools.gitRemoteGcrypt: 1.1 -> 1.2 (#52312)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/git-remote-gcrypt/versions
2019-01-01 19:55:43 +01:00
Frederik Rietdijk
070290bda7 Merge master into staging-next 2018-12-31 12:00:36 +01:00
worldofpeace
56ccb6fd1b peru: python 3.3 and 3.4 support is deprecated
See: 42e5dfdc4e
2018-12-30 11:09:24 -05:00
R. RyanTM
1caff6fac2 peru: 1.1.4 -> 1.2.0
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/peru/versions
2018-12-30 11:09:24 -05:00
Frederik Rietdijk
26e5c0f07a
Merge pull request #51846 from veprbl/pr/pyqt5_opt_qtwebkit
pyqt5: make qtwebkit optional, disable by default
2018-12-30 16:34:39 +01:00
Dmitry Kalinkin
eecc33608f
git-cola: doesn't need QtWebKit
QtWebKit is only used if QtWebEngine is not available
2018-12-30 10:23:43 -05:00
Dmitry Bogatov
ce8d1f713d hub: 2.6.1 -> 2.7.0
In addition of bumping version, install bash-completion script in a way,
suitable for autoloading.
2018-12-30 00:41:21 +00:00
Dmitry Kalinkin
20d60c8238
treewide: use pythonPackages.pyqt5_with_qtwebkit where QtWebKit is needed 2018-12-27 09:14:21 -05:00
Jan Tojnar
c45e9d0fac
Merge branch 'master' into staging 2018-12-25 17:03:57 +01:00
Florian Klink
134a6decae gitlab-workhorse: 7.1.3 -> 7.6.0 2018-12-25 15:25:45 +01:00
Florian Klink
ca69c9c2d0 gitlab-shell: 8.4.1 -> 8.4.3 2018-12-25 15:25:45 +01:00
Florian Klink
97e7cf75fa gitaly: 0.129.0 -> 1.7.1 2018-12-25 15:25:45 +01:00
Florian Klink
4d7ce7a605 gitlab-ee: 11.5.5 -> 11.6.0 2018-12-25 15:25:45 +01:00
Florian Klink
7ea6bde0ae gitlab-ce: 11.5.5 -> 11.6.0 2018-12-25 15:25:45 +01:00
Florian Klink
78f336b21d gitlab: add missing f.truncate() call to update.py script
when updating data.json, truncate file after reading and before writing
again, or we otherwise might end up with broken json
2018-12-25 15:25:45 +01:00
Jan Tojnar
ef935fa101
Merge branch 'master' into staging 2018-12-24 15:02:29 +01:00
Florian Klink
236cb26954 gitlab-ee: 11.5.4 -> 11.5.5
CVE-2018-20229, https://about.gitlab.com/2018/12/20/critical-security-release-gitlab-11-dot-5-dot-5-released/
2018-12-24 03:48:18 +01:00
Florian Klink
6397fd3e71 gitlab-ce: 11.5.4 -> 11.5.5
CVE-2018-20229, https://about.gitlab.com/2018/12/20/critical-security-release-gitlab-11-dot-5-dot-5-released/
2018-12-24 03:48:18 +01:00
Sean Haugh
fb7770b843 gogs: add PAM support 2018-12-22 18:52:39 -06:00
Sean Haugh
9406f240a7 gitea: add PAM support 2018-12-22 18:49:25 -06:00
Jörg Thalheim
56eba4ee6f
Merge pull request #52677 from r-ryantm/auto-update/src
src: 1.18 -> 1.22
2018-12-22 14:57:52 +01:00
R. RyanTM
8f369b9302 src: 1.18 -> 1.22
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/src/versions
2018-12-22 05:05:27 -08:00
Franz Pletz
12e57cbb61
gitea: fix version in app 2018-12-22 04:33:16 +01:00
Franz Pletz
b35d93731d
Merge pull request #52646 from etu/update-gitea
gitea: 1.6.0 -> 1.6.2
2018-12-22 02:24:38 +00:00
blargg
37b1a8eea8 yadm: install bash and zsh completions 2018-12-21 22:36:36 +00:00
Tor Hedin Brønner
8ed71e836a
Merge pull request #51712 from dtzWill/fix/mercurial-zsh-completions
mercurial: install zsh completions
2018-12-21 23:23:39 +01:00
Elis Hirwing
a87fd222c8
gitea: 1.6.0 -> 1.6.2
Changelog: https://github.com/go-gitea/gitea/releases/tag/v1.6.1
Changelog: https://github.com/go-gitea/gitea/releases/tag/v1.6.2
2018-12-21 23:07:47 +01:00
Will Dietz
3ce8b3cb3b mercurial: fix bash completion, correct comment 2018-12-21 16:04:15 -06:00
Michael Weiss
0aac84e1c3 gitRepo: 1.13.0 -> 1.13.1 2018-12-20 22:10:57 +01:00
Aiken Cairncross
0fc60dff30 git-secret: Add gawk to wrapper
The `git-secret` script(s) use `gawk`.
2018-12-20 10:19:39 +00:00
Frederik Rietdijk
9ab61ab8e2 Merge staging-next into staging 2018-12-19 09:00:36 +01:00
volth
fed7914539
Merge branch 'staging' into make-perl-pathd 2018-12-18 17:13:27 +00:00