danbst
fc155f74d6
tortoisehg: init at 3.4.2
2015-07-31 19:29:29 +00:00
Vladimír Čunát
9f37e91ec5
Merge master into staging
...
There are larger-rebuild changes: gnutls and samba.
2015-07-17 06:38:04 +02:00
William A. Kennington III
d7b917e612
git: 2.4.5 -> 2.4.6
2015-07-16 20:07:17 -07:00
lostdj
a643e25286
SmartGitHg: 6.5.7 -> 6.5.9
2015-07-15 13:13:01 +03:00
William A. Kennington III
333f145d76
Merge branch 'master.upstream' into staging.upstream
2015-07-13 15:11:31 -07:00
Austin Seipp
d1221f46e9
nixpkgs: git 2.4.4 -> 2.4.5
...
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-07-09 01:33:46 -05:00
Austin Seipp
35ca7fae8e
nixpkgs: git - link git-http-backend into $PATH
...
This makes it easier for tools (like Phabricator) to find
git-http-backend to enable HTTP(S) transport support.
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-07-09 01:33:15 -05:00
William A. Kennington III
dae5b35463
ruby: Fixup libv8 versions
2015-07-08 15:10:50 -07:00
Jude Taylor
6f6d873069
darwin purity: mercurial
2015-07-08 14:15:04 -07:00
William A. Kennington III
d605663ae2
Merge branch 'master.upstream' into staging.upstream
2015-07-05 13:06:02 -07:00
Pascal Wittmann
b6db9b9553
src: update from 0.13 to 0.19
2015-07-01 23:43:17 +02:00
William A. Kennington III
7eae48871f
Merge branch 'master.upstream' into staging.upstream
2015-07-01 13:38:17 -07:00
Shea Levy
145768bf9b
Unmaintain a bunch of packages
2015-07-01 08:11:05 -04:00
lethalman
d50969b66e
Merge pull request #8580 from jraygauthier/jrg/fix_meld_hicolor_icon_breakage
...
Fix meld package that broke the hicolor icon theme.
2015-07-01 10:12:32 +02:00
Raymond Gauthier
d612a9e132
meld: fix for hicolor theme breakage
...
This breakage was cause by the package outputing its own
version of index.cache to `share/icons/hicolor`.
Used the `hicolor_icon_theme` hook to perform automated cleanup.
2015-07-01 00:26:02 -04:00
William A. Kennington III
ef253212f4
Merge branch 'master.upstream' into staging.upstream
2015-06-26 17:25:49 -07:00
Pascal Wittmann
dd73d2af87
Merge pull request #8505 from joachifm/delete-codeville
...
codeville: delete expression
2015-06-26 17:09:42 +02:00
Jude Taylor
9f6f299448
darwin purity: subversion
2015-06-25 16:36:05 -07:00
Jude Taylor
a8c98bc013
darwin purity: mercurial
2015-06-25 16:36:04 -07:00
Joachim Fasting
78d4f1dec6
codeville: delete expression
...
Codeville is abandonware. The homepage returns 404, and the last release
is 8 years old ...
2015-06-25 22:34:29 +02:00
Thomas Tuegel
a8c52d0958
Merge branch 'master' into staging
2015-06-25 09:15:05 -05:00
Peter Simons
922c555015
mercurial: add hg-git support
...
Enable this feature by putting these lines into your ~/.hgrc file:
[extensions]
hgext.bookmarks =
hggit =
2015-06-24 11:33:17 +02:00
William A. Kennington III
282d03befa
Merge branch 'master.upstream' into staging.upstream
2015-06-22 10:57:36 -07:00
Jascha Geerds
01e43fcd1d
gitflow: 1.7.0 -> 1.8.0
2015-06-22 12:17:50 +02:00
Jascha Geerds
ed4b17bbd8
Merge pull request #8424 from bobvanderlinden/gitcola-2.2.1
...
git-cola: update from 2.1.1 to 2.2.1
2015-06-22 08:42:53 +02:00
Jascha Geerds
3f66bb7ff2
Add myself as maintainer
2015-06-22 08:26:09 +02:00
Bob van der Linden
a768954d63
git-cola: update from 2.1.1 to 2.2.1, potentially fixes CVE-2012-0845, CVE-2012-1150, CVE-2014-9365
2015-06-19 23:56:30 +02:00
William A. Kennington III
fe4f8903b4
Merge branch 'master.upstream' into staging.upstream
2015-06-18 22:37:00 -07:00
William A. Kennington III
7fd80890c7
git: 2.4.2 -> 2.4.4
2015-06-18 21:24:46 -07:00
Luca Bruno
aa800fa0fe
Merge branch 'master' into staging
2015-06-15 09:56:29 +02:00
Henry Till
faa90fad3f
mr: update from 1.20141024 to 1.20150503
2015-06-14 22:54:31 +02:00
William A. Kennington III
954801a9a8
Merge branch 'master.upstream' into staging.upstream
2015-06-12 13:47:46 -07:00
Peter Simons
84dfce0bc0
mercurial: install bash completion
2015-06-11 12:07:15 +02:00
Eelco Dolstra
4a57b07653
Merge remote-tracking branch 'origin/master' into staging
2015-06-11 00:18:24 +02:00
Peter Simons
59d98da246
Merge pull request #8273 from k0ral/git
...
git: 2.4.1 -> 2.4.2
2015-06-10 21:40:13 +02:00
koral
5a64cc1dc8
git: 2.4.1 -> 2.4.2
2015-06-10 16:22:23 +00:00
William A. Kennington III
9d6555dc0a
Merge branch 'master.upstream' into staging.upstream
2015-06-06 12:04:42 -07:00
William A. Kennington III
ffd0539eba
cacert: store ca-bundle.crt in $out/etc/ssl/certs instead of $out
2015-06-05 13:00:52 -07:00
Tobias Geerinckx-Rice
1a64d9251c
Add git-hub: command line GitHub interface
...
Rather cool, actually.
2015-06-02 23:58:03 +02:00
Domen Kožar
dc3316268e
Merge branch 'master' into staging
2015-06-01 11:00:51 +02:00
William A. Kennington III
867d2c5c46
openssl: Remove References to OPENSSL_X509_CERT_FILE
2015-05-31 15:50:51 -07:00
Peter Simons
b462c7908f
git-annex: on second thought, let's not break backwards compatibility for no apparent reason
2015-05-30 21:02:45 +02:00
Peter Simons
9cc46aaa4a
git-annex: switch to the version built with GHC 7.10.1
...
Also, this change renames the "gitAnnex" attribute to "git-annex". This
seems more in-line with recent additions to the git package family,
which all used dashed names instead of camel-caps.
2015-05-30 19:54:42 +02:00
William A. Kennington III
cd52c04456
Fix more ca-bundle paths
2015-05-29 14:26:32 -07:00
William A. Kennington III
14c1e0fa1f
Fix ca-bundle paths
2015-05-29 14:03:34 -07:00
Tobias Geerinckx-Rice
158e1cfdd0
Don't use "with licenses;" for single licences
...
And don't use square brackets on such lines.
2015-05-28 19:20:29 +02:00
Austin Seipp
d7de6dad5f
Merge pull request #7755 from Lassulus/gitolite-update
...
Gitolite update
2015-05-25 10:02:56 -05:00
William A. Kennington III
21247699ad
git: 2.4.0 -> 2.4.1
2015-05-15 18:38:13 -07:00
Pascal Wittmann
9c9c586534
Fixed several "package has no version" warnings
2015-05-14 17:19:41 +02:00
lassulus
23b97e4066
gitolite: v3.6.2 -> v3.6.3
2015-05-10 14:07:47 +02:00