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
Eelco Dolstra
4a57b07653
Merge remote-tracking branch 'origin/master' into staging
2015-06-11 00:18:24 +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
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
21247699ad
git: 2.4.0 -> 2.4.1
2015-05-15 18:38:13 -07:00
koral
d40cf483cc
git: 2.3.6 -> 2.4.0
2015-05-09 11:46:31 +00:00
Bob van der Linden
9254ee082e
git-cola: changed platform to Linux only
2015-05-08 13:41:02 +02:00
Peter Simons
324719a5a6
Drop obsolete pre-NG Haskell builds.
2015-05-05 21:44:47 +02:00
Domen Kožar
f69cfbfa15
Merge pull request #7631 from KaiSforza/git-remote-hg
...
git-remote-hg: remove dbus, install built docs
2015-05-02 14:44:03 +02:00
Joachim Fasting
bf7ad2d84f
meta.description fixups
...
Mostly scripted substitutions with a couple of subjective enhancements.
2015-04-30 18:17:42 +02:00
Joachim Schiele
50fb7b312b
tig-2.1.1: version bump
2015-04-29 23:57:31 +02:00
William Giokas
9870ba1968
git-remote-hg: remove dbus, install built docs
...
dbus is unused in this package, no reason to include it in the
expression anywhere.
2015-04-29 09:58:04 -07:00
John Wiegley
de808ae79f
Merge pull request #7276 from spwhitt/git-imerge
...
git-imerge: new package
2015-04-26 19:51:05 -05:00
koral
ffe6539c98
git: 2.3.5 -> 2.3.6
2015-04-25 23:07:02 +00:00
Peter Simons
805b9ed4bf
git-annex: use build from GHC 7.8.4 package set until 7.10.1 compiles this tool
2015-04-20 00:06:52 +02:00
Andrey Pavlov
d421a7b77b
git-and-tools/hub: 2.2.0-rc1 -> 2.2.1
2015-04-16 10:25:25 +03:00
Spencer Whitt
943fd93c14
git-imerge: new package
2015-04-14 15:50:27 -04:00
John Wiegley
aec35dfa58
Revert "git-imerge: new package"
...
This reverts commit 309d0f0c8b
.
2015-04-08 14:03:14 -05:00
Spencer Whitt
309d0f0c8b
git-imerge: new package
2015-04-07 00:40:33 -04:00
Peter Simons
844d88fe4c
Merge pull request #7146 from k0ral/git
...
git: 2.3.4 -> 2.3.5
2015-04-03 13:31:10 +02:00
koral
d54b6c903d
git: 2.3.4 -> 2.3.5
2015-04-03 10:57:36 +00:00
William A. Kennington III
06ea226495
cgit: 0.10.2 -> 0.11.2
2015-03-26 17:15:29 -07:00
William A. Kennington III
cd3b460200
tig: 2.0.3 -> 2.1
2015-03-26 16:41:05 -07:00
William A. Kennington III
940d381d73
git: 2.3.3 -> 2.3.4
2015-03-26 14:03:51 -07:00
koral
8797078695
git: 2.3.2 -> 2.3.3
2015-03-17 17:18:12 +00:00
lethalman
9b699bc9a9
Merge pull request #6705 from bobvanderlinden/gitcola
...
git-cola: add package
2015-03-11 15:35:37 +01:00
koral
5d0cc81d08
git: 2.3.1 -> 2.3.2
...
(cherry picked from commit 50933385c5
)
2015-03-10 13:20:02 +01:00
koral
a0da8638d6
git: 2.3.0 -> 2.3.1
...
(cherry picked from commit 36c1a8a6c7
)
2015-03-10 13:19:41 +01:00
Bob van der Linden
08ea20df65
git-cola: add package
2015-03-08 01:39:29 +01:00
Dan Peebles
a78d164b1e
Minor fixes for git on darwin (libiconv and Security dependencies)
2015-02-17 22:30:59 -05:00
Peter Simons
ad1417ed0e
git: update to version 2.3.0
2015-02-06 13:59:57 +01:00
lethalman
2140080b08
Merge pull request #5750 from rycee/issue/5741
...
Wrap 'tig' command to add with git to PATH.
2015-01-28 14:52:45 +01:00
Peter Simons
7149878010
git-annex: switch attribute over to haskell-ng package set some more
2015-01-22 23:29:09 +01:00
Peter Simons
5adc98cc50
git-annex: switch attribute over to haskell-ng package set, which is more up-to-date
2015-01-22 23:25:40 +01:00
Charles Strahan
dfc225d143
Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-ruby
...
Conflicts:
pkgs/applications/version-management/git-and-tools/default.nix
pkgs/applications/version-management/git-and-tools/hub/default.nix
pkgs/tools/audio/mpdcron/default.nix
2015-01-20 20:21:03 -05:00
muflax
98556ef150
git-remote-hg: fix compatibility with mercurial 3.2
...
Close #5458 .
2015-01-20 15:49:59 +01:00
Robert Helgesson
db01e50f6a
Wrap 'tig' command to add with git to PATH.
...
This ensures that git is added as a run-time dependency of tig and
allows tig to find the git command even if git is not installed in the
user environment. Fixes #5741 .
2015-01-13 23:12:35 +01:00
Ludovic Courtès
41b53577a8
unmaintain a bunch of packages
2015-01-13 22:33:49 +01:00
aszlig
947a4c582e
hub: Fix build with chrooted Nix.
...
The build script is a shell script which has a shebang using
/usr/bin/env, which isn't available in a chrooted Nix daemon.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-01-12 03:05:40 +01:00