cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2
82592 commits 1 branch 0 tags 3.7 GiB
Commit graph

1266 commits

Author SHA1 Message Date
Kirill Elagin
4b84049bd3 gitAndTools.hub: Update to 2.x 2015-01-04 02:28:38 +03:00
John Wiegley
eba9d0d8fa subversion: Add several compiler definitions for Darwin 2015-01-03 07:53:06 -05:00
John Wiegley
58ae62b9fa hub: add git as a dependency of the expression 2015-01-03 07:53:01 -05:00
Charles Strahan
94dd4b9721 ruby: WIP 2014-12-30 21:05:00 -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
Domen Kožar
6dc71c19b0 Merge pull request #5480 from lostdj/ltp/upstream-master/smartgit653 
SmartGitHg: update from 6.0.6 to 6.5.3.
 2014-12-30 03:47:14 +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
Thomas Tuegel
e5e6931088 vcsh: add ttuegel as maintainer 2014-12-28 09:00:49 -06:00
Thomas Tuegel
a1860dab81 vcsh: bump version to 1.20141026 2014-12-28 09:00:38 -06:00
lostdj
cf8a716baa SmartGitHg: update from 6.0.6 to 6.5.3. 2014-12-27 11:28:38 +03:00
Peter Simons
8298636254 haskell-git-annex: update to version 5.20141219 2014-12-25 11:05:49 +01:00
Pascal Wittmann
f94580da69 Fix license attribute of many bsd-like licensed packages 2014-12-21 00:00:35 +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
Eelco Dolstra
cb5433b8de mercurial: Update to 3.2.2 2014-12-18 14:11:10 +01:00
Eelco Dolstra
49282dd1af subversion: Update to 1.8.11 2014-12-18 14:11:10 +01:00
Domen Kožar
ba5fad6dfa Merge pull request #5323 from offlinehacker/gitlab_i686_fix 
gitlab: fix i686-linux build and module
 2014-12-14 09:48:44 +01:00
