Commit graph

2371 commits

Author SHA1 Message Date
Frederik Rietdijk
9b81c7e455 Merge staging-next into staging 2018-11-29 09:18:35 +01:00
Kristoffer Thømt Ravneberg
a3ec5dce2b gitlab-shell: don't hardcode gitlab-shell paths in authorized_keys 2018-11-28 23:09:23 +01:00
worldofpeace
243417fa44 gitAndTools.git-reparent: correct version 2018-11-28 01:11:28 -05:00
Mario Rodas
1fc0eee80c gitAndTools.git-reparent: init at 2017-09-03 2018-11-27 21:38:49 -05:00
Florian Klink
2c2ab68672
Merge pull request #50962 from flokli/gitlab-updater
gitlab: 11.4.4 -> 11.5.0
2018-11-26 18:47:14 +01:00
c0bw3b
dd3e576654 Treewide: use https for src.fedoraproject.org 2018-11-24 23:53:27 +01:00
c0bw3b
adea16b86c Treewide: use https for launchpad.net 2018-11-24 23:47:52 +01:00
c0bw3b
88ce525e85 Treewide: use https for repo.or.cz 2018-11-24 19:56:51 +01:00
Florian Klink
63f25471cb gitaly: 0.125.1 -> 0.129.0 2018-11-23 17:59:39 +01:00
Florian Klink
2f2dce92f2 update.py: lazy workaround for wrong meta.position on go packages 2018-11-23 17:59:39 +01:00
Florian Klink
a33622e4d4 gitlab-workhorse: 7.0.0 -> 7.1.0 2018-11-23 17:59:39 +01:00
Florian Klink
293a631081 gitlab-shell: 8.3.3 -> 8.4.1 2018-11-23 17:59:38 +01:00
Florian Klink
625e66d879 gitlab: 11.4.4 -> 11.5.0, add data.json, make default.nix use it 2018-11-23 17:59:07 +01:00
Florian Klink
6d4643243c gitlab: add update.py script 2018-11-23 15:29:12 +01:00
Florian Klink
3233efb33b gitlab-workhorse: rename srcs attribute to src 2018-11-23 14:47:18 +01:00
Florian Klink
8b51e837b9 gitlab-workhorse: drop deterministic-build.patch
we already set VERSION in makeFlags below.
2018-11-23 13:22:50 +01:00
Florian Klink
d768e3967f gitlab-workhorse: move to pkgs/applications/version-management/gitlab 2018-11-23 13:18:43 +01:00
Florian Klink
cb79c1e60b gitaly: move to pkgs/applications/version-management/gitlab 2018-11-23 13:17:53 +01:00
Florian Klink
8e8f692e22 gitlab-shell: move to pkgs/applications/version-management/gitlab 2018-11-23 13:14:28 +01:00
Frederik Rietdijk
2219e2578e Merge staging-next into staging 2018-11-22 10:10:40 +01:00
RohanHart
25e7f59516 pijul: 0.10.0 -> 0.11.0 (#50870) 2018-11-22 07:32:17 +00:00
Will Dietz
003a96c04c git: 2.19.1 -> 2.19.2
https://github.com/git/git/blob/master/Documentation/RelNotes/2.19.2.txt
2018-11-21 15:48:45 -06:00
Renaud
ee32dda03b
Merge pull request #50541 from r-ryantm/auto-update/stgit
gitAndTools.stgit: 0.18 -> 0.19
2018-11-19 00:03:05 +01:00
xeji
a292829e58
Merge pull request #50491 from oxij/pkgs/tiny-fixes
trivial: random fixes
2018-11-18 16:58:55 +01:00
Jörg Thalheim
1ac58ddec6
Merge pull request #50542 from r-ryantm/auto-update/tortoisehg
tortoisehg: 4.7.2 -> 4.8
2018-11-18 10:58:26 +00:00
Jan Malakhovski
980043347d mr: fix src
The tag was moved, the diff is fine.
2018-11-18 09:08:05 +00:00
R. RyanTM
6cf56cb8b7 tortoisehg: 4.7.2 -> 4.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/tortoisehg/versions
2018-11-17 22:15:30 -08:00
R. RyanTM
d910d380f6 gitAndTools.stgit: 0.18 -> 0.19
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/stgit/versions
2018-11-17 22:08:58 -08:00
Mario Rodas
71b47005bc gitAndTools.git-absorb: init at 0.3.0 2018-11-15 19:40:22 -05:00
Elis Hirwing
090bd931e1 gitea: 1.5.2 -> 1.5.3 (#50229)
Changelog: https://github.com/go-gitea/gitea/releases/tag/v1.5.3
2018-11-11 15:26:38 +01:00
Silvan Mosberger
92ad58a1bf
Merge pull request #50037 from r-ryantm/auto-update/mercurial-full
mercurialFull: 4.7.2 -> 4.8
2018-11-09 21:35:19 +01:00
Jörg Thalheim
2f97911566
Merge pull request #49817 from alyssais/rack_cve
rack: 1.6.* -> 1.6.11, 2.0.* -> 2.0.6 (CVE-2018-16470, CVE-2018-16471)
2018-11-09 19:30:43 +00:00
R. RyanTM
7e607a7a87 mercurialFull: 4.7.2 -> 4.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/mercurial-full/versions
2018-11-09 08:54:10 -08:00
Tim Steinbach
1cfc2427c8
subversion: 1.9.7 -> 1.9.9 2018-11-07 20:25:57 -05:00
Tim Steinbach
451126ea6e
subversion: init 1.11.0 2018-11-07 20:22:03 -05:00
Alyssa Ross
63e5658222
redmine: rack: 1.6.10 -> 1.6.11
CVE-2018-16470: https://seclists.org/oss-sec/2018/q4/128
CVE-2018-16471: https://seclists.org/oss-sec/2018/q4/129
2018-11-06 09:23:18 +00:00
Alyssa Ross
3c7bbb5850
gitlab: rack: 1.6.10 -> 1.6.11
CVE-2018-16470: https://seclists.org/oss-sec/2018/q4/128
CVE-2018-16471: https://seclists.org/oss-sec/2018/q4/129
2018-11-06 09:23:17 +00:00
Niklas Thörne
354379d6ff git-big-picture: 0.9.0 -> 0.10.1
https://github.com/esc/git-big-picture/blob/master/README.rst#Changelog
2018-11-04 15:34:17 +01:00
Florian Klink
9e491f732a gitlab: 11.4.3 -> 11.4.4
SSRF in Kubernetes integration
The GitLab Kubernetes integration was vulnerable to a SSRF issue which could allow an attacker to make requests to access any internal URLs. The issue is now mitigated in the latest release and is assigned CVE-2018-18843.
2018-11-03 01:49:49 +01:00
Robin Gloster
ec7cb84bf0
gitlab: refactor and fix test 2018-11-02 22:40:21 +01:00
Andreas Rammhold
c5c2da9d6c
Merge pull request #49524 from dtzWill/update/grv-0.3.0
gitAndTools.grv: 0.2.0 -> 0.3.0
2018-10-31 23:21:33 +01:00
Will Dietz
9c79402962 hub: 2.5.1 -> 2.6.0, cleanup a bit (#49503)
* categorize inputs appropriately
* only put man pages into share/man; previously we copied other formats
  as well as intermediate files used in man page generation.
  (which 'man' complained about but otherwise seemed to ignore)
2018-10-31 19:32:44 +01:00
baracoder
a9202796ec smartgithg: 18.1.4 -> 18.1.5 (#49527)
Bugfix version
2018-10-31 18:53:51 +01:00
Will Dietz
8798de63fb gitAndTools.grv: 0.2.0 -> 0.3.0
Remove 'update_latest_release.go' so we don't try to build it
since this fails due to unmet dependencies.

AFAICT this utility is only meant for developer use anyway,
and helps manage/create new github releases for the project.
2018-10-31 10:58:03 -05:00
Robin Gloster
3aec530964 gitlab: 11.4.0 -> 11.4.3 2018-10-29 20:42:02 +01:00
Pavel Goran
5f3054ef70 gitea: include "options" directory in "data" output
This directory contains template files needed for initializing new repositories.

Fixes #49404.
2018-10-29 23:16:47 +07:00
Jörg Thalheim
1246c31761
pijul: 0.8.0 -> 0.10.0 2018-10-28 10:45:58 +00:00
Robin Gloster
02afda3fd8 gitlab: 11.3.4 -> 11.4.0 2018-10-26 11:32:28 +02:00
Robin Gloster
eb7f8e71ad gitlab-workhorse: 6.1.1 -> 7.0.0 2018-10-26 11:32:28 +02:00
Robin Gloster
1a984ccc4e gitaly: 0.125.0 -> 0.125.1 2018-10-26 11:32:28 +02:00
xeji
2b7f6b3c40
Merge pull request #48924 from royneary/git-bug
git-bug: init at 0.4.0
2018-10-24 12:19:56 +02:00
R. RyanTM
655b45bb85 tortoisehg: 4.7.1 -> 4.7.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/tortoisehg/versions
2018-10-24 10:29:53 +02:00
royneary
82d87ccf79 git-bug: install man pages 2018-10-24 00:25:57 +02:00
royneary
fdd59b62c3 git-bug: init at 0.4.0
Add git-bug, a decentralized bug tracker written in Go
2018-10-23 23:41:36 +02:00
Daniël de Kok
5a0843124d git-crypt: 0.5.0 -> 0.6.0
Changes: https://www.agwa.name/git/git-crypt.git/raw/master/NEWS
2018-10-21 16:34:26 +02:00
Frederik Rietdijk
821a3beb10
Merge pull request #48306 from NixOS/staging-next
Merge staging-next into master
2018-10-18 11:23:04 +02:00
Jörg Thalheim
2157b83feb
Merge pull request #48512 from r-ryantm/auto-update/git-review
git-review: 1.26.0 -> 1.27.0
2018-10-17 11:36:07 +01:00
Frederik Rietdijk
18fcc337af Merge master into staging-next 2018-10-17 08:04:22 +02:00
Will Dietz
1e3ce59e7d git-recent: 1.0.4 -> 1.1.0 2018-10-16 18:09:55 -05:00
Lassulus
b7632217ab gitolite 3.6.7 -> 3.6.10 (#48562) 2018-10-17 00:20:38 +02:00
R. RyanTM
f3a8e772a5 git-review: 1.26.0 -> 1.27.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
2018-10-15 22:04:05 -07:00
Andreas Rammhold
81593e39bc
Merge pull request #48128 from florianjacob/gitea
gitea: 1.5.1 -> 1.5.2
2018-10-15 19:53:19 +02:00
Florian Jacob
0a5c7cf512 gitea: 1.5.1 -> 1.5.2 2018-10-15 18:28:36 +02:00
R. RyanTM
c5e2470b2e subversionClient: 1.10.2 -> 1.10.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/subversion-client/versions
2018-10-14 09:01:06 +02:00
Frederik Rietdijk
6f5142e48e Merge master into staging 2018-10-13 09:48:20 +02:00
R. RyanTM
21ed2b9d32 mercurialFull: 4.7.1 -> 4.7.2 (#47759)
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
2018-10-12 22:45:14 +02:00
Aaron Andersen
1cb5b509f1 redmine: refactor, cleanup, bug fix, and add functionality
- added package option to specify which version of redmine
- added themes option back in to allow specifying redmine themes
- added plugins option back in to allow specifying redmine plugins
- added database.socket option to allow mysql unix socket authentication
- added port option to allow specifying the port rails runs on

- cleaned up Gemfile so it is much less hacky
- switched to ruby version 2.4 by default as suggested by documentation http://www.redmine.org/projects/redmine/wiki/redmineinstall#Installing-Redmine
- fixed an annoyance (bug) in the service causing recursive symlinks
- fixed ownership bug on log files generated by redmine
- updates reflecting renames in nixos options

- added a nixos test
2018-10-10 21:04:08 -04:00
Robin Gloster
e51d749c0e
Merge pull request #48096 from krav/gitlab-11.3.4
gitlab: 11.2.3 -> 11.3.4, fix gitlab-ee
2018-10-10 21:40:53 +02:00
Eelco Dolstra
7b9c4954f2
git: Strip libsecret
This reduces gitFull's closure size from 412 MiB to 271 MiB.
2018-10-08 18:13:29 +02:00
Kristoffer Thømt Ravneberg
0083ca1266 gitlab-ee: Add ee rubyEnv, fixes regression introduced by 11.3.0 in #45574 2018-10-08 15:02:14 +02:00
Kristoffer Thømt Ravneberg
d837338d6b gitlab: 11.2.3 -> 11.3.4 2018-10-08 15:01:29 +02:00
Kristoffer Thømt Ravneberg
998d4e4e2c gitlab-workhorse: 6.1.0 -> 6.1.1, make build deterministic 2018-10-08 14:56:52 +02:00
Kristoffer Thømt Ravneberg
908a75a3ae gitaly: 0.117.2 -> 0.120.0 2018-10-08 14:54:32 +02:00
edef
5cdecca8b7 git: 2.19.0 -> 2.19.1 (CVE-2018-17456) 2018-10-05 18:36:08 +00:00
Marco Maggesi
eae1bd0958
Merge pull request #47805 from r-ryantm/auto-update/fossil
fossil: 2.6 -> 2.7
2018-10-05 12:32:14 +02:00
Jan Tojnar
5cc18c4781
gnome3: remove versionBranch attribute
Standard library now contains stdenv.lib.versions.majorMinor,
which does the same.
2018-10-05 02:17:19 +02:00
Alex Leferry 2
1bb4b16b3b GRV: Fix typos in description 2018-10-04 23:50:15 +02:00
R. RyanTM
7868debd46 fossil: 2.6 -> 2.7
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
2018-10-03 12:56:18 -07:00
Renaud
153f98062c
gitAndTools.stgit: fix fetcher and meta 2018-10-03 13:54:02 +02:00
Frederik Rietdijk
4d1abc4419
Merge pull request #47604 from NixOS/staging-next
Staging next
2018-10-02 18:22:18 +02:00
Felix Richter
3790cf7345 csv2svn: 2.4.0 -> 2.5.0 (#47635)
use buildPythonApplication instead of manual setup.py call
2018-10-02 15:52:22 +02:00
Daiderd Jordan
1383c08f2c
Merge branch 'master' into staging-next 2018-10-01 19:42:07 +02:00
Tycho Grouwstra
9d727e0a91 gitkraken: 4.0.2 -> 4.0.5 (#47512)
Fixes #47498. Note that the releases have moved to a new URL; I'm not sure they still host the earlier versions.
2018-09-29 20:48:28 +02:00
Matthew Bauer
61d7b93e3b
Merge pull request #46519 from teto/git_extra_zsh_completion
gitAndTools.git-extras: install zsh completion
2018-09-29 00:51:01 -05:00
Matthew Bauer
e6acc69f5a
Merge pull request #46932 from r-ryantm/auto-update/tortoisehg
tortoisehg: 4.7 -> 4.7.1
2018-09-29 00:45:46 -05:00
vanzef
82f2ae0260 gitAndTools.pass-git-helper: init at 0.4 (#47056) 2018-09-26 13:46:05 +01:00
John Ericson
c701d6cb21 Merge remote-tracking branch 'upstream/master' into staging 2018-09-25 14:20:27 -04:00
Robin Gloster
ed85eb5433 gitlab: 11.2.3 -> 11.3.0 2018-09-25 03:53:32 +02:00
Robin Gloster
cbc21b8b90 gitaly: 0.117.2 -> 0.120.0 2018-09-25 03:53:32 +02:00
Robin Gloster
545c07108f gitlab-shell: 8.1.1 -> 8.3.3 2018-09-25 03:53:32 +02:00
Robin Gloster
96c1765bac gitlab-workhorse: 6.0.0 -> 6.1.0 2018-09-25 03:53:32 +02:00
Kristoffer Thømt Ravneberg
6946d97ce4 gitlab-ee: init at 11.2.3 2018-09-25 03:53:32 +02:00
Kristoffer Thømt Ravneberg
51c1830147 gitlab: 10.8.0 -> 11.2.3 2018-09-25 03:53:32 +02:00
Kristoffer Thømt Ravneberg
bfc8d80c6e gitlab-shell: 7.1.2 -> 8.1.1 2018-09-25 03:53:32 +02:00
Kristoffer Thømt Ravneberg
949172f289 gitaly: 0.100.0 -> 0.117.2 2018-09-25 03:53:32 +02:00
Kristoffer Thømt Ravneberg
45aa373fa9 gitlab-workhorse: 4.2.0 -> 6.0.0 2018-09-25 03:53:32 +02:00
Vladimír Čunát
3a09a4b579
Merge branch 'master' into staging
Hydra: ?compare=1480463
2018-09-24 21:18:23 +02:00
Jörg Thalheim
e1ef438026
Merge pull request #47234 from Ma27/fix-tig-zsh-completion
tig: fix zsh completion
2018-09-23 19:17:40 +01:00
Maximilian Bosch
4bf1a7d975
tig: fix zsh completion
The ZSH completion script of `tig` basically imports the bash completion
script and uses it as completion approach. Unfortunately the script
takes several assumptions about the directory structure using
`$funcsourcetrace`[1] that don't apply on NixOS.

The easiest workaround is t opatch the completion script and import the
bash completion script from `$out`.

[1] http://zsh.sourceforge.net/Doc/Release/Zsh-Modules.html#index-funcsourcetrace
2018-09-23 19:36:22 +02:00
Boris
f799dff21b gitAndTools.pre-commit: 1.11.0 -> 1.11.1 (#47211) 2018-09-23 14:01:56 +02:00
Frederik Rietdijk
14673d61ed Merge master into staging 2018-09-23 09:33:09 +02:00
Jörg Thalheim
a709d11dd1 gogs: 0.11.53 -> 0.11.66 (#47073) 2018-09-21 10:41:17 +02:00
Uli Baum
8cd90e40be gitlab: add missing meta.platforms 2018-09-20 12:27:24 +02:00
R. RyanTM
6100592fd5 tortoisehg: 4.7 -> 4.7.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
2018-09-19 22:37:16 -07:00
Maciej Mazur
5843e43d23 mr: 1.20170129 -> 1.20180726 2018-09-19 14:35:47 +02:00
John Ericson
7319013ea1 Merge remote-tracking branch 'upstream/master' into staging 2018-09-18 16:55:42 -04:00
Andrew Childs
50454ec5f1 git: 2.18.0 -> 2.19.0 (#46723) 2018-09-18 17:54:22 +02:00
Jörg Thalheim
57da7993e3
Merge pull request #46824 from borisbabic/update/gitAndTools.pre-commit-1.11.0
gitAndTools.pre-commit: 1.10.4 -> 1.11.0
2018-09-18 13:15:52 +01:00
Boris Babic
9f25c99cb1 gitAndTools.pre-commit: 1.10.4 -> 1.11.0 2018-09-18 13:06:50 +02:00
Sarah Brofeldt
108de377d2
Merge pull request #46781 from vdemeester/new-git-appraise
git-appraise: init unstable at 2018-02-26
2018-09-18 10:04:54 +02:00
Vincent Demeester
69f028ea01
git-appraise: init unstable at 2018-02-26
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2018-09-18 09:48:33 +02:00
Vladyslav Mykhailichenko
dbc3d50396 git-lfs: 2.4.2 -> 2.5.2 2018-09-17 23:04:22 +03:00
Maximilian Bode
6b7cefdc58 gitAndTools.grv: fix darwin build by using go 1.9
cf. https://github.com/fsnotify/fsevents/issues/40

/cc ZHF #45961
2018-09-14 19:41:03 +02:00
R. RyanTM
7f40c3a93c gitAndTools.git-imerge: 1.0.0 -> 1.1.0 (#46281)
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-imerge/versions
2018-09-12 23:10:04 +02:00
R. RyanTM
e077fc1965 mercurialFull: 4.7 -> 4.7.1 (#46243)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
mercurial-full
2018-09-12 23:05:48 +02:00
Matthieu Coudron
d30c97096b gitAndTools.git-extras: install zsh completion
because there are so many freaking commands !
2018-09-11 18:56:00 +09:00
R. RyanTM
6d8a48e585 gitAndTools.svn-all-fast-export: 1.0.12 -> 1.0.13 (#46173)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
svn-all-fast-export
2018-09-11 00:07:37 +02:00
Matthew Bauer
442d79d8d3
Merge pull request #46174 from r-ryantm/auto-update/tortoisehg
tortoisehg: 4.6.1 -> 4.7
2018-09-10 14:59:42 -05:00
Daniël de Kok
bbcf5eb130 cgit: use full path of groff in man2html
groff may not be installed system-wide or may be outside cgit's path
(e.g. when running cgit using uwsgi). As a result, the man2html filter
fails. Replace groff by its full path in man2html.
2018-09-09 14:37:30 +02:00
xeji
5870a61b04
Merge pull request #46404 from oxij/pkgs/default-texinfo
git, gpgme: use default texinfo
2018-09-09 12:04:28 +02:00
Jan Malakhovski
7705c76c49 git: use default texinfo 2018-09-08 23:04:51 +00:00
Markus Kowalewski
ffb5eca618
vcprompt: add license 2018-09-08 15:15:58 +02:00
Markus Kowalewski
ae795a6acd
monotone: add license 2018-09-08 15:12:27 +02:00
Markus Kowalewski
edb1bfcd32
guitone: add license 2018-09-08 15:07:58 +02:00
Markus Kowalewski
9f29e4c9c7
cvs2svn: add license 2018-09-08 15:04:33 +02:00
Markus Kowalewski
499b7e8927
bzr-tools: add license 2018-09-08 15:01:25 +02:00
Markus Kowalewski
c2ff374951
bazaar: add license 2018-09-08 14:55:41 +02:00
R. RyanTM
7cf3891b75 tortoisehg: 4.6.1 -> 4.7
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
tortoisehg
2018-09-06 10:41:27 -07:00
Elis Hirwing
fcccb9e5ca gitea: 1.5.0 -> 1.5.1 (#45968)
Changelog: https://github.com/go-gitea/gitea/releases/tag/v1.5.1
2018-09-03 20:29:39 +02:00
Markus Kowalewski
cd748ba94a
tkcvs: update homepage 2018-09-02 01:46:26 +02:00
Frederik Rietdijk
704e87eef7
Merge pull request #45835 from r-ryantm/auto-update/git-cola
git-cola: 3.1 -> 3.2
2018-08-31 07:42:51 +02:00
R. RyanTM
58cbb0d0e6 git-cola: 3.1 -> 3.2
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
git-cola
2018-08-30 18:28:14 -07:00
Gabriel Ebner
d3f1679d4e gogs: 0.11.34 -> 0.11.53
cc @schneefux
2018-08-30 14:43:49 +02:00
Will Dietz
5903cc1b2d hub: 2.5.0 -> 2.5.1 (#45599) 2018-08-24 23:00:00 +02:00
R. RyanTM
d944690b7b mercurialFull: 4.6.2 -> 4.7 (#45186)
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.
2018-08-22 02:49:13 +02:00
baracoder
185cd8baa8 smartgithg: 17.1.4 -> 18.1.4 (#45250) 2018-08-21 20:51:54 +02:00
Meghea Iulian
1061c329ca gitkraken: 4.0.1 -> 4.0.2 (#45433) 2018-08-21 19:23:23 +02:00
Michael Raskin
980cbff93c
Merge pull request #45353 from aanderse/redmine
redmine: 2.5.2 -> 3.4.6
2018-08-21 14:04:02 +00:00
Vladimír Čunát
765d695b89
Merge branch 'staging-next'
Security fixes for a few packages are included.
2018-08-21 15:36:02 +02:00
Markus Kowalewski
8acffe39b7
gitlab: add meta data 2018-08-20 21:15:11 +02:00
Vladimír Čunát
153a19df05
Merge branch 'master' into staging-next
Hydra: ?compare=1474536
2018-08-20 09:15:33 +02:00
Aaron Andersen
e180796caa updated Gemfile... still needs to be fixed up though 2018-08-19 16:42:08 -04:00
Aaron Andersen
bb7568daf7 reworked the redmine service
added some security features like database.passwordFile
2018-08-19 16:29:44 -04:00
Aaron Andersen
5984ed283f started working on bringing the redmine package back to life using gitlab as an example 2018-08-19 08:09:38 -04:00
Vladimír Čunát
14aa936ec5
Merge branch 'staging-next' into staging 2018-08-17 20:53:27 +02:00
Vladimír Čunát
209730208a
Merge branch 'staging-next' 2018-08-17 20:51:31 +02:00
Vladimír Čunát
cbabebcc2e
Merge branch 'master' into staging-next
Hydra: ?compare=1473892
2018-08-17 13:45:21 +02:00
Jörg Thalheim
2c612a9037
Merge pull request #45229 from r-ryantm/auto-update/git-extras
gitAndTools.git-extras: 4.5.0 -> 4.6.0
2018-08-17 11:33:49 +01:00
R. RyanTM
f3be269e35 gitAndTools.git-extras: 4.5.0 -> 4.6.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-extras/versions.
2018-08-17 02:46:46 -07:00
Jörg Thalheim
d70d575151
Merge pull request #45156 from markuskowa/lics-tools
Add license meta tags
2018-08-17 00:31:26 +02:00
Andreas Rammhold
ed9f0c8f01
Merge pull request #45137 from r-ryantm/auto-update/tig
gitAndTools.tig: 2.4.0 -> 2.4.1
2018-08-16 22:34:00 +02:00
Markus Kowalewski
d15421f451
cvs: add license 2018-08-16 21:44:29 +02:00
R. RyanTM
a9d29f4716 gitAndTools.tig: 2.4.0 -> 2.4.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/tig/versions.
2018-08-16 12:10:40 -07:00
Meghea Iulian
4da408fa67 gitkraken: 3.6.6 -> 4.0.1 2018-08-16 00:01:54 +03:00
Vladimír Čunát
ded9a4b1aa
Merge branch 'staging-next' into staging
Commits from master, conflict resolutions, etc.
2018-08-13 20:57:50 +02:00
Vladimír Čunát
5b0398dc36
Merge branch 'master' into staging-next
Conflicts: gobby and libinfinity - I took the hand-edited versions
instead of those resuting from the mass-replacement.

Hydra: ?compare=1473190
2018-08-13 20:43:59 +02:00
Elis Hirwing
c6bf57f58c gitea: 1.4.3 -> 1.5.0 (#44939)
Changelog: https://github.com/go-gitea/gitea/releases/tag/v1.5.0
2018-08-13 00:29:30 +02:00
Jan Malakhovski
cec9b2635b subversion: use checkInputs, make tests run, but them keep disabled 2018-08-11 09:35:34 +00:00
Jan Malakhovski
207a8a5d68 mr: fix tests 2018-08-11 09:35:20 +00:00
Jan Malakhovski
2781c7d312 fossil: cleanup tests 2018-08-10 12:56:33 +00:00
Frederik Rietdijk
d9fa74ba78 Merge master into staging 2018-08-09 18:28:15 +02:00
Orivej Desh
42eca7ca2d subversion: add license 2018-08-09 02:48:06 +00:00
Bjørn Forsman
970d5ef198 cgit: 1.1 -> 1.2.1
Fixes CVE-2018-14912.
2018-08-09 01:03:31 +02:00
John Ericson
f0d6b385d1 treewide: Make all the rest of configureFlags 2018-08-03 17:06:03 -04:00
John Ericson
85a9913edd treewide: Make more complicated configureFlags lists 2018-08-03 17:06:03 -04:00
Cray Elliott
eca1f53a52 reposurgeon: 3.28 -> 3.44
also switch from cython to pypy as cyreposurgeon was dropped upstream in
favor of using pypy
2018-08-01 20:49:53 -07:00
Cray Elliott
169d5698a9 monotone: fix build against pcre 8.42 2018-08-01 20:49:53 -07:00
Izorkin
d1d4ec90ae bazaar: fix buid 2018-08-01 11:46:25 +03:00
Robert Schütz
e858b285c8
Merge pull request #44239 from borisbabic/feature/init-pre-commit
gitAndTools.pre-commit: init at 1.10.4
2018-07-31 14:35:33 +02:00
Boris Babic
585b0acbc9 gitAndTools.pre-commit: init at 1.10.4 2018-07-31 14:32:27 +02:00
xeji
09393501f0
Merge pull request #43929 from r-ryantm/auto-update/mercurial-full
mercurialFull: 4.5.2 -> 4.6.2
2018-07-31 00:22:17 +02:00
Uli Baum
77b501b902 tortoisehg: 4.5.2 -> 4.6.1 2018-07-30 23:24:55 +02:00
Will Dietz
c9d79c639f grv: 0.1.2 -> 0.2.0
Needs libgit2 0.27 apparently,
doesn't build with 0.26 or 0.25 in-tree.
2018-07-26 15:35:32 -05:00
Frederik Rietdijk
099c13da1b Merge staging-next into master (#44009)
* substitute(): --subst-var was silently coercing to "" if the variable does not exist.

* libffi: simplify using `checkInputs`

* pythonPackges.hypothesis, pythonPackages.pytest: simpify dependency cycle fix

* utillinux: 2.32 -> 2.32.1

https://lkml.org/lkml/2018/7/16/532

* busybox: 1.29.0 -> 1.29.1

* bind: 9.12.1-P2 -> 9.12.2

https://ftp.isc.org/isc/bind9/9.12.2/RELEASE-NOTES-bind-9.12.2.html

* curl: 7.60.0 -> 7.61.0

* gvfs: make tests run, but disable

* ilmbase: disable tests on i686. Spooky!

* mdds: fix tests

* git: disable checks as tests are run in installcheck

* ruby: disable tests

* libcommuni: disable checks as tests are run in installcheck

* librdf: make tests run, but disable

* neon, neon_0_29: make tests run, but disable

* pciutils: 3.6.0 -> 3.6.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/pciutils/versions.

* mesa: more include fixes

mostly from void-linux (thanks!)

* npth: 1.5 -> 1.6

minor bump

* boost167: Add lockfree next_prior patch

* stdenv: cleanup darwin bootstrapping

Also gets rid of the full python and some of it's dependencies in the
stdenv build closure.

* Revert "pciutils: use standardized equivalent for canonicalize_file_name"

This reverts commit f8db20fb3a.
Patching should no longer be needed with 3.6.1.

* binutils-wrapper: Try to avoid adding unnecessary -L flags

(cherry picked from commit f3758258b8895508475caf83e92bfb236a27ceb9)
Signed-off-by: Domen Kožar <domen@dev.si>

* libffi: don't check on darwin

libffi usages in stdenv broken darwin. We need to disable doCheck for that case.

* "rm $out/share/icons/hicolor/icon-theme.cache" -> hicolor-icon-theme setup-hook

* python.pkgs.pytest: setupHook to prevent creation of .pytest-cache folder, fixes #40273

When `py.test` was run with a folder as argument, it would not only
search for tests in that folder, but also create a .pytest-cache folder.
Not only is this state we don't want, but it was also causing
collisions.

* parity-ui: fix after merge

* python.pkgs.pytest-flake8: disable test, fix build

* Revert "meson: 0.46.1 -> 0.47.0"

With meson 0.47.0 (or 0.47.1, or git)
things are very wrong re:rpath handling
resulting in at best missing libs but
even corrupt binaries :(.

When we run patchelf it masks the problem
by removing obviously busted paths.
Which is probably why this wasn't noticed immediately.

Unfortunately the binary already
has a long series of paths scribbled
in a space intended for a much smaller string;
in my testing it was something like
lengths were 67 with 300+ written to it.

I think we've reported the relevant issues upstream,
but unfortunately it appears our patches
are what introduces the overwrite/corruption
(by no longer being correct in what they assume)

This doesn't look so bad to fix but it's
not something I can spend more time on
at the moment.

--

Interestingly the overwritten string data
(because it is scribbled past the bounds)
remains in the binary and is why we're suddenly
seeing unexpected references in various builds
-- notably this is is the reason we're
seeing the "extra-utils" breakage
that entirely crippled NixOS on master
(and probably on staging before?).

Fixes #43650.

This reverts commit 305ac4dade.

(cherry picked from commit 273d68eff8f7b6cd4ebed3718e5078a0f43cb55d)
Signed-off-by: Domen Kožar <domen@dev.si>
2018-07-24 15:04:48 +01:00
Jörg Thalheim
66afbde94e
Merge pull request #44008 from dtzWill/update/tig-2.4.0
tig: 2.3.3 -> 2.4.0
2018-07-23 13:51:06 +01:00
Will Dietz
90764df235 tig: 2.3.3 -> 2.4.0
https://github.com/jonas/tig/releases/tag/tig-2.4.0
2018-07-23 07:15:26 -05:00
Jörg Thalheim
90951bc1d7
Merge pull request #43957 from danieldk/gitea-1.4.3
gitea: 1.4.2 -> 1.4.3
2018-07-23 11:30:31 +01:00
Benjamin Staffin
815ae70556
gitFull: build libsecret credential helper (#43616)
...except on Darwin, where it won't be useful.
2018-07-22 15:20:37 -04:00
Daniël de Kok
8b695a7353 gitea: 1.4.2 -> 1.4.3 2018-07-22 08:59:08 +02:00
Frederik Rietdijk
c4557ae2c2
Merge pull request #43914 from r-ryantm/auto-update/peru
peru: 1.1.3 -> 1.1.4
2018-07-22 08:42:16 +02:00
volth
cc55a3ebcb treewide: fix build with disallowed aliases (#43872)
fixes build with disallowed aliases
2018-07-21 22:03:24 -04:00
R. RyanTM
03d49258f6 mercurialFull: 4.5.2 -> 4.6.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/mercurial-full/versions.
2018-07-21 15:10:56 -07:00
R. RyanTM
f1349908a6 peru: 1.1.3 -> 1.1.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/peru/versions.
2018-07-21 12:33:09 -07:00
Frederik Rietdijk
cc218fc915
Merge pull request #43906 from r-ryantm/auto-update/subversion
subversion_1_10: 1.10.0 -> 1.10.2
2018-07-21 19:14:41 +02:00
R. RyanTM
b657f663ac subversion_1_10: 1.10.0 -> 1.10.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/subversion/versions.
2018-07-21 09:56:00 -07:00
Jörg Thalheim
218298b30f
Merge branch 'master' into unused5 2018-07-21 15:41:22 +01:00
Frederik Rietdijk
251a0a9a86
Merge pull request #43860 from volth/unused2
treewide: remove unused 'inherit' in let blocks
2018-07-21 11:13:36 +02:00
Frederik Rietdijk
d86c4fd255
Merge pull request #43835 from ryantm/mercurial
mercurial: fix homepage
2018-07-21 10:50:47 +02:00
Meghea Iulian
d329579052 gitkraken: 3.6.4 -> 3.6.6 2018-07-21 09:52:33 +03:00
volth
52f53c69ce pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00:00
volth
6d2857a311 [bot] treewide: remove unused 'inherit' in let blocks 2018-07-20 19:38:19 +00:00
Ryan Mulligan
1d284727d3 mercurial: fix homepage 2018-07-19 18:45:38 -07:00
Matthew Bauer
76999cc40e treewide: remove aliases in nixpkgs
This makes the command ‘nix-env -qa -f. --arg config '{skipAliases =
true;}'’ work in Nixpkgs.

Misc...

- qtikz: use libsForQt5.callPackage

  This ensures we get the right poppler.

- rewrites:

  docbook5_xsl -> docbook_xsl_ns
  docbook_xml_xslt -> docbook_xsl

diffpdf: fixup
2018-07-18 23:25:20 -04:00
volth
101df126bb config.skipAliases -> config.allowAliases 2018-07-17 14:46:21 +00:00
volth
4bafaaff8a config.skipAliases: also disable vimPlugins, git, xfce and gnome3 aliases 2018-07-17 14:46:21 +00:00
lewo
8155016932
Merge pull request #43617 from dtzWill/update/hub-2.5.0
hub: 2.4.0 -> 2.5.0
2018-07-17 15:39:49 +02:00
Will Dietz
553fd39e53 hub: 2.4.0 -> 2.5.0 2018-07-16 10:55:13 -05:00
Vladimír Čunát
0f01215203
Merge branch 'master' into staging-next
Hydra: ?compare=1468896
2018-07-14 18:15:30 +02:00
Jörg Thalheim
bc05053631 tig: zsh completion should be named _tig 2018-07-12 07:26:56 -04:00
Matthieu Coudron
a66a44186f tig: add zsh completion
along with contrib/vim.tigrc config in case users want to use it.
2018-07-12 12:39:11 +09:00
Jan Tojnar
3098510780
meld: 3.18.1 → 3.18.2 2018-07-06 09:35:01 +02:00
Robert Hensing
02ee6b85fe p4v: update sha256 2018-07-04 10:21:45 +02:00
Vladimír Čunát
f7781f5293
Merge branch 'master' into staging 2018-06-30 01:41:59 +02:00
Silvan Mosberger
57bccb3cb8 treewide: http -> https sources (#42676)
* treewide: http -> https sources

This updates the source urls of all top-level packages from http to
https where possible.

* buildtorrent: fix url and tab -> spaces
2018-06-28 20:43:35 +02:00
Will Dietz
bb00076931 Revert "Revert "Merge pull request #42376 from dtzWill/update/git-2.18.0""
This reverts commit 6d1955e0c4.
2018-06-28 07:01:14 -05:00
Ryan Mulligan
fce8f26af6 treewide: http -> https (#42665) 2018-06-27 22:12:57 +02:00
xeji
b8ad7ec94b
Merge pull request #41876 from IvanMalison/addGitSync
Add git sync
2018-06-26 13:06:49 +02:00
Uli Baum
19ce96584a git-sync: move to gitAndTools.git-sync
By convention, git-related tools in nixpkgs are not added to
the top level but bundled under gitAndTools.
2018-06-26 12:33:18 +02:00
Will Dietz
6d1955e0c4 Revert "Merge pull request #42376 from dtzWill/update/git-2.18.0"
This reverts commit 2624f90796, reversing
changes made to 37aab4cbb5.

See:
https://github.com/NixOS/nixpkgs/pull/42376#issuecomment-399789096

Basically this breaks at least some users of fetchgit,
so let's revert this until this is sorted out.
2018-06-24 22:36:50 -05:00
Meghea Iulian
4ea0be20be gitkraken: 3.6.3 -> 3.6.4 (#42414) 2018-06-24 19:50:10 +02:00
Will Dietz
26f24fe09a git: indicate when last tested to "still" fail, for checking updates 2018-06-22 10:10:20 -05:00
Will Dietz
1190af39b9 git: disable failing completion test as well 2018-06-22 10:02:57 -05:00
Will Dietz
4136cb5ba9 git: disable "editor with a space" tests due to fails
Need to investigate.
2018-06-22 10:00:42 -05:00
Will Dietz
e65e6cad23 git: disable working-tree-encoding tests on musl
Makes assumptions about BOM.
2018-06-22 09:56:20 -05:00
Will Dietz
5f27396e8f git: remove symlinks-in-bin patch 2018-06-22 09:15:54 -05:00
Will Dietz
18231121f4 git: 2.17.1 -> 2.18.0 2018-06-22 09:12:06 -05:00
Matthew Bauer
fc048073e6 git: remove object file from closure
This file pulls in some big dependencies that are unneeded (like
clang).
2018-06-21 19:47:10 -04:00
Jörg Thalheim
6906e5c149 gitAndTools.hub: remove go compiler from runtime closure 2018-06-21 23:34:44 +01:00
R. RyanTM
802ea37863 git-secret: 0.2.3 -> 0.2.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/git-secret/versions.

These checks were done:

- built on NixOS
- /nix/store/rhxzf1mc0jz2m3rp0rg5wqn81ykfshay-git-secret-0.2.4/bin/git-secret passed the binary check.
- /nix/store/rhxzf1mc0jz2m3rp0rg5wqn81ykfshay-git-secret-0.2.4/bin/.git-secret-wrapped passed the binary check.
- 2 of 2 passed binary check by having a zero exit code.
- 1 of 2 passed binary check by having the new version present in output.
- found 0.2.4 with grep in /nix/store/rhxzf1mc0jz2m3rp0rg5wqn81ykfshay-git-secret-0.2.4
- directory tree listing: https://gist.github.com/d460daac78bbcef226d1fff7918d150d
- du listing: https://gist.github.com/ea683543c922a9c179a97faf441a1797
2018-06-19 11:59:41 -07:00
Elis Hirwing
106bde413e
gitea: 1.4.1 -> 1.4.2
Not much of a changelog: https://github.com/go-gitea/gitea/releases/tag/v1.4.2
2018-06-18 18:26:14 +02:00
Pascal Wittmann
7a3c052e97
gource: 0.48 -> 0.49 2018-06-16 17:16:16 +02:00
Yurii Rashkovskii
f45fd23bd1 sit: 0.3.2 -> 0.4.0 (#41863) 2018-06-12 19:55:33 +02:00
Ivan Malison
53138130f8
git-sync: init at 20151024 2018-06-12 10:33:25 -07:00
Jörg Thalheim
8ba3df7687
Merge pull request #41566 from krav/fix-gitaly
gitaly: Cause ruby-cd to be wrapped so bundler will work
2018-06-11 11:58:27 +01:00
Andrey Pavlov
77c2ca6be2 hub: 2.3.0 -> 2.4.0 2018-06-08 13:26:43 +03:00
Kristoffer Thømt Ravneberg
786449aa77 gitaly: Cause ruby-cd to be wrapped so bundler will work 2018-06-06 13:29:01 +02:00
Meghea Iulian
5a4d428d7c gitkraken: 3.6.1 -> 3.6.3 2018-06-02 13:35:29 +03:00
Orivej Desh
97f6be5c90
subversion_1_10: init at 1.10.0 (#41383) 2018-06-02 02:50:38 +00:00
Meghea Iulian
e4ba5dc3d6 gitkraken: 3.6.0 -> 3.6.1 (#41130) 2018-05-31 23:04:50 +02:00
Jörg Thalheim
d5f3f14a45
Merge pull request #41297 from r-ryantm/auto-update/git-hub
git-hub: 1.0.0 -> 1.0.1
2018-05-31 07:44:14 +01:00
R. RyanTM
b8110dbee6 git-hub: 1.0.0 -> 1.0.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/git-hub/versions.

These checks were done:

- built on NixOS
- /nix/store/alnsn3bczp0j8x9d8f390q67aql5y7cc-git-hub-1.0.1/bin/git-hub passed the binary check.
- 1 of 1 passed binary check by having a zero exit code.
- 1 of 1 passed binary check by having the new version present in output.
- found 1.0.1 with grep in /nix/store/alnsn3bczp0j8x9d8f390q67aql5y7cc-git-hub-1.0.1
- directory tree listing: https://gist.github.com/fc09f98152d4008f23cb52855621b6bb
- du listing: https://gist.github.com/29489408ac7b6cb1137948d9edd0fef6
2018-05-30 20:11:53 -07:00
Will Dietz
98981ec9c0
Merge pull request #41255 from dtzWill/update/hub-2.3.0
hub: 2.2.9 -> 2.3.0
2018-05-30 21:17:16 -05:00
Jörg Thalheim
4fc23d2de0 hubUnstable: remove in favor of hub 2018-05-31 00:37:46 +01:00
Vladyslav M
5c16e62d4b git-lfs: 2.3.4 -> 2.4.2 (#41249) 2018-05-30 23:39:12 +02:00
R. RyanTM
a4e732482c gitAndTools.transcrypt: 1.0.3 -> 1.1.0 (#41231)
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/transcrypt/versions.

These checks were done:

- built on NixOS
- /nix/store/rnqjmp32pr8zq5y7bn9n0qcrnwg5qi82-transcrypt-1.1.0/bin/transcrypt passed the binary check.
- /nix/store/rnqjmp32pr8zq5y7bn9n0qcrnwg5qi82-transcrypt-1.1.0/bin/.transcrypt-wrapped passed the binary check.
- 2 of 2 passed binary check by having a zero exit code.
- 1 of 2 passed binary check by having the new version present in output.
- found 1.1.0 with grep in /nix/store/rnqjmp32pr8zq5y7bn9n0qcrnwg5qi82-transcrypt-1.1.0
- directory tree listing: https://gist.github.com/74399ed2dc0f5e79c6face443cf11691
- du listing: https://gist.github.com/6c7f5baa546117396d7b51993bf84dba
2018-05-30 23:11:42 +02:00
Will Dietz
b4b65b2e67 hub: 2.2.9 -> 2.3.0
Hooray!
2018-05-30 07:54:21 -05:00
Tim Steinbach
9db1f486e1
git: 2.17.0 -> 2.17.1 2018-05-29 21:33:43 -04:00
Jörg Thalheim
173cefd4e3
Merge pull request #41213 from flokli/svn-all-fast-export-1.0.12
gitAndTools.svn-all-fast-export: 1.0.11 -> 1.0.12
2018-05-29 22:15:44 +01:00
Florian Klink
01f91267e2 gitAndTools.svn-all-fast-export: 1.0.11 -> 1.0.12
patch for https://github.com/svn-all-fast-export/svn2git/pull/40 is
contained in this release, so we can drop it here.
2018-05-29 18:42:45 +02:00
Markus Kowalewski
f5ef39039c
qgit: 2.7 -> 2.8 2018-05-29 13:54:28 +02:00
Jan Malakhovski
ad35019501 Merge branch 'master' into staging
Fixed conflicts:
- lib/systems/for-meta.nix: in favor of staging
- pkgs/os-specific/darwin/xcode/default.nix: in favor of master
2018-05-26 00:20:17 +00:00
Matthew Justin Bauer
98f2f08b4b
Merge pull request #41009 from matthewbauer/normalize-names
Add versions to packages missing it
2018-05-25 16:32:48 -05:00
Matthew Bauer
02297beade treewide: add version to packages
Lots of packages are missing versions in their name. This adds them
where appropriate. These were found with this command:

 $ nix-env -qa -f. | grep -v '\-[0-9A-Za-z.-_+]*$' | grep -v '^hook$'

See issue #41007.
2018-05-25 15:48:05 -05:00
Robin Gloster
f21ac1bf69
gitlab: 10.7.0 -> 10.8.0 2018-05-24 04:40:46 +02:00
Robin Gloster
9a54f2a9b3
gitlab-workhorse: 4.1.0 -> 4.2.0 2018-05-24 04:40:46 +02:00
Robin Gloster
6d941dfd85
gitaly: 0.95.0 -> 0.100.0 2018-05-24 04:40:46 +02:00
Vladimír Čunát
392e6de7d0
Merge branch 'master' into staging 2018-05-20 13:20:53 +02:00
Josef Kemetmüller
3575b82e67 gitAndTools.git-dit: Fix darwin build 2018-05-20 04:09:04 +02:00
John Ericson
ee4b56edd3 Merge remote-tracking branch 'upstream/master' into staging 2018-05-11 14:36:08 -04:00
Robert Schütz
45ce588000
Merge pull request #40371 from Ma27/git-cola/qt5-port
git-cola: port to qt5
2018-05-11 20:08:24 +02:00