Commit graph

695 commits

Author SHA1 Message Date
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
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
Peter Simons 62e37492b9 Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-04-04 00:51:30 +02:00
Bjørn Forsman e21c53c211 tig: enable bash completion
Copy the bash completion script that comes with tig to
$out/etc/bash_completion.d/.

Note: to enable bash completion in NixOS, set
environment.enableBashCompletion = true;
2013-04-01 18:37:52 +02:00
Peter Simons 0823aea0a6 Merge branch 'master' into stdenv-updates.
Conflicts:
	pkgs/development/libraries/libxslt/default.nix

Commit 1764ea2b0a introduced changes to libxslt
in an awkward way to avoid re-builds on Linux. This patch has been simplified
during this merge.
2013-03-25 13:43:45 +01:00
Peter Simons ab98d72fad git: fix build on FreeBSD
Our hard-linking code depended on md5sum, which FreeBSD doesn't have in its
system environment. To avoid that impure dependency, the hard-linking is now
done with the 'hardlink' utility from Nixpkgs.
2013-03-25 12:47:39 +01:00
Peter Simons 73c610e1d6 git: update to version 1.8.2 2013-03-22 02:11:38 +01:00
Peter Simons 22fb1ad99e Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-03-21 09:23:54 +01:00
Peter Simons d28d3f37a8 topgit: fix build on FreeBSD
The BSD unices have a version of install(1) that doesn't support the -D flag. Grr.
2013-03-20 11:43:43 +01:00
Peter Simons 51e64392ea git-annex: update to version 4.20130314 2013-03-20 10:15:06 +01:00
Peter Simons a1a7448e5b topgit: update to version 0.9 2013-03-20 09:50:06 +01:00
Danny Wilson d007a78ccb Merge remote-tracking branch 'origin/stdenv-updates' into illumos
Conflicts:
	pkgs/development/libraries/gmp/5.1.1.nix
	pkgs/development/libraries/mpc/default.nix
	pkgs/development/libraries/mpfr/default.nix
	pkgs/development/libraries/ppl/default.nix
	pkgs/tools/misc/coreutils/default.nix
2013-03-17 13:22:24 +01:00
Sander van der Burg 23c78e41db git: Adding -lgcc_s on darwin causes the build to fail, so we disable it for that platform 2013-03-14 14:57:40 +01:00
Peter Simons 4c9ebb62d4 git: link binaries with libgcc_s.so to ensure pthread_cancel() works 2013-03-09 23:57:57 +01:00
Peter Simons 4f697db7dd haskell-github-backup: update to version 1.20120314 2013-03-02 17:07:43 +01:00
Danny Wilson ecba7e947e Update Git to 1.8.1.3 and fix build on Illumos. 2013-02-28 20:04:06 +01:00
Peter Simons 329b33c59c git-annex: clean up build expression 2013-02-28 13:04:15 +01:00
Peter Simons e23be1b2ef git-annex: update to version 4.20130227 2013-02-28 11:31:44 +01:00
Peter Simons 80dc8df25d haskell-github-backup: update to version 1.20120314 2013-02-27 12:00:52 +01:00
Peter Simons 8f1c029e33 haskell-github-backup: add version 1.20120627 2013-02-25 15:25:54 +01:00
Peter Simons 8f1756e2d4 git: update to version 1.8.1.3 2013-02-25 02:12:42 +01:00
Peter Simons eb5ebb6063 network-protocol-xmpp: fix spelling of the attribute name 2013-02-22 16:14:27 +01:00
Peter Simons b076ab94d6 git-annex: update to version 3.20130216 2013-02-18 11:20:46 +01:00
Lluís Batlle i Rossell 8a9ba8c382 git: adding an option not to build the manual
asciidoc+xsltproc take hours to run
2013-01-28 21:24:52 +01:00
Peter Simons 490085a811 git-annex: update to version 3.20130107 2013-01-09 16:54:31 +01:00
Peter Simons 70b6b15215 git-annex: update to version 3.20130102 2013-01-04 19:24:09 +01:00
Peter Simons cb329d1cd2 git: update to version 1.8.1 2013-01-04 19:24:04 +01:00
Peter Simons 918b26a59e git-annex: update to version 3.20121211 2012-12-15 11:44:13 +01:00
aszlig f1c80cf20c
git-and-tools/hub: New package, version 1.10.3.
This is a small wrapper of Git, which integrates some GitHub specific features,
especially stuff like merging or sending pull requests or attaching commits to
an issue.

