William A. Kennington III
6602f49495
Revert "Revert "Merge pull request #9543 from NixOS/staging.post-15.06""
...
This reverts commit 741bf840da
2015-11-14 12:32:51 -08: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
Stéphane Jourdois
221965a918
tig: add libiconv dep on darwin
2015-11-07 13:51:43 +01: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
ebedbec72b
git: 2.6.2 -> 2.6.3
2015-11-05 18:18:21 -08:00
William A. Kennington III
dd2de66d61
Merge branch 'master.upstream' into staging.upstream
2015-10-30 17:16:07 -07:00
Aaron Bull Schaefer
8e7d39835f
transcrypt: init at 0.9.7
2015-10-25 23:22:21 +00:00
Vladimír Čunát
4917a4f8b3
Merge master into staging
2015-10-23 01:57:14 +02:00
William A. Kennington III
cc2f78573e
git: 2.5.3 -> 2.6.2
2015-10-18 17:23:51 -07:00
William A. Kennington III
8a44a36ca4
Merge branch 'master.upstream' into staging.upstream
2015-10-15 10:22:28 -07:00
Desmond O. Chang
b41742414e
git-crypt: update maintainer
2015-10-14 21:46:27 +08:00
Eelco Dolstra
741bf840da
Revert "Merge pull request #9543 from NixOS/staging.post-15.06"
...
This reverts commit f61176c539a27ca029ee
2015-10-06 15:24:20 +02:00
Tobias Geerinckx-Rice
910dfd53bd
git-hub: minor clean-up
...
Move meta out of the way; inherit the GitHub home page from src;
`with platforms; linux` -> `platforms.linux`.
2015-10-02 05:34:34 +02:00
Matthias Beyer
05fab76355
gitAndTools.git-extras: 2.2.0 -> 3.0.0
2015-09-29 12:27:22 +02:00
William A. Kennington III
25dbb2d8bc
git: 2.5.2 -> 2.5.3
2015-09-23 12:30:00 -07:00
Vladimír Čunát
76ef7a93e3
Merge: xlibs and x11 attribute cleanup
...
Frequently using multiple *almost* identical attributes is bad.
2015-09-23 10:42:34 +02:00
Peter Simons
07f8f50c6d
git-annex: build w/o assistant in Stackage, with assistant for Nixpkgs
2015-09-19 08:20:54 +02:00
Vladimír Čunát
88c9f8b574
xlibs: replace occurrences by xorg
...
This seems to have been confusing people, using both xlibs and xorg, etc.
- Avoided renaming local (and different) xlibs binding in gcc*.
- Fixed cases where both xorg and xlibs were used.
Hopefully everything still works as before.
2015-09-15 12:54:34 +02:00
Mathnerd314
eb7404d97a
all-packages: Use callPackage where possible
2015-09-14 22:27:19 -06:00
William A. Kennington III
b127f88711
git: 2.5.1 -> 2.5.2
2015-09-13 20:09:19 -07:00
Kamil Chmielewski
e77b9fff67
git-radar: init at 0.3.2
2015-09-08 08:44:51 +02:00
William A. Kennington III
6f19418b65
git: 2.5.0 -> 2.5.1
2015-08-31 10:27:07 -07:00
Tobias Geerinckx-Rice
481d2acea8
git-hub: remove files not needed on Nix
2015-08-17 23:21:50 +02:00
Desmond O. Chang
f3cb701085
git-crypt: init at 0.5.0
2015-08-08 17:04:07 +08:00
Eelco Dolstra
525c901ce9
Make svn2git visible to nix-env
2015-08-05 14:33:12 +02:00
Eelco Dolstra
9657be0b95
svn2git-kde: Mark as broken
...
The source repository no longer exists.
2015-08-05 14:33:03 +02:00
William A. Kennington III
0e947e00a0
git: 2.4.6 -> 2.5.0
2015-07-29 18:15:08 -07: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
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
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