Jaka Hudoklin
90683792aa gitlab: fix i686-linux build and module 
It turns out that installing therubytracer, with dependency on old v8, even
when using source libv8 version is problematic.
(see
http://stackoverflow.com/questions/21666379/problems-installing-gitlab-on-odroid-v8-lib-not-available).

But wait, rails does not even need therubytracer, just any kind of javascript
server side execution framework like nodejs. Well just use that, as also
suggested from different internet sources (look link above), it works just
fine.
 2014-12-14 02:24:12 +01:00
Peter Simons
1a0505143c haskell-github-backup: update to version 1.20141204 2014-12-13 12:06:02 +01:00
Jaka Hudoklin
13e58784bf nixos/gitlab: fixes 
- fix timezone data not found
- fix module, add simple test
- allow to set port
 2014-12-12 18:01:31 +01:00
Thomas Hunger
59995e168c nixos: Add gitlab and gitlab-shell 
I had to make several adjustments to make it work with nixos:

* Replace relative config file lookups with ENV variable.
* Modify gitlab-shell to not clear then environment when running
  pre-receive.
* Modify gitlab-shell to write some environment variables into
  the .authorized_keys file to make sure gitlab-shell reads the
  correct config file.
* Log unicorn output to syslog.
  I tried various ways of adding a syslog package but the bundler would
  not pick them up. Please fix in a better way if possible.
* Gitlab-runner program wrapper.
  This is useful to run e.g. backups etc. with the correct
  environment set up.
 2014-12-12 18:01:29 +01:00
Massimo Zaniboni
32f9644943 redmine: use libc libciconv implementation on Linux. 2014-12-12 01:20:53 +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
Pascal Wittmann
5e04917e65 gource: fix build with new glm version 2014-12-04 14:31:28 +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
Shea Levy
64453d01f4 src: bump 2014-11-26 18:25:13 -05: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
Henry Till
d4bd9779dc mr: update to 1.20141024 2014-11-22 09:30:30 -05:00
Shea Levy
5c7c63af66 Add src revision control software 2014-11-21 16:12:33 -05:00
Pascal Wittmann
fb5dfbdbc7 gource: update from 0.42 to 0.43 and adopt it 2014-11-19 08:47:41 +01:00
Charles Strahan
e51afe5e7c fix hub 2014-11-18 04:07:30 +00:00
Vladimír Čunát
b4af993c3f Merge branch 'master' into staging 
Conflicts (simple):
	pkgs/development/lisp-modules/clwrapper/setup-hook.sh
 2014-11-14 14:28:23 +01: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
Luca Bruno
6af0d6974f Merge branch 'master' into staging 2014-11-10 10:03:52 +01: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
Luca Bruno
83221f3886 Merge branch 'master' into staging 
Makes the build more useful:
- Disabled hybrid iso, makes installer tests pass again
- Imagemagick fixes to the "Illegal instruction" thing
 2014-11-08 15:56:40 +01:00
Eelco Dolstra
dde6d5708c Add set apacheHttpdPackages containing modules for specific Apache versions 
Similar to linuxPackages etc.
 2014-11-07 12:08:30 +01:00
Eelco Dolstra
0518ccf5af Merge remote-tracking branch 'origin/master' into staging 
Conflicts:
	pkgs/stdenv/generic/default.nix
 2014-11-06 10:16:39 +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
Vladimír Čunát
52404a868d Merge recent master into staging 
Nixpkgs Hydra: ?compare=1157272

TODO: port e22889064f

Conflicts:
	nixos/tests/gnome3_10.nix (auto-solved)
	pkgs/applications/video/aegisub/default.nix
	pkgs/development/libraries/boost/1.55.nix
 2014-11-05 15:00:44 +01:00
Eelco Dolstra
7495c61d49 Merge remote-tracking branch 'origin/darwin-clang-stdenv' into staging 
Conflicts:
	pkgs/applications/editors/vim/macvim.nix
 2014-11-04 14:30:43 +01:00
William A. Kennington III
a9c472d16e boost: Fix incompatible applications 2014-11-02 17:22:28 -08:00
William A. Kennington III
aa3e800be7 boost: Remove boost.lib 2014-11-02 17:22:27 -08:00
Adam Bouhenguel
8e09c97d1c Bump git-repo to 1.21 
Still no versioned URL, but there’s been a new release. SHA1 pulled
from http://source.android.com/source/downloading.html#installing-repo.
 2014-11-01 17:28:25 -07:00
Peter Simons
0a2e12e046 haskell-github-backup: update to version 1.20141031 2014-11-01 21:08:04 +01:00
Peter Simons
eac1d21819 darcs: jailbreak to fix build with latest version of 'text' 2014-11-01 21:08:03 +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
8c3757a24d darcs: jailbreak to fix build with random 1.x 2014-10-14 17:39:33 +02:00
Eelco Dolstra
462fdfe108 mercurial: Update to 3.1.2 2014-10-14 14:37:29 +02:00
Eelco Dolstra
811de3bfaa Merge remote-tracking branch 'origin/staging' into darwin-clang-stdenv 
Conflicts:
	pkgs/tools/security/gnupg/default.nix
 2014-10-09 10:57:57 +02:00
Michael Raskin
57e0b9de65 Apparently now monotoneViz source got fixed 2014-10-09 10:34:11 +04:00
Michael Raskin
af53f40684 Update Monotone-viz source 2014-10-08 22:06:15 +04:00
Aristid Breitkreuz
977ad646e9 rcs: update from 5.9.2 to 5.9.3 2014-10-07 22:40:06 +02:00
Domen Kožar
8f27aedb46 add redmine package 2014-10-07 10:54:22 +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
Eelco Dolstra
6db6dea4c9 subversion: Remove apparently unnecessary environment variables 
At least it seems to build fine (and use clang) without them.
 2014-09-24 18:55:09 +02:00
Eelco Dolstra
542a4d0287 subversion: Fix broken configure flags 
This caused an impure dependency on libsasl on Darwin.
 2014-09-24 18:51:29 +02:00
Eelco Dolstra
bf44536c79 mercurial: Update to 3.1.1 2014-09-23 12:03:11 +02:00
Eelco Dolstra
cd71f7a2e6 Merge branch 'darwin-stdenv' of github.com:joelteon/nixpkgs into staging 
Conflicts:
	pkgs/development/interpreters/ruby/ruby-19.nix
	pkgs/development/libraries/libc++/default.nix
	pkgs/development/libraries/libc++abi/default.nix
	pkgs/tools/text/sgml/opensp/default.nix
 2014-09-23 11:27:53 +02:00
William A. Kennington III
31220480d8 boost: Update depdendent packages 2014-09-21 17:20:59 -07: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
lostdj
d8fc19da05 SmartGitHg: don't assume we're on OpenJDK and replace JDK dependency 
with JRE.

Closes #4081.

Signed-off-by: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
 2014-09-20 23:11:35 +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
Nick Sauce
759cc041ed smartgithg: new package 
@vcunat added meta.platforms.
 2014-09-11 21:51:01 +02:00
Joel Taylor
7da056233f wip libc++ 2014-09-09 13:54:25 -07:00
Joel Taylor
3e8344d334 suitable clang stdenv 2014-09-09 13:54:24 -07:00
Eelco Dolstra
4ae3e32e82 Merge pull request #4012 from ibeex/master 
added darwin as supported platform for meld
 2014-09-09 15:35:58 +02:00
Ivan Brkanac
841f45b231 added darwin ass supported platform for meld, added get text as requirement for scroollkeeper 2014-09-09 15:21:04 +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
c5697874c2 diffuse: update from 0.4.7 to 0.4.8 2014-09-04 19:31:33 +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
cce6dd11b6 subversionClient: update from 1.8.9 to 1.8.10, potentially fixes CVE-2014-3504, CVE-2014-3522, CVE-2014-3528 2014-09-04 16:06:42 +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
Michael Raskin
08131bd5d5 Update guitone 2014-09-01 00:38:07 +04:00
Longrin Wischnewski
a555193ee9 gource: update to version 0.42 2014-08-31 12:44:29 +02:00
Cray Elliott
f237f31b93 darcs updated to 2.8.5 
tested to work with ghc 7.8.3
 2014-08-25 15:58:21 -07: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
Vladimír Čunát
d75cf6fffb meld: update to latest stable 2014-08-16 18:58:51 +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
Michael Raskin
05a3b156f0 Update Mercurial to version 3.1 2014-08-12 02:47:04 +04:00
Eelco Dolstra
2f056c5237 subversion: Fix build on Darwin 2014-08-09 23:54:58 +02:00
Peter Simons
9226fbf56a Merge remote-tracking branch 'origin/master' into staging. 2014-08-08 09:51:01 +02:00
Eelco Dolstra
b4c4e2d28d subversion: Update to 1.8.9 2014-08-05 11:46:04 +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
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
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
Bjørn Forsman
bb440b3612 meld: set meta.platforms attribute 
This makes Hydra build it and makes it available in the binary channel.
 2013-09-02 21:57:08 +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
9cf2e2d030 haskell-darcs: re-generate expression with recent version of cabal2nix 2013-08-17 11:39:11 +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
Eelco Dolstra
09fc997107 subversion: Update to 1.7.11 
CVE-2013-4131
 2013-08-07 17:12:33 +02: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
Evgeny Egorochkin
da4be371e9 make package use mirror:// for gnu, savannah and gnome repositories where possible 2013-07-14 05:23:06 +03:00
Evgeny Egorochkin
b53f429c6c rapidvn: fix version to match tarball 2013-07-14 02:08:52 +03: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
Bjørn Forsman
e3a67bbb99 diffuse: new package, close #731. 
Diffuse is a graphical diff and merge tool.
http://diffuse.sourceforge.net/
 2013-07-08 11:14:50 +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
Vladimír Čunát
387a691f59 Merge pull request #694 from lovek323/subversion 
subversion: fix build on darwin
 2013-07-04 02:18:58 -07:00
Jason "Don" O'Conal
bd3c2c76c7 subversion: fix build on darwin 
* remove useless -no-cpp-precomp flags
 2013-07-04 19:10:41 +10: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
12b29fadcb Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-06-17 10:14:45 +02:00
Michael Raskin
19530856ed Merge remote-tracking branch 'upstream/master' into x-updates 
Conflicts:
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/gdk-pixbuf/default.nix
	pkgs/development/libraries/gtk+/2.x.nix
	pkgs/misc/ghostscript/default.nix
	pkgs/top-level/all-packages.nix
 2013-06-13 17:12:43 +04:00
Eelco Dolstra
6dbb6f78bb subversion: Update to 1.7.10 
CVE-2013-1968, CVE-2013-2088, CVE-2013-2112.
 2013-06-12 15:56:40 +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
Vladimír Čunát
7db886fdb9 Merge remote-tracking branch 'hydra/master' into x-updates 
Conflicts (taken from @7c6f434c):
	pkgs/development/libraries/libgphoto2/default.nix
 2013-06-08 15:41:39 +00: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
Vladimír Čunát
7af694700c Merge branch 'master' into x-updates 
Silently merged badly the firefox 20/21 things. I got that, hopefully
there aren't more (my nixos-rebuild dry-run finds no more errors).
 2013-06-05 12:59:47 +02: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
Vladimír Čunát
b770365574 ReRevert Merge x-updates into master 
This reverts commit ec3965d8d0.

Conflicts (taken x-updates):
	pkgs/development/libraries/libgcrypt/default.nix
	pkgs/development/libraries/libgpg-error/default.nix
	pkgs/development/libraries/poppler/default.nix
 2013-05-29 23:25:02 +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
e3c641b39a mercurial: Update to 2.6.1 
Also, set a default for web.cacerts so that the system certificates on
NixOS are used.
 2013-05-15 13:15:53 +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
Vladimír Čunát
ec3965d8d0 Revert Merge x-updates into master due to mesa bloat 
See #490 discussion.

This reverts commit 1278859d31, reversing
changes made to 0c020c98f9.

Conflicts:
	pkgs/desktops/xfce/core/xfce4-session.nix (take master)
	pkgs/lib/misc.nix (auto)
 2013-05-09 14:03:35 +02:00
Vladimír Čunát
1278859d31 Merge branch 'master' into x-updates 
Conflicts (just splitting version from name):
	pkgs/os-specific/linux/systemd/default.nix
 2013-05-08 13:46:46 +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
b17ba0fbb2 subversion: Update to 1.7.9 
CVE-2013-1845, CVE-2013-1846, CVE-2013-1847, CVE-2013-1849,
CVE-2013-1884.
 2013-05-01 13:15:05 +02:00
Vladimír Čunát
bde20f3e88 Merge branch 'master' into x-updates 
Conflicts (just taken x-updates):
	pkgs/servers/x11/xorg/overrides.nix
 2013-04-24 06:29:09 +00: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
Vladimír Čunát
ec736312d4 Merge branch 'master' into x-updates 
Conflicts:
	pkgs/development/compilers/vala/default.nix (it's different version)
	pkgs/development/libraries/cairo/default.nix (trivial)
 2013-04-17 18:26:28 +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
Vladimír Čunát
17ae1617dc Merge branch 'master' into x-updates 
Conflicts (systemd version is split on x-updates):
	pkgs/os-specific/linux/systemd/default.nix
 2013-04-13 12:21:31 +02:00
Peter Simons
0b4e664a24 git-annex: update to version 4.20130405 2013-04-13 00:13:22 +02:00
Vladimír Čunát
8249695b61 Merge branch 'master' into x-updates 
Needed that to fix the tarball.
 2013-04-11 23:31:33 +02:00
Lluís Batlle i Rossell
e0249ffcd0 meld: update to 1.6.1 2013-04-08 12:14:26 +02:00
Peter Simons
9f4d510b6b Merge branch 'master' into stdenv-updates. 2013-04-05 11:23:38 +02:00
Peter Simons
47e93cd27e rcs: update to version 5.8.2 
It's profoundly satisfying to know that we have the very latest version of RCS.
RCS users, you see, live on the bleeding edge.
 2013-04-05 08:56:40 +02:00
Vladimír Čunát
eb2e46aab2 Merge branch 'master' into x-updates 
Conflicts:
	pkgs/applications/graphics/rawtherapee/default.nix
	pkgs/applications/misc/blender/default.nix
	pkgs/applications/networking/browsers/chromium/sources.nix
	pkgs/os-specific/linux/kernel/linux-3.9.nix
	pkgs/top-level/all-packages.nix
 2013-04-04 21:43:40 +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
Vladimír Čunát
b1eeae8cac Merge branch 'master' into x-updates 
Conflicts (easy):
	pkgs/desktops/xfce/core/xfdesktop.nix
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/pango/default.nix
 2013-03-17 11:28:28 +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
Vladimír Čunát
86639d9bb9 Merge branch 'master' into x-updates 
Conflicts (taken master versions):
	pkgs/desktops/xfce-4.8/core/libxfcegui4.nix
	pkgs/desktops/xfce/applications/gigolo.nix
	pkgs/desktops/xfce/applications/mousepad.nix
	pkgs/desktops/xfce/applications/ristretto.nix
	pkgs/desktops/xfce/applications/terminal.nix
	pkgs/desktops/xfce/applications/xfce4-mixer.nix
	pkgs/desktops/xfce/applications/xfce4-notifyd.nix
	pkgs/desktops/xfce/applications/xfce4-taskmanager.nix
	pkgs/desktops/xfce/art/xfce4-icon-theme.nix
	pkgs/desktops/xfce/core/exo.nix
	pkgs/desktops/xfce/core/garcon.nix
	pkgs/desktops/xfce/core/gtk-xfce-engine.nix
	pkgs/desktops/xfce/core/libxfce4ui.nix
	pkgs/desktops/xfce/core/libxfce4util.nix
	pkgs/desktops/xfce/core/libxfcegui4.nix
	pkgs/desktops/xfce/core/thunar-volman.nix
	pkgs/desktops/xfce/core/thunar.nix
	pkgs/desktops/xfce/core/tumbler.nix
	pkgs/desktops/xfce/core/xfce4-appfinder.nix
	pkgs/desktops/xfce/core/xfce4-panel.nix
	pkgs/desktops/xfce/core/xfce4-power-manager.nix
	pkgs/desktops/xfce/core/xfce4-session.nix
	pkgs/desktops/xfce/core/xfce4-settings.nix
	pkgs/desktops/xfce/core/xfconf.nix
	pkgs/desktops/xfce/core/xfdesktop.nix
	pkgs/desktops/xfce/core/xfwm4.nix
	pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin.nix
	pkgs/development/libraries/webkit/default.nix
	pkgs/top-level/all-packages.nix
 2013-03-09 17:55:37 +01:00
Eelco Dolstra
674c51af3c Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-03-07 19:33:52 +01:00