I'm not quite familiar with the Nix integration of Ruby, so let's hope that I'm
not doing something horrible here.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-12-12 12:36:18 +01:00
Peter Simons 3261d1d4aa git-annex: update to version 3.20121127 2012-12-03 16:12:04 +01:00
Eelco Dolstra 5553546c21 Remove a bunch of unreferenced files
Plus a small number of obsolete packages (like old versions of qemu).
2012-11-29 13:43:37 +01:00
Peter Simons 8effc542b4 git-annex: update to 3.20121126 2012-11-27 13:46:27 +01:00
Peter Simons 62f8d24e56 git: update to 1.8.0.1 2012-11-27 13:46:12 +01:00
Peter Simons 03abf1abbc git-annex: switch build to GHC 7.4.2 2012-11-21 17:40:56 +01:00
Peter Simons 9ada368ef8 git-annex: update to version 3.20121112-161-gb27d9eb to fix build errors with current version of yesod 2012-11-21 12:30:54 +01:00
Rok Garbas d999c3f6ec tig: typo 2012-11-17 02:20:07 +01:00
Rok Garbas a64b34a43e tig: update to 1.1 2012-11-17 02:13:25 +01:00
Peter Simons 84c6f6f88e git-annex: update to version 3.20121112 2012-11-15 12:50:17 +01:00
Peter Simons 4ab06e5c24 Fix git-annex build.
git-annex depends on 'testpack', which doesn't compile with Haskell
Platform 2012.4.0.0. The testpack library appears to be unmaintained, so
there is probably no quick solution for this issue. For the time being,
we compile git-annex with GHC 7.4.1.
2012-11-06 18:34:54 +01:00
Paolo Capriotti 6ac427d391 Update git-annex to 3.20121017 2012-11-05 13:59:08 +00:00
David Guibert b963624867 update git to 1.8.0 2012-10-24 16:33:42 +02:00
Peter Simons 58f3e47166 git: update to version 1.7.12.4 2012-10-19 10:08:07 +02:00
Peter Simons c90a15a604 git-annex: update to version 3.20121010 2012-10-15 20:17:33 +02:00
Eelco Dolstra 7dd3236c81 git: Update to 1.7.12.2 2012-10-02 12:34:38 -04:00
Peter Simons 625e2e45f7 git: update to version 1.7.12.1 2012-09-24 13:28:31 +02:00
aszlig 9ff9d85ef6
darcs-to-git: Remove propagatedBuildInputs.
I missed this while checking the commit diffs before my last push. And it really
doesn't make sense to propagate ruby all the way up to whatever in the universe
may depend on this package.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-09-17 06:35:49 +02:00
aszlig 98b7228c06
darcs-to-git: New package from upstream Git.
This consists of just one single ruby script, which runs shell commands assuming
that the current PATH has all dependencies set up correctly. Unfortunately, this
somewhat breaks functional purity as the command won't work correctly in
environments that do not contain git, darcs or diffutils.

During the patchPhase we replace all those dependencies directly in the ruby
source code, rather than creating a wrapper. Afterwards we run a checkPhase
which not only checks whether we caught all the dependencies (PATH=) but also
checks if the conversion has been done correctly.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-09-17 06:08:04 +02:00
Peter Simons 14da2bf31b git: update to version 1.7.12 2012-09-06 18:13:45 +02:00
Peter Simons 33bf9644cf git-annex: update to version 3.20120825 2012-09-06 18:13:44 +02:00
Dmitry Malikov b125ef36b6 Bump gitAndTools/tig from 0.16 to 1.0 2012-08-08 00:51:25 +02:00
Eelco Dolstra f901b6d38d git: Update to 1.7.11.4 2012-08-06 15:27:28 -04:00
David Guibert 3b0d9374a4 git-annex: update to 3.20120629 2012-06-29 21:09:52 +02:00
David Guibert a97e27fc82 git-annex: update to 3.20120624 2012-06-29 21:09:52 +02:00
Eelco Dolstra 94812c9dd3 git: Fix the "notSupported" scripts for "git send-email" and "git gui" 2012-06-21 15:25:02 -04:00
Eelco Dolstra 9365981409 git: Updated to 1.7.11 2012-06-21 15:23:29 -04:00
Peter Simons a3224ededc git-and-tools: fixed build in the presence of QuickCheck 2.5
svn path=/nixpkgs/trunk/; revision=34553
2012-06-18 18:16:23 +00:00
Peter Simons 2a60c221d1 git-annex: updated to version 3.20120614
svn path=/nixpkgs/trunk/; revision=34518
2012-06-15 15:33:47 +00:00
Peter Simons 330ea0887f git-annex: added openssh to build inputs so that the configure phase enables support for SSH connection caching
svn path=/nixpkgs/trunk/; revision=34386
2012-06-08 14:02:28 +00:00
Peter Simons 87d25896c1 git-annex: updated to version 3.20120605
svn path=/nixpkgs/trunk/; revision=34385
2012-06-08 14:02:21 +00:00
Eelco Dolstra 104bd01e1d * Git 1.7.10.4.
svn path=/nixpkgs/trunk/; revision=34349
2012-06-04 15:54:57 +00:00
Peter Simons ac64ba04bd git-annex: updated to version 3.20120522
svn path=/nixpkgs/trunk/; revision=34213
2012-05-22 19:46:37 +00:00
Eelco Dolstra 5e7f049fc9 * svn2git-kde 1.0.5.
svn path=/nixpkgs/trunk/; revision=34169
2012-05-18 15:01:54 +00:00
Eelco Dolstra 7c1612d6f2 * svn2git -> svn2git-kde to distinguish it from the other svn2git.
svn path=/nixpkgs/trunk/; revision=34071
2012-05-12 19:45:55 +00:00
Peter Simons e0bd67afd7 git-annex: updated to version 3.20120430
svn path=/nixpkgs/trunk/; revision=33970
2012-05-02 09:25:28 +00:00
Peter Simons 4fc0e49bdd git-annex: updated to version 3.20120418
svn path=/nixpkgs/trunk/; revision=33856
2012-04-20 11:35:20 +00:00
Nicolas Pierron 7a4cf21350 Add git-bz nix expression.
svn path=/nixpkgs/trunk/; revision=33801
2012-04-15 23:48:16 +00:00
Nicolas Pierron 7b7dd238fc Add dulwich (git filesystem in python).
Add bugz (command line tool for bugzilla)
Add gitBz (bugzilla in git)

