Commit Graph

959 Commits

Author SHA1 Message Date
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
Luca Bruno
6fb00303fb gitolite: fix aborted build due to non-deterministic fetchgit 2014-07-13 12:39:23 +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
95b828de42 Merge remote-tracking branch 'origin/master' into staging 2014-07-07 13:16:26 +02:00
Charles Strahan
6c15656a06 vcprompt: new package
This adds the vcprompt utility, a little C program that prints a short string
with barebones information about the current working directory for various
version control systems.
2014-07-02 02:43:47 -04: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
Austin Seipp
2711f5772c gitolite: fix default update hooks
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-06-26 00:24:05 -05:00
Austin Seipp
13162e8cdb Fix gitolite docs
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-06-25 22:55:43 -05:00
Austin Seipp
ec4cd43ca8 gitolite: 3.6.1
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-06-25 22:54:18 -05:00
Charles Strahan
ffc485547f enable bazaar on darwin 2014-06-22 02:57:05 -04: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
Michael Raskin
f4987a0edc Update Monotone and add source-updater script 2014-06-10 09:21:26 +04: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
fd0f9e6fc1 Re-write the Haskell Platform out of haskell-defaults.nix.
1) Packages formerly called haskell-haskell-platform-ghcXYZ-VVVV.X.Y.Z are
    now called haskell-platform-VVVV.X.Y.Z. The latest version can be
    installed by running "nix-env -i haskell-platform".

 2) The attributes haskellPackages_ghcXYZ.haskellPlatform no longer exist.
    Instead, we have attributes like haskellPlatformPackages."2012_4_0_0".
    (The last numeric bit must be quoted when used in a Nix file, but not on
    the command line to nix-env, nix-build, etc.) The latest Platform has a
    top-level alias called simply haskellPlatform.

 3) The haskellPackages_ghcXYZ package sets offer the latest version of every
    library that GHC x.y.z can compile. For example, if 2.7 is the latest
    version of QuickCheck and if GHC 7.0.4 can compile that version, then
    haskellPackages_ghc704.QuickCheck refers to version 2.7.

 4) All intermediate GHC releases were dropped from all-packages.nix to
    simplify our configuration. What remains is a haskellPackages_ghcXYZ set
    for the latest version of every major release branch, i.e. GHC 6.10.4,
    6.12.3, 7.0.4, 7.2.2, 7.4.2, 7.6.3, 7.8.2, and 7.9.x (HEAD snapshot).

 5) The ghcXYZPrefs functions in haskell-defaults.nix now inherit overrides
    from newer to older compilers, i.e. an override configured for GHC 7.0.4
    will automatically apply to GHC 6.12.3 and 6.10.4, too. This change has
    reduced the redundancy in those configuration functions. The downside is
    that overriding an attribute for only one particular GHC version has become
    more difficult. In practice, this case doesn't occur much, though.

 6) The 'cabal' builder has a brand-new argument called 'extension'. That
    function is "self : super : {}" by default and users can override it to
    mess with the attribute set passed to cabal.mkDerivation. An example use
    would be the definition of darcs in all-packages.nix:

    | darcs = haskellPackages.darcs.override {
    |   cabal = haskellPackages.cabal.override {
    |     extension = self : super : {
    |       isLibrary = false;
    |       configureFlags = "-f-library " + super.configureFlags or "";
    |     };
    |   };
    | };

    In this case, extension disables building the library part of the package
    to give us an executable-only version that has no dependencies on GHC or
    any other Haskell packages.

    The 'self' argument refers to the final version of the attribute set and
    'super' refers to the original attribute set.

Note that ...

 - Haskell Platform packages always provide the Haddock binary that came with
   the compiler.

 - Haskell Platform 2009.2.0.2 is broken because of build failures in cgi and
   cabal-install.

 - Haskell Platform 2010.1.0.0 is broken becasue of build failures in cgi.
2014-05-14 14:59:52 +02:00
Michael Raskin
6548fbfb28 Use the working source for GNU ARch 2014-05-03 00:20:08 +04: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
Evgeny Egorochkin
9b4080b7af mercurialFull: update from 2.9.1 to 2.9.2 2014-04-03 10:28:15 +03: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
Eelco Dolstra
48ce981d13 mercurial: Update to 2.9.1 2014-03-05 11:29:32 +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
Vladimír Čunát
fb1028813c subversion: minor bump to fix CVE-2014-0032 2014-02-22 17:04:34 +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
William A. Kennington III
bdb842d5eb Move all db4 packages to the default db5 2014-02-15 12:03:02 +01:00
Linquize
68b3fd33a7 git: Update to 1.9.0 2014-02-15 11:19:38 +01:00
Lluís Batlle i Rossell
8f64e74414 Updating fossil to 1.28. 2014-02-11 12:32:48 +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
Jan Malakhovski
f5de6b8fc8 updates: mr, vcsh and transmission-remote-gtk
- mr: copy some more stuff to output
- add vcsh package
- transmission-remote-gtk: 1.0.1 -> 1.1.1
2014-02-06 23:37:53 +00:00
Georges Dubus
b9fe0b8fb1 bazaar: updated to 2.6.0 and fixed ssl bug
Fixes #1216
2014-02-05 11:36:48 +01:00
Nixpkgs Monitor
d2451cbce6 mercurialFull: update from 2.8.2 to 2.9 2014-02-04 10:35:20 +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
Eelco Dolstra
2e70c14061 rcs: Update to 5.9.2 2014-01-27 17:58:26 +01:00
Peter Simons
e2a858379d haskell-git-annex: update to version 5.20140116 2014-01-26 00:02:33 +01:00
Peter Simons
ff8cffed86 subversion: fix evaluation errors on FreeBSD 2014-01-22 12:44:49 +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
Bjørn Forsman
2b74a47006 gource: fix build
gource currently fails in the configure phase:

  configure: error: Could not link against -lGLU !

