Commit graph

695 commits

Author SHA1 Message Date
Tuomas Tynkkynen 5f4a8de754 treewide: Mass replace 'bzip2}/bin' to refer the 'bin' output 2016-02-01 20:45:57 +02:00
Robin Gloster f6d3b7a2ae switch hardening flags 2016-01-30 16:36:57 +00:00
Franz Pletz 954e9903ad Use a hardened stdenv by default 2016-01-30 16:36:57 +00: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
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
Arseniy Seroka 269568b7ea Merge pull request #5565 from kirelagin/hub
gitAndTools.hub: Update to 2.x
2015-01-10 10:42:19 +03:00
Peter Simons d8c600c129 haskell-git-annex: update to version 5.20141231 2015-01-05 18:39:18 +01:00
Kirill Elagin 4b84049bd3 gitAndTools.hub: Update to 2.x 2015-01-04 02:28:38 +03:00
John Wiegley 58ae62b9fa hub: add git as a dependency of the expression 2015-01-03 07:53:01 -05:00
Arseniy Seroka c087c456af Merge pull request #5510 from k0ral/fast-export
fast-export: update to last revision from upstream
2014-12-31 01:19:42 +03:00
koral 10b3d1ad7b fast-export: update to last revision from upstream 2014-12-30 14:54:12 +01:00
Tobias Geerinckx-Rice c64257b8e5 Fix user-facing typos (mainly in descriptions) 2014-12-30 03:31:03 +01:00
Charles Strahan 145733c479 Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-ruby
Conflicts:
	pkgs/applications/version-management/redmine/default.nix
	pkgs/development/interpreters/ruby/gem.nix
	pkgs/development/interpreters/ruby/generated.nix
	pkgs/development/interpreters/ruby/patches.nix
	pkgs/development/tools/vagrant/default.nix
	pkgs/servers/consul/default.nix
2014-12-28 14:29:52 -05:00
Peter Simons 8298636254 haskell-git-annex: update to version 5.20141219 2014-12-25 11:05:49 +01:00
Tom 7800270ae4 [SECURITY] Update git to 2.1.4
This fixes CVE-2014-9390

http://article.gmane.org/gmane.linux.kernel/1853266
2014-12-19 14:05:04 +00:00
Peter Simons 1a0505143c haskell-github-backup: update to version 1.20141204 2014-12-13 12:06:02 +01:00
Maciek Starzyk dcad10c8e6 haskell-git-annex: Add maintainer, was removed by mistake. 2014-12-04 21:49:15 +01:00
Maciek Starzyk 81cb2c144c haskell-git-annex: update to version 5.20141203 2014-12-04 14:45:54 +01:00
wmertens 45c1b9147f Merge pull request #5130 from wmertens/git-ssl-env
Let git use $SSL_CERT_FILE
2014-11-27 13:24:08 +01:00
Spencer Whitt fdbd5e1323 New package: git-extras 2014-11-25 20:24:43 -05:00
Wout Mertens 272f2c365c git: Support $SSL_CERT_FILE 2014-11-26 00:29:37 +01:00
Charles Strahan e51afe5e7c fix hub 2014-11-18 04:07:30 +00:00
Peter Simons d1cec0c92d haskell-github-backup: update to version 1.20141110 2014-11-13 14:51:36 +01:00
Vladimir Kirillov 1b9f756e4e git: do not do install-doc when !withManual 2014-11-12 17:36:17 +02:00
Charles Strahan cf8f4963a7 rename rubyLibs to rubyPackages 2014-11-09 22:16:58 +00:00
Peter Simons 820f6f2e4c haskell-git-annex: update to version 5.20141125 2014-11-09 14:59:30 +01:00
Mateusz Kowalczyk 007f80c1d0 Turn more licenses into lib.licenses style
Should eval cleanly, as far as -A tarball tells me.

Relevant: issue #2999, issue #739
2014-11-06 00:48:16 +00:00
Peter Simons 0a2e12e046 haskell-github-backup: update to version 1.20141031 2014-11-01 21:08:04 +01:00
Linquize 23048155b7 git: Update to 2.1.3 2014-10-30 17:22:47 +01:00
Peter Simons 8b12277065 haskell-git-annex: update to version 5.20141024 2014-10-26 23:44:48 +01:00
Peter Simons cc48a930ae haskell-git-annex: update to version 5.20141013 2014-10-18 17:48:48 +02:00
John Wiegley ba22560768 git-annex: temporary patch to build the current version 2014-10-16 17:23:01 -05:00
Peter Simons 38751005a1 git-annex: broken by update to 'persistent' and 'yesod' 2014-10-14 17:39:35 +02:00
Peter Simons 066db30729 haskell-git-annex: update to version 5.20140927 2014-10-06 11:21:39 +02:00
Linquize 16494e0289 git: Update to 2.1.2 2014-10-03 23:13:38 +08:00
Ellis Whitehead 8ea7e926cc Add myself to the maintainers list 2014-09-21 02:13:28 +01:00
Ellis Whitehead b4437f36c3 New package: git-remote-gcrypt.
A git remote for working with encrypted git repositories.

Closes #4100
2014-09-21 02:13:28 +01:00
Peter Simons 82a46ebb5c haskell-git-annex: update to version 5.20140919 2014-09-20 18:00:04 +02:00
Peter Simons 89438059ab haskell-git-annex: update to version 5.20140915 2014-09-17 21:16:10 +02:00
Peter Simons 70caf9d865 git-annex: broken by optparse-applicative 0.10.x
Bug has been reported upstream.
2014-09-14 00:06:45 +02:00
Dmitry Malikov 7d0a7ed62c gitAndTools.tig: update from 2.0.2 to 2.0.3 2014-09-13 22:25:17 +02:00
Domen Kožar 78e5e556cc Revert "fixes #1923"
This reverts commit 1849840aa3.

Breaks git-annex
2014-09-09 12:11:53 +02:00
Domen Kožar 1849840aa3 fixes #1923 2014-09-08 21:19:14 +02:00
Moritz Ulrich 32a3b65571 cgit: update from 0.10.1 to 0.10.2 2014-09-04 19:31:32 +02:00
Moritz Ulrich 332395b262 Add myself as a maintainer to a bunch of packages. 2014-09-04 17:05:21 +02:00
Moritz Ulrich 0863bcb683 gitAndTools.hub: update from 1.12.0 to 1.12.2, potentially fixes CVE-2014-0177 2014-09-04 17:05:20 +02:00
Peter Simons e5878fa70b git-annex: re-build expression with latest cabal2nix 2014-09-04 16:20:57 +02:00
Moritz Ulrich 4678ddc1c0 gitAndTools.svn2git: update from 2.2.5 to 2.3.2 2014-09-04 16:06:41 +02:00
Peter Simons ccd4a52f68 haskell-git-annex: update to version 5.20140831 2014-09-02 11:48:19 +02:00
Bjørn Forsman c9baba9212 Fix many package descriptions
(My OCD kicked in today...)

Remove repeated package names, capitalize first word, remove trailing
periods and move overlong descriptions to longDescription.

I also simplified some descriptions as well, when they were particularly
long or technical, often based on Arch Linux' package descriptions.

I've tried to stay away from generated expressions (and I think I
succeeded).

Some specifics worth mentioning:
 * cron, has "Vixie Cron" in its description. The "Vixie" part is not
   mentioned anywhere else. I kept it in a parenthesis at the end of the
   description.

 * ctags description started with "Exuberant Ctags ...", and the
   "exuberant" part is not mentioned elsewhere. Kept it in a parenthesis
   at the end of description.

 * nix has the description "The Nix Deployment System". Since that
   doesn't really say much what it is/does (especially after removing
   the package name!), I changed that to "Powerful package manager that
   makes package management reliable and reproducible" (borrowed from
   nixos.org).

 * Tons of "GNU Foo, Foo is a [the important bits]" descriptions
   is changed to just [the important bits]. If the package name doesn't
   contain GNU I don't think it's needed to say it in the description
   either.
2014-08-24 22:31:37 +02:00
Peter Simons 3fad02dab8 haskell-git-annex: update to version 5.20140817 2014-08-19 23:47:59 +02:00
Rüdiger Sonderfeld d809e775e8 git: Add git-prompt.sh to /etc/bash_completion.d.
This will make the git-prompt.sh features available to bash users when
completions are enabled.  It is done in this way in Debian/Ubuntu as well.
2014-08-19 16:34:51 +02:00
Linquize 1916bc0412 git: Update to 2.1.0 2014-08-17 06:18:38 +02:00
Peter Simons e823c123a8 Don't build broken Haskell packages on Hydra.
These packages don't compile:

 - cabal-delete
 - cabal-file-th
 - categories
 - cmdtheline
 - codec-image-devil
 - concurrent-extra
 - cryptol 1.8.x
 - data-lens
 - diagrams-postscript
 - djinn
 - download
 - dstring
 - enummapset
 - git-date
 - github-backup
 - gtkglext
 - happyy-meta
 - haskeline-class
 - pakcs

These packages depend on some of the packages listed before:

 - Chart-diagrams
 - data-lens-template
 - hp2any-manager
 - purescript
 - repr

These packages fail with GHC 7.8.3 but still compile with older compilers:

 - happy: 1.18.4, 1.18.5, 1.18.6
2014-08-12 12:37:44 +02:00
Peter Simons 2d326e5032 Merge remote-tracking branch 'origin/master' into staging.
Conflicts:
	pkgs/desktops/e18/enlightenment.nix
2014-08-04 16:51:47 +02:00
Mateusz Kowalczyk 7a45996233 Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
Eelco Dolstra f64d84698e Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/applications/audio/espeak/edit.nix
	pkgs/applications/audio/lmms/default.nix
	pkgs/desktops/e18/enlightenment.nix
	pkgs/games/exult/default.nix
	pkgs/os-specific/linux/alsa-plugins/default.nix
2014-07-28 11:30:49 +02:00
Peter Simons 62bb741348 haskell-github-backup: update to version 1.20140721 2014-07-22 14:20:57 +02:00
Eelco Dolstra 7f410ef923 Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/misc/vim-plugins/default.nix
2014-07-22 11:00:00 +02:00
Linquize 4201db70ed git: Update to 2.0.2 2014-07-20 23:49:45 +08:00
John Wiegley 73e0c50b30 haskell-git-annex: fix for darwin
@peti I don't see in the cabal2nix repository how to change the
buildDepends for git-annex the way that I need to.  Can you offer some
guidance there?
2014-07-18 18:37:54 -05:00
Peter Simons 92faa6a009 haskell-git-annex: update to version 5.20140717 2014-07-18 17:30:47 +02:00
John Wiegley d24df6e334 haskell-git-annex: corrections for darwin 2014-07-16 01:27:29 -05:00
Eelco Dolstra b9d19af3e6 Merge remote-tracking branch 'origin/master' into staging 2014-07-15 12:14:35 +02:00
Peter Simons 5bfb58a8a2 Re-generate Haskell packages with cabal2nix. 2014-07-14 17:33:52 +02:00
Peter Simons 56c569a9cd haskell-github-backup: update to version 1.20140707 2014-07-14 17:33:51 +02:00
Peter Simons af88d71b55 haskell-git-annex: update to version 5.20140709 2014-07-14 17:33:50 +02:00
Eelco Dolstra ff97b7dbe6 Merge remote-tracking branch 'origin/master' into staging 2014-07-14 17:04:55 +02:00
Peter Simons d2e731e111 Add "please don't edit" comment at the top of every auto-generated Haskell file. 2014-07-14 13:21:41 +02:00
John Wiegley a25c35b89b git-annex: Allow building on darwin again 2014-07-09 17:52:18 -05:00
Peter Simons f7f1e3f842 haskell-git-annex: update to version 5.20140707 2014-07-08 15:58:22 +02:00
Eelco Dolstra 06fc1ec34d Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/servers/serfdom/default.nix
2014-07-01 11:25:41 +02:00
Eelco Dolstra 40f7b0f9df Another attempt to eradicate ensureDir
See c556a6ea46.
2014-06-30 14:56:10 +02:00
Rok Garbas 71812277d3 git-remote-add: new package added 2014-06-28 14:15:31 +01:00
Georges Dubus bf1f2c6b1f git: Updated to 2.0.1 (close #3096) 2014-06-26 16:54:48 +02:00
Bjørn Forsman ba048baaff tig: enable command line history/completion support
Since version 2.0, tig can use readline for history/completion support,
so add readline as a build input.

Increases closure size from 53 MiB to 54 MiB.
2014-06-21 19:57:36 +02:00
John Wiegley 476700d56f git-annex: Build on Darwin, let Cabal determine proper flags 2014-06-21 09:20:46 -07:00
Peter Simons 92082524a9 Revert "add OPENSSL_X509_CERT_FILE to the git command environment"
This reverts commit 88b5578a57 because of the
following issues:

 1) If $OPENSSL_X509_CERT_FILE is set in the current shell environment, then
    its value will overwrite any settings the user may have configured in
    http.sslCAInfo via git-config(1). If you are unaware of the wrapper, then
    this behavior is totally unexpected as $OPENSSL_X509_CERT_FILE is not
    supposed to have an effect on Git.

 2) The patch makes it impossible for Git users to use the $GIT_SSL_CAINFO
    environment variable as documented in git-config(1), because anything set
    there will be overwritten with the value of $OPENSSL_X509_CERT_FILE (which
    might be empty).

 3) The patch breaks other builds of packages that depend on Git, i.e.
    <http://hydra.nixos.org/build/11995872/nixlog/1/raw>.
2014-06-21 13:15:50 +02:00
Paul Woolcock 88b5578a57 add OPENSSL_X509_CERT_FILE to the git command environment 2014-06-16 21:55:43 -04:00
Peter Simons c5b7e2a2f2 haskell-git-annex: update to version 5.20140613 2014-06-16 16:12:36 +02:00
John Wiegley d0365a6cde git-annex: build on Darwin, and rely on cabal to set flags
Fixes #2519
2014-06-10 02:28:23 +00:00
Peter Simons 1a1c1ba734 haskell-git-annex: update to version 5.20140606 2014-06-09 10:26:59 +02:00
Peter Simons 8c14496987 haskell-git-annex: update to version 5.20140529 2014-06-09 10:26:53 +02:00
Rok Garbas db8ba58402 tig: update to 2.0.2 2014-06-01 14:39:55 +01:00
Eelco Dolstra 61befa0451 git: Update to 1.9.4 2014-05-31 09:47:21 +02:00
Peter Simons 8de29ff4e1 haskell-git-annex: update to version 5.20140517 2014-05-21 23:04:30 +02:00
Bjørn Forsman b8ca39e2f2 cgit: improve a comment 2014-05-17 11:01:57 +02:00
Linquize 10fa1bcf66 git: Update to 1.9.3 2014-05-15 16:15:09 +02:00
Peter Simons 551cae1aa0 haskell-git-annex: update to version 5.20140421 2014-04-29 01:35:45 +02:00
Eelco Dolstra d304b277bd Silence some Hydra evaluation warnings 2014-04-24 15:40:55 +02:00
Peter Simons c2516c30e3 haskell-git-annex: update to version 5.20140412 2014-04-23 11:17:07 +02:00
Eelco Dolstra a1af25033a git send-email: Respect $OPENSSL_X509_CERT_FILE 2014-04-16 18:43:39 +02:00
John Wiegley cfe42425c3 On Darwin, set NO_APPLE_COMMON_CRYPTO=1 for git builds 2014-04-14 14:53:15 -05:00
Austin Seipp 2661400d2a cgit: bump git version to 1.9.2
This also updates the download URL to use kernel.org

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-04-13 00:47:16 -05:00