svn path=/nixpkgs/trunk/; revision=33800
2012-04-15 23:48:11 +00:00
Peter Simons 4292793d40 git-annex: updated to version 3.20120406
svn path=/nixpkgs/trunk/; revision=33669
2012-04-08 10:48:14 +00:00
Peter Simons 799722afde git-annex: updated to version 3.20120405
svn path=/nixpkgs/trunk/; revision=33638
2012-04-05 23:11:00 +00:00
Rob Vermaas a1d87e58c1 re-add overwritten svn2git (used/developed by kde people)
svn path=/nixpkgs/trunk/; revision=33567
2012-04-04 15:30:29 +00:00
Eelco Dolstra ebae9a9fd7 * Git 1.7.9.5.
svn path=/nixpkgs/trunk/; revision=33553
2012-04-03 11:07:50 +00:00
Eelco Dolstra 512357f875 * Remove a wildly outdated Git version that shouldn't have been in
Nixpkgs in the first place.

svn path=/nixpkgs/trunk/; revision=33272
2012-03-19 18:24:53 +00:00
Peter Simons 46f9f71439 git: updated to version 1.7.9.4
svn path=/nixpkgs/trunk/; revision=33145
2012-03-16 09:47:34 +00:00
Peter Simons 6ff954a5e8 git-annex: updated to version 3.20120315
svn path=/nixpkgs/trunk/; revision=33116
2012-03-15 18:07:49 +00:00
Peter Simons f5219b23a4 git-annex: updated to version 3.20120309
The test suite failure introduced recently has been fixed.

svn path=/nixpkgs/trunk/; revision=33014
2012-03-12 14:06:11 +00:00
Eelco Dolstra 3c56e571af * Final sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32820
2012-03-06 11:34:11 +00:00
Peter Simons 88d14c0e29 git-annex: updated to version 3.20120230
Note that the latest version of git-annex must be compiled with GHC 7.4.1 or
later, because it takes advantage of some freaky file name encoding guessing
features that are absent in older versions of the base library.

svn path=/nixpkgs/trunk/; revision=32819
2012-03-06 11:24:20 +00:00
Shea Levy ea195b2507 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32564
2012-02-25 19:57:34 +00:00
Peter Simons 0660134750 git: updated to version 1.7.9.2
svn path=/nixpkgs/trunk/; revision=32528
2012-02-23 22:31:09 +00:00
Eelco Dolstra e64443baf1 * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32468
2012-02-21 23:29:21 +00:00
Eelco Dolstra 45fed14272 * Revert r32435. We'll be doing a stdenv merge in a few days, so
let's put it in there rather than having the Nth near-complete
  rebuild of the trunk in a few days.

svn path=/nixpkgs/trunk/; revision=32436
2012-02-20 18:59:43 +00:00
Yury G. Kudryashov 5144a19987 svn merge ^/nixpkgs/trunk
There were a few merge conflicts due to ensureDir->mkdir -p migration

svn path=/nixpkgs/branches/stdenv-updates/; revision=32174
2012-02-10 10:24:30 +00:00
Eelco Dolstra e4ee3e2c9b * svn2git updated to 2.2.0.
svn path=/nixpkgs/trunk/; revision=32108
2012-02-07 12:22:48 +00:00
Yury G. Kudryashov 5b132f6e96 svn merge ^/nixpkgs/trunk
Conflicts: cups, all-packages.nix (gcc45_debug)

svn path=/nixpkgs/branches/stdenv-updates/; revision=31863
2012-01-26 15:27:03 +00:00