This is a very misleading error, it seems to happen because configure
doesn't find boost libraries and ends up with uninitialized variable(s).
That in turn cause it to fail later with this unrelated error.

Fix by using boost libraries, not only the headers. gource also grew a
dependency on GLM, so add that to buildInputs.
2014-01-18 19:05:33 +01:00
Vladimír Čunát
0a58b512cb Merge master into stdenv-updates
Conflicts (simple):
	pkgs/development/compilers/gcc/4.8/default.nix
	pkgs/development/compilers/llvm/default.nix
	pkgs/development/libraries/gmp/5.1.1.nix
	pkgs/development/libraries/gmp/5.1.3.nix
	pkgs/development/libraries/gmp/5.1.x.nix
	pkgs/top-level/all-packages.nix
2014-01-18 14:46:20 +01:00
Peter Simons
3988e0ca51 gource: mark as broken
The configure process finds libGLU just fine, but then aborts saying:

  configure: error: Could not link against -lGLU !
2014-01-16 10:25:04 +01:00
Peter Simons
222b91fedf gource: update to version 0.40 2014-01-13 17:22:07 +01:00
Nixpkgs Monitor
dc52e6e7f8 mercurial: update from 2.8.1 to 2.8.2 2014-01-13 16:15:57 +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
Rickard Nilsson
16ce061e11 tailor: Add extra source URL 2014-01-08 15:29:38 +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
3dd298060a gource: fix build with newer gcc versions (-fpermissive) 2014-01-05 11:22:04 +01:00
Vladimír Čunát
9443129b08 Merge master into stdenv-updates
Conflicts:
	pkgs/development/libraries/glibc/2.18/common.nix (take stdenv-updates)
	pkgs/misc/emulators/zsnes/default.nix (more complex, build tested)
	pkgs/top-level/all-packages.nix (auto-solved)
2014-01-04 18:34:53 +01:00
William A. Kennington III
184dd198fb subversion: Tweaks and Fixes
Remove ssl and compression options which are no longer valid when using
serf in place of neon. Also, make sure serf is an optional dependency.
2013-12-31 07:59:37 -06:00
Michael Raskin
a3843455c5 Re-add HTTP/HTTPS support back to Subversion by adding serf. Tested. 2013-12-30 23:33:22 +04:00
William A. Kennington III
0270be1eb6 subversion: Update from 1.7.14 -> 1.8.5 2013-12-30 00:08:59 +00: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
Florian Friesdorf
7a988c62af git-repo-1.20, update and pin python 2013-12-26 01:01:01 +01:00
Florian Friesdorf
46f627e8f7 git-repo-1.19 2013-12-26 00:45:21 +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
Mathijs Kwik
e966ebd5e1 kdesvn: upgrade to 1.6.0 2013-12-23 10:25:16 +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
Nixpkgs Monitor
296e2d5207 bazaarTools: update from 2.2.0 to 2.5 2013-12-18 18:18:18 +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
Nixpkgs Monitor
ec83369639 subversionClient: update from 1.7.13 to 1.7.14, potentially fixes CVE-2013-4558 2013-12-13 00:10:35 +02: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
Shea Levy
5588f25a15 hg 2.8.1
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-12-06 08:34:44 -05: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
Peter Simons
46581c6918 subversion: install bash completion 2013-11-09 19:19:22 +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
Eelco Dolstra
a2cbc77e4f Only show/build a package on the platforms listed in meta.platforms
The function ‘mkDerivation’ now checks whether the current platform
type is included in a package's meta.platform field.  If not, it
throws an exception:

  $ nix-build -A linux --argstr system x86_64-darwin
  error: user-thrown exception: the package ‘linux-3.10.15’ is not supported on ‘x86_64-darwin’

These packages also no longer show up in ‘nix-env -qa’ output.  This
means, for instance, that the number of packages shown on
x86_64-freebsd has dropped from 9268 to 4764.

Since meta.platforms was also used to prevent Hydra from building some
packages, there now is a new attribute meta.hydraPlatforms listing the
platforms on which Hydra should build the package (which defaults to
meta.platforms).
2013-11-05 00:06:10 +01:00
Eelco Dolstra
a0e21fd1ca Mark more packages as broken 2013-11-04 21:11:00 +01:00
Eelco Dolstra
01087750ba Don't build some packages on some platforms 2013-11-04 21:11:00 +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
91f2c362de Merge remote-tracking branch 'origin/master' into stdenv-updates.
Conflicts:
	pkgs/top-level/all-packages.nix
2013-10-26 18:28:05 +02:00
Brian Smith
9aa4c9fd84 Update fossil to 1.27, and enable the JSON API. 2013-10-21 18:16:27 +00: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
Bjørn Forsman
083d0890f5 More description fixes
* Remove package name
* Start with upper case letter
* Remove trailing period

Also reword some descriptions and move some long descriptions to
longDescription.

I'm not touching generated packages.
2013-10-06 12:01:38 +02:00
Bjørn Forsman
28ac782583 Some description fixes
There are many more packages to fix, this is just a start.

Rules:
 * Don't repeat the package name (not always that easy...)
 * Start with capital letter
 * Don't end with full stop
 * Don't start with "The ..." or "A ..."

I've also added descriptions to some packages and rewritten others.
2013-10-05 19:36:23 +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
Eelco Dolstra
1e8294572f subversion: Update to 1.7.13
CVE-2013-4246
2013-09-25 18:11:00 +02:00