zimbatm
c38eb526d5
git: fix references to gettext in bash scripts
...
See #13047
2016-02-16 21:01:21 +00:00
Vladimír Čunát
54299b60c4
Merge #12779 : Mass replace pkg}/bin
-style strings
...
... to refer to correct outputs
2016-02-03 17:25:22 +01:00
Vladimír Čunát
ae74c356d9
Merge recent 'staging' into closure-size
...
Let's get rid of those merge conflicts.
2016-02-03 16:57:19 +01:00
Guillaume Maudoux
9f358f809d
Configure a default trust store for openssl
2016-02-03 12:42:01 +01:00
Tuomas Tynkkynen
e97e690244
treewide: Mass replace 'xz}/bin' to refer the 'bin' output
2016-02-01 20:46:28 +02:00
Tuomas Tynkkynen
5f4a8de754
treewide: Mass replace 'bzip2}/bin' to refer the 'bin' output
2016-02-01 20:45:57 +02:00
Jascha Geerds
f7578a4d32
gitflow: 1.8.0 -> 1.9.1
2016-01-27 17:15:42 +01:00
Christoph Hrdinka
890f000146
goPackages.git-annex-remote-b2: init at 0.2
2016-01-26 17:54:53 +01:00
Tobias Geerinckx-Rice
9fb8020e4e
Add version attribute where maintainers |= nckx
...
This will probably be mandatory soon, and is a step in the right
direction. Removes the deprecated meta.version, and move some meta
sections to the end of the file where I should have put them in
the first place.
2016-01-25 17:35:21 +01:00
Vladimír Čunát
716aac2519
Merge branch 'staging' into closure-size
2016-01-19 09:55:31 +01:00
Vladimír Čunát
2d0893088f
Merge branch 'master' into staging
2016-01-15 13:43:57 +01:00
Vladimír Čunát
c169718a6b
git-bz: fix meta typo
...
Thanks to @heydojo.
2016-01-15 10:26:18 +01:00
Tobias Geerinckx-Rice
d1440745c6
git-bz: meta: un-break; fix licence; maintain
...
CC @nbp (I assume it was abandoned years ago, apologies otherwise).
2016-01-15 05:31:47 +01:00
Tobias Geerinckx-Rice
36a68c8b6b
git-bz: 3.20110902 -> 3.2015-09-08
2016-01-15 05:31:47 +01:00
Tobias Geerinckx-Rice
123065aa3d
git-bz: use callPackage and canonical package name
...
Don't add a compatibility alias as this package was/is marked as
being broken anyway.
2016-01-15 05:31:47 +01:00
somaticweb
2c4c9bee13
git: 2.6.4 -> 2.7.0
...
Also corrected the license, which is GPL2-only
2016-01-05 22:15:17 -08:00
janus
a472d836f6
FreeBSD: apr-util, cyrus-sasl, berkeley db, glib, gnutls, kerberos, libelf-freebsd, openldap, serf, guile, tet, shishi, gawk, gnugrep
2016-01-01 17:01:13 +00:00
Vladimír Čunát
f9f6f41bff
Merge branch 'master' into closure-size
...
TODO: there was more significant refactoring of qtbase and plasma 5.5
on master, and I'm deferring pointing to correct outputs to later.
2015-12-31 09:53:02 +01:00
Matt McHenry
090efc2907
subgit: init at 3.1.0
2015-12-28 22:59:23 -05:00
Eric Merritt
6108bb8971
hub: 2.2.1 -> 2.2.2
2015-12-23 08:37:02 -08:00
Peter Simons
e5b15f6b52
Merge pull request #11838 from k0ral/git
...
git: 2.6.3 -> 2.6.4
2015-12-20 11:55:57 +01:00
koral
016e88b2d2
git: 2.6.3 -> 2.6.4
2015-12-19 17:37:37 +00:00
Igor Pashev
85375fc5fc
git-crypt needs GnuPG
2015-12-17 11:00:50 +03:00
Luca Bruno
5b0352a6a4
Merge branch 'master' into closure-size
2015-12-11 18:31:00 +01:00
Vladimír Čunát
263fd55d4b
Merge recent staging built on Hydra
...
http://hydra.nixos.org/eval/1231884
Only Darwin jobs seem to be queued now,
but we can't afford to wait for that single build slave.
2015-12-05 11:11:51 +01:00
Luca Bruno
920b1d3591
Merge branch 'master' into closure-size
2015-11-29 16:50:26 +01:00
Tobias Geerinckx-Rice
2798b02ad0
Convert some *Flags from strings to lists
2015-11-26 23:45:31 +01:00
Jude Taylor
69e7f3bb74
switch to zero underscores for sandbox profiles; remove generateFrameworkProfile
2015-11-21 12:10:33 -08:00
Jude Taylor
a63346e33c
use single underscore for sandboxProfile
2015-11-21 11:17:30 -08:00
Vladimír Čunát
333d69a5f0
Merge staging into closure-size
...
The most complex problems were from dealing with switches reverted in
the meantime (gcc5, gmp6, ncurses6).
It's likely that darwin is (still) broken nontrivially.
2015-11-20 14:32:58 +01:00
Jude Taylor
df80090d09
use per-derivation sandbox profiles
2015-11-19 11:31:06 -08:00
William A. Kennington III
6602f49495
Revert "Revert "Merge pull request #9543 from NixOS/staging.post-15.06""
...
This reverts commit 741bf840da
.
This reverts the fallout from reverting the major changes.
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
Vladimír Čunát
c5579c9184
subversion: fixup some referrers after splitting
2015-10-28 10:22:59 +01: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 f61176c539
, reversing
changes made to a27ca029ee
.
Conflicts:
pkgs/development/libraries/ncurses/default.nix
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
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