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
John Wiegley
010132e302
Change several package constraints from linux to unix
...
They all build on Darwin.
2014-04-12 16:01:16 -05:00
Linquize
ab12d10f87
git: Update to 1.9.2
2014-04-10 02:02:59 +02:00
Peter Simons
1682bde4e0
gitAndTools.svn2git: update from 2.2.2 to 2.2.5
2014-04-09 12:41:10 +02:00
Peter Simons
c244d6e1b8
gitAndTools.stgit: update from 0.16 to 0.17.1
2014-04-09 12:41:10 +02:00
Peter Simons
ff49602b17
haskell-git-annex: update to version 5.20140405
2014-04-07 17:06:34 +02:00
Peter Simons
9000db8b1e
haskell-git-annex: update to version 5.20140402
2014-04-06 21:53:16 +02:00
Shea Levy
a68c12d35b
git: Remove phony not-supported wrappers.
...
Fixes #1751
2014-04-05 18:39:53 -04:00
Peter Simons
fa62ab13de
haskell-git-annex: update to version 5.20140320
2014-03-22 09:04:46 +01:00
Linquize
4e385c272c
git: Update to 1.9.1
2014-03-20 15:44:25 +01:00
Eelco Dolstra
36ee5c61c3
Rename git -> git-minimal, git-full -> git
...
Since most people probably want the full Git.
2014-03-11 17:00:17 +01:00
Evgeny Egorochkin
5a92a3a296
cgit: update from 0.10 to 0.10.1
2014-03-08 18:24:16 +02:00
Peter Simons
39175f5117
haskell-git-annex: update to version 5.20140306
2014-03-08 11:27:29 +01:00
Peter Simons
aa8ef327e4
gitAndTools.gitflow: update from 1.6.1 to 1.7.0
2014-03-03 11:10:27 +01:00
Peter Simons
97298922e5
gitAndTools.hub: update from 1.11.1 to 1.12.0
2014-03-03 11:10:27 +01:00
Peter Simons
8cd17a8b03
haskell-git-annex: update to version 5.20140227
2014-02-28 13:01:00 +01:00
Peter Simons
007611cf4b
haskell-git-annex: update to version 5.20140221
2014-02-22 09:19:18 +01:00
Bjørn Forsman
534654e118
git: fix typos in comments
2014-02-15 12:05:44 +01:00
Linquize
68b3fd33a7
git: Update to 1.9.0
2014-02-15 11:19:38 +01:00
Peter Simons
30e1186a0c
haskell-git-annex: update to version 5.20140210
2014-02-10 21:45:43 +01:00
Linquize
5b41db9765
git: update to 1.8.5.4 ( close #1714 )
2014-02-09 10:06:22 +01:00
Ricardo M. Correia
61d37c62c3
hub: Update from 1.10.6 -> 1.11.1
2014-02-02 13:42:07 +00:00
Peter Simons
1124a4ab08
haskell-git-annex: update to version 5.20140129
2014-01-30 08:32:41 +01:00
Peter Simons
63ec2bec8f
haskell-git-annex: update to version 5.20140127
2014-01-28 14:59:46 +01:00
Peter Simons
e2a858379d
haskell-git-annex: update to version 5.20140116
2014-01-26 00:02:33 +01:00
Vladimír Čunát
ac6761c908
Merge master into stdenv-updates
...
Conflicts:
pkgs/applications/version-management/gource/default.nix
pkgs/top-level/all-packages.nix
2014-01-20 19:39:28 +01:00
Bjørn Forsman
1e3289efb4
cgit: fix snapshot feature by using full paths to gzip/bzip2/xz
2014-01-19 22:59:51 +01:00
Bjørn Forsman
3a917b5c2d
cgit: enable lua support
...
Filters can now take advantage of the built-in lua interpreter (much
faster than fork and exec).
2014-01-19 22:46:53 +01:00
Bjørn Forsman
8c25a73def
cgit: update from 0.9.2 to 0.10
2014-01-19 22:12:12 +01:00
Vladimír Čunát
a2c316288c
Merge master into stdenv-updates
...
Conflicts:
pkgs/development/lisp-modules/stumpwm/default.nix (auto-solved)
pkgs/top-level/all-packages.nix (trivial)
2014-01-12 12:29:24 +01:00
Peter Simons
18626481ca
haskell-git-annex: update to version 5.20140108
2014-01-11 12:03:41 +01:00
Peter Simons
6750feec2c
haskell-git-annex: update to version 5.20140107
2014-01-09 00:45:16 +01:00
Peter Simons
c70c8a7158
git-annex: try to fix test suite
2014-01-06 12:09:58 +01:00
Peter Simons
75090c7c86
haskell-git-annex: update to version 5.20131230
2014-01-06 12:09:55 +01:00
Vladimír Čunát
e740b565cf
Merge master into stdenv-updates
...
Conflicts (easy):
pkgs/development/compilers/llvm/default.nix
pkgs/development/compilers/openjdk/default.nix
pkgs/development/libraries/icu/default.nix
pkgs/development/libraries/libssh/default.nix
pkgs/development/libraries/libxslt/default.nix
pkgs/development/tools/parsing/bison/3.x.nix
2013-12-29 10:01:22 +01:00
Peter Simons
a4462d9a03
git-annex: fix build some more
2013-12-23 22:30:43 +01:00
Peter Simons
47a3ece984
git-annex: disable test suite to fix build
...
The "lock" test fails. Upstream knows this, and apparently the failure
is caused by a bug in the test suite -- not in the application code.
2013-12-23 22:30:43 +01:00
Peter Simons
2ac0fedb60
haskell-git-annex: update to version 5.20131221
2013-12-23 22:30:42 +01:00
Nixpkgs Monitor
8fa0f4debf
gitAndTools.git: update from 1.8.5.1 to 1.8.5.2
2013-12-18 18:18:28 +02:00
Peter Simons
45e8de9a7d
Merge branch 'origin/master' into stdenv-updates.
...
Conflicts:
pkgs/tools/misc/less/default.nix
2013-12-16 21:13:24 +01:00
Peter Simons
903e36a74c
git-annex: fix build some more
2013-12-14 22:05:17 +01:00
Peter Simons
e706edb8ee
git-annex: disable test suite in this version to fix the build
2013-12-14 21:34:34 +01:00
Peter Simons
f449007ade
haskell-git-annex: update to version 5.20131213
2013-12-14 15:19:27 +01:00
Peter Simons
2bc29e4e6d
Merge branch 'master' into stdenv-updates.
2013-12-10 22:29:20 +01:00
Peter Simons
c0fc46516d
haskell-github-backup: update to version 1.20131203
2013-12-10 20:41:36 +01:00
Peter Simons
486e7736df
Merge remote-tracking branch 'origin/master' into stdenv-updates.
...
Conflicts:
pkgs/tools/networking/p2p/amule/default.nix
2013-12-10 00:25:54 +01:00
Moritz Ulrich
b4f93af3c9
Update git and related tools to latest releases.
...
Git -> 1.8.5.1
stgit -> 0.16
svn2git -> 2.2.2
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
2013-12-09 00:15:25 +00:00
Peter Simons
c32bf83301
Merge remote-tracking branch 'origin/master' into stdenv-updates.
...
Conflicts:
pkgs/development/interpreters/perl/5.16/default.nix
pkgs/tools/networking/curl/default.nix
pkgs/top-level/all-packages.nix
pkgs/top-level/release-python.nix
pkgs/top-level/release-small.nix
pkgs/top-level/release.nix
2013-12-04 18:33:52 +01:00
Peter Simons
d555031aa8
haskell-git-annex: update to version 5.20131130
2013-12-02 16:25:34 +01:00
Peter Simons
5644003632
haskell-git-annex: update to version 5.20131120
2013-11-26 21:09:18 +01:00
Eelco Dolstra
e597d102d8
git: Update to 1.8.4.3
2013-11-14 15:29:58 +01:00
Peter Simons
75ec0b31f8
haskell-git-annex: update to version 4.20131106
2013-11-11 14:39:57 +01:00
Peter Simons
d72afe2f1b
haskell-github-backup: update to version 1.20131101
2013-11-11 14:39:51 +01:00
Bjørn Forsman
b8e890539e
tig: small expression cleanup
...
* Add a bit of whitespace to make it easier on the eyes
* Shorten the description (and remove package name)
2013-11-09 19:13:35 +01:00
Bjørn Forsman
9b6fb1ebd5
tig: bump 1.1 -> 1.2.1
...
XML_CATALOG_FILES is needed to be able to build the asciidoc
documentation/manpages in this new version.
2013-11-09 19:06:09 +01:00
Peter Simons
576058fe0e
haskell-git-annex: update to version 4.20131101
2013-11-01 17:42:08 +01:00
Mathijs Kwik
609f8dc04b
Merge branch 'master' into stdenv-updates
...
Conflicts:
pkgs/top-level/all-packages.nix
2013-11-01 08:31:54 +01:00
Jaka Hudoklin
11fd5db060
Add gitflow
...
A collection of Git extensions to provide high-level repository operations for Vincent Driessen's branching model
2013-10-30 11:37:57 +01:00
Peter Simons
c05bf33b77
haskell-git-annex: update to version 4.20131024
2013-10-27 19:07:14 +01:00
Peter Simons
6be8ad3392
Merge branch 'origin/master' into stdenv-updates.
...
There was a minor conflict in 'stumpwm'. The package needs texinfo
version 4.x. At least is used to, I'm not sure whether it still does.
2013-10-18 18:57:24 +02:00
Peter Simons
b224e751c0
haskell-github-backup: update to version 1.20131006
2013-10-10 20:56:33 +02:00
Peter Simons
85ecc3f176
haskell-git-annex: update to version 4.20131002
2013-10-03 21:29:51 +02:00
Peter Simons
da17bd1352
git-annex: make sure the man page is installed
2013-10-03 17:16:19 +02:00
Peter Simons
ac5d5297dd
Merge remote-tracking branch 'origin/master' into stdenv-updates.
2013-10-02 22:44:12 +02:00
Peter Simons
eaa38dd941
haskell-git-annex: update to version 4.20130927
2013-10-02 22:33:41 +02:00
Eelco Dolstra
51c1d2d597
git: Update to 1.8.4
2013-09-30 17:19:06 +02:00
Moritz Ulrich
fd67fcb314
Fix chroot-build of fast-export & pinpoint revision to current HEAD.
...
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
2013-09-29 00:25:31 +02:00
Peter Simons
9407832de4
Merge remote-tracking branch 'origin/master' into stdenv-updates.
...
Conflicts:
pkgs/development/libraries/gettext/default.nix
2013-09-23 10:59:44 +02:00
Peter Simons
117176fd26
git-annex: patch to fix build with recent versions of 'dns' library
2013-09-18 18:09:17 +02:00
Peter Simons
24366adf19
Merge remote-tracking branch 'origin/master' into stdenv-updates.
2013-09-14 15:28:40 +02:00
Peter Simons
e541f509ca
git-annex: update to version 4.20130909
2013-09-11 19:59:33 +02:00
Peter Simons
3d2caf1180
Merge remote-tracking branch 'origin/master' into stdenv-updates.
2013-09-08 22:54:35 +02:00
Peter Simons
532cf20cbc
haskell-git-annex: update to version 4.20130827
2013-08-30 10:53:02 +02:00
Peter Simons
98fcc2f746
Merge remote-tracking branch 'origin/master' into stdenv-updates.
2013-08-30 10:45:11 +02:00
aszlig
efa748a166
git-and-tools/hub: Update to version 1.10.6.
...
This now uses fetchurl instead of fetchgit to speed up fetching.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-08-27 04:39:33 +02:00
Peter Simons
9ac8ea937c
Merge branch 'origin/master' into stdenv-updates.
2013-08-26 12:21:23 +02:00
Peter Simons
1392922727
haskell-git-annex: update to version 4.20130815
2013-08-18 18:49:10 +02:00
Peter Simons
0d7118814b
Merge branch 'origin/master' into stdenv.
2013-08-17 10:00:16 +02:00
Ludovic Courtès
2e937c437a
unmaintain several packages
2013-08-16 23:45:01 +02:00
Peter Simons
76244ac2e2
Merge branch 'master' into stdenv-updates
...
Conflicts:
pkgs/development/compilers/ghc/with-packages.nix
2013-08-16 22:51:13 +02:00
Joachim Schiele
12f7c0666a
qgit version bump from 2.3 to 2.5
2013-08-11 14:35:23 +00:00
Peter Simons
60a6e6802f
haskell-git-annex: update to version 4.20130802
2013-08-05 10:56:30 +02:00
Eelco Dolstra
65ad55c425
git-subtree: Remove
...
This package is obsolete because it's now part of git (see
https://github.com/apenwarr/git-subtree/blob/master/THIS-REPO-IS-OBSOLETE ).
2013-08-01 16:37:36 +02:00
Eelco Dolstra
80a82a2858
git: Install git-subtree
2013-08-01 16:36:54 +02:00
Eelco Dolstra
4ec1f8b68a
git: Update to 1.8.3.4
2013-08-01 16:26:02 +02:00
Peter Simons
522acfd2f4
Merge remote-tracking branch 'master' into stdenv-updates.
...
Conflicts:
pkgs/applications/version-management/git-and-tools/git/default.nix
pkgs/top-level/all-packages.nix
2013-07-30 11:29:30 +02:00
Domen Kožar
ae7adcb6e4
git: find global configs in /etc/ instead of /etc
2013-07-29 23:40:54 +02:00
Peter Simons
49335abfd2
haskell-git-annex: update to version 4.20130723
2013-07-26 19:40:47 +02:00
Peter Simons
70835adb28
haskell-git-annex: update to version 4.20130709
2013-07-10 10:29:22 +02:00
Peter Simons
40ad185891
git: update to version 1.8.3.2
2013-07-08 14:04:51 +02:00
Vladimír Čunát
8ba92b8895
Merge master into stdenv-updates
...
Conflicts (simple):
pkgs/development/tools/misc/binutils/default.nix
pkgs/tools/package-management/disnix/default.nix
pkgs/top-level/all-packages.nix
2013-07-08 10:48:05 +02:00
Peter Simons
e533af98e4
git-annex: enable web-related features
2013-07-03 18:48:12 +02:00
Peter Simons
4b75f5a2ae
haskell-git-annex: update to version 4.20130627
2013-07-01 12:11:01 +02:00
Mathijs Kwik
cbf48a8cd1
upgrade to texinfo5 for some packages
2013-07-01 07:52:14 +02:00
Peter Simons
01bc9204e0
git-annex: fix installation of git-annex-shell
2013-06-22 15:41:37 +02:00
Vladimír Čunát
842420c3e1
Merge branch 'master' into stdenv-updates
...
Conflicts (relatively simple):
pkgs/development/interpreters/python/2.7/default.nix
pkgs/development/libraries/dbus/default.nix
pkgs/development/libraries/glib/default.nix
pkgs/development/libraries/glibc/2.17/common.nix
2013-06-20 19:21:25 +02:00
Domen Kozar
1a23f715f4
tig: built for linux
2013-06-18 22:42:12 +02:00
Peter Simons
6b1ebeccf2
Merge branch 'master' into stdenv-updates.
...
There were conflicts in pkgs/development/interpreters/ruby/ruby-19.nix,
which I resolved to the best of my knowledge. I'd appreciate if some of
the ruby gurus could have a look at the outcome of my merge, though.
2013-06-11 12:11:25 +02:00
Evgeny Egorochkin
9c6f7cc9c1
Add package versions to some of the packages or fix existing ones to conform to nixpkgs conventions.
2013-06-07 03:15:45 +03:00
Peter Simons
7b21e19a82
git-annex: generate build instructions with cabal2nix
2013-06-03 22:09:34 +02:00
Evgeny Egorochkin
6609df220b
Merge pull request #584 from bjornfor/cgit
...
cgit: new package
2013-06-02 14:13:05 -07:00
Bjørn Forsman
4ecd9cdb14
cgit: new package
...
cgit is a web frontend for git repositories - it is a CGI program to use
with your favourite webserver. Add the latest version, 0.9.2.
2013-06-02 18:25:54 +02:00
Peter Simons
5718931dd3
Merge remote-tracking branch 'origin/master' into stdenv-updates.
2013-06-01 11:48:21 +02:00
Peter Simons
6fadcc2d69
git-annex: disable building of the web application to fix the build in the presence of yesod 1.2
2013-05-30 12:33:40 +02:00
Peter Simons
e7975c0d33
git-annex: update to version 4.20130521
2013-05-30 12:33:40 +02:00
Peter Simons
728e305205
Merge remote-tracking branch 'origin/master' into stdenv-updates.
2013-05-22 12:30:02 +02:00
Bjørn Forsman
05bb66ce20
Add myself as maintainer for several packages
...
And set missing meta.platforms for the packages I've added earlier.
2013-05-20 20:28:15 +02:00
Eelco Dolstra
b9013993db
git: Update to 1.8.2.3
2013-05-14 11:53:28 +02:00
Gergely Risko
972b1a7d50
Download git-annex from github instead of git.kitenet.net
...
git.kitenet.net doesn't allow snapshot downloads anymore, the url
just returns 403 Forbidden.
2013-05-13 18:19:41 +02:00
Shea Levy
fde3526e7d
Merge branch 'master' into stdenv-updates
...
Conflict in kerberos, which was updated both in master and in
stdenv-updates. Kept the stdenv-updates version, except pulled in the
enableParallelBuilding change from master.
Signed-off-by: Shea Levy <shea@shealevy.com>
Conflicts:
pkgs/development/libraries/kerberos/krb5.nix
2013-05-04 18:28:48 -04:00
Peter Simons
7b868bbff4
git-annex: update to version 4.20130501
2013-05-03 11:38:58 +02:00
Eelco Dolstra
f2aaed44aa
git: Properly use symlinks instead of hard links
...
Git's Makefile has a NO_INSTALL_HARDLINKS flag to produce symlinks
instead of hard links. However, it still produces hard links between
$out/bin and $out/libexec, hence the patch.
Also, update Git to 1.8.2.1.
2013-04-22 15:55:01 +02:00
Eelco Dolstra
6ee8bca8ee
Revert "git: fix build on FreeBSD"
...
This reverts commit ab98d72fad
, which
caused the size of the Git package in the store to increase from 18
MiB to 190 MiB.
2013-04-22 15:26:26 +02:00
Peter Simons
2ffd0b6dac
Merge changes from branch 'origin/master' into stdenv-updates.
2013-04-20 22:19:39 +02:00
Bjørn Forsman
88f1e643e3
git: fix gitweb.cgi runtime dependency on gzip
...
gitweb.cgi uses gzip for creating "snapshots". Without this patch it
doesn't work.
2013-04-19 22:32:51 +02:00
Peter Simons
4914e63a89
Merge changes from branch 'master' into stdenv-updates.
...
Conflicts:
pkgs/development/libraries/icu/default.nix
pkgs/tools/misc/coreutils/default.nix
2013-04-19 11:48:11 +02:00
Peter Simons
0911fe7f3c
haskell-github-backup: update to version 1.20130414
2013-04-14 23:06:17 +02:00
Peter Simons
7a69341994
git-annex: drop obsolete dependency on testpack
2013-04-14 21:19:09 +02:00
Peter Simons
0b4e664a24
git-annex: update to version 4.20130405
2013-04-13 00:13:22 +02:00