Commit graph

649 commits

Author SHA1 Message Date
Eelco Dolstra
2aa6f262cb Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-02-15 13:36:34 +01:00
Vladimír Čunát
684f215b4f fix the problem of missing expat in a few packages 2013-02-11 18:34:40 +01:00
Peter Simons
2191cbb0a1 haskell-darcs: update to version 2.8.4 2013-02-09 18:24:50 +01:00
Lluís Batlle i Rossell
7bfd3fd5c8 git: adding an option not to build the manual
asciidoc+xsltproc take hours to run
2013-01-29 20:17:34 +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
Eelco Dolstra
b0cb17257b rcs: Update to 5.8.1 and fix build
http://hydra.nixos.org/build/3895835
2013-01-28 17:19:02 +01:00
Eelco Dolstra
5bb548d2e4 Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-01-17 14:19:14 +01:00
Eelco Dolstra
4c9cfd87aa bazaar: Update to 2.5.1 2013-01-15 18:53:12 +01:00
Eelco Dolstra
58e9406f4b subversion: Update to 1.7.8 2013-01-14 14:38:23 +01:00
Peter Simons
b33ad366a1 Merge branch 'master' into stdenv-updates. 2013-01-11 15:46:10 +01:00
Peter Simons
490085a811 git-annex: update to version 3.20130107 2013-01-09 16:54:31 +01:00
Peter Simons
9e9cd7b529 Merge branch 'master' into stdenv-updates. 2013-01-04 21:00:53 +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
Lluís Batlle i Rossell
b58780c43d Merge remote-tracking branch 'eelco/master' into stdenv-updates
Conflicts:
	pkgs/development/compilers/gcc/4.7/default.nix

Trivial solution.
2012-12-28 23:28:16 +01:00
Eelco Dolstra
ab3eeabfed Rename buildNativeInputs -> nativeBuildInputs
Likewise for propagatedBuildNativeInputs, etc.  "buildNativeInputs"
sounds like an imperative rather than a noun phrase.
2012-12-28 19:20:09 +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
cillianderoiste
5b0cd954f1 Merge pull request #206 from chaoflow/python-merge
python pureness, cleanup, and enable pth loaders (setuptoolsSite, recursivePthLoader)
2012-12-05 14:28:09 -08:00
Michael Raskin
56f1c1ec24 Update veracity 2012-12-04 10:12:38 +04:00
Peter Simons
3261d1d4aa git-annex: update to version 3.20121127 2012-12-03 16:12:04 +01:00
Florian Friesdorf
1adc9b1b1f python module cleanup, enable a couple of tests, add comments for failing 2012-12-03 06:38:11 +01:00
Florian Friesdorf
5436356733 a package does not need to include setuptools manually
this breaks for now
2012-12-03 04:40:38 +01:00
Florian Friesdorf
3438681d80 Merge branch 'channel-nixos' into python-merge 2012-11-29 21:40:33 +01:00
Florian Friesdorf
471a4b583f Merge branch 'channel-nixos' into python-merge 2012-11-29 15:36:17 +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
Florian Friesdorf
9208fb1edb fix mercurial -extra PYTHONPATH +setuptools
- PYTHONPATH is already set correctly
- setuptools is needed to see docutils
2012-11-24 23:24:34 +01:00
Eelco Dolstra
2da2e5137f subversion: Update to 1.7.7 2012-11-22 16:56:03 +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
Michael Raskin
48ad0f7443 Update Fossil to a still present version 2012-11-08 23:15:33 +04: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
Peter Simons
321ee97b4c haskell-darcs: update to version 2.8.3 2012-11-05 16:25:26 +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
b5416d6ed6 darcs: install bash completion instructions 2012-09-25 15:15:38 +02: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
ac751dc753 haskell-darcs: update to version 2.8.2 2012-09-10 15:08:21 +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
Yury G. Kudryashov
c2ad9f873d mr-1.13, more verbose install 2012-08-31 12:07:22 +04:00
Antono Vasiljev
61f7853e43 Merge pull request #92 from dmalikov/b125ef36b67f2a0aedabc34eb4dac12e61ae9828
gitAndTools: bump tig from 0.16 to 1.0
2012-08-16 06:03:54 -07:00
Michael Raskin
938d86b16b Veracity: update to version 2.0
Still no permission support or commit signing, though.
2012-08-09 11:05:43 +04: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
Eelco Dolstra
bd8d7a8d15 Add some packages to the channel 2012-07-31 19:26:35 -04:00
Shea Levy
c3c68b6510 Mercurial: Install hgweb.wsgi as well 2012-07-28 20:25:41 -04:00
Shea Levy
deb09fd9de Mercurial: Bump 2012-07-27 19:44:01 -04:00
Antono Vasiljev
631a59e449 Added mr - Multiple Repository management tool 2012-07-07 17:12:18 +02: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
Eelco Dolstra
ce10ebebac * Subversion 1.7.5.
svn path=/nixpkgs/trunk/; revision=34348
2012-06-04 15:40:25 +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
Peter Simons
201bdca962 Updated Haskell packages.
- cryptocipher: updated to version 0.3.2
 - Crypto: updated to version 4.2.5
 - darcs: updated to version 2.8.1
 - hamlet: updated to version 1.0.1.3
 - monad-par-extras: updated to version 0.3.2
 - persistent-template: updated to version 0.9.0.2
 - pool-conduit: updated to version 0.1.0.2
 - shakespeare-css: updated to version 1.0.1.2
 - shakespeare-i18n: updated to version 1.0.0.2
 - shakespeare-js: updated to version 1.0.0.2
 - shakespeare-text: updated to version 1.0.0.2
 - shakespeare: updated to version 1.0.0.2
 - warp: updated to version 1.2.1
 - wxcore: updated to version 0.90.0.1
 - wxc: updated to version 0.90.0.3
 - wx: updated to version 0.90.0.1
 - xml-conduit: updated to version 0.7.0.3
 - xss-sanitize: updated to version 0.3.2
 - yesod-auth: updated to version 1.0.2.1
 - yesod-core: updated to version 1.0.1.2
 - yesod-default: updated to version 1.0.1.1
 - yesod-form: updated to version 1.0.0.4
 - yesod-json: updated to version 1.0.0.1
 - yesod-persistent: updated to version 1.0.0.1
 - yesod-routes: updated to version 1.0.1.2
 - yesod-static: updated to version 1.0.0.2
 - yesod: updated to version 1.0.1.6

svn path=/nixpkgs/trunk/; revision=34102
2012-05-15 11:50:48 +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
f1135ba545 Updated Haskell packages.
- alternative-io: updated to version 0.0.1
 - blaze-markup: added version 0.5.1.0
 - crypto-conduit: updated to version 0.3.2
 - cryptohash: updated to version 0.7.5
 - darcs: updated to version 2.8.0
 - filestore: updated to version 0.4.2
 - Graphalyze: cosmetic change
 - hamlet: updated to version 1.0.1.1
 - happstack-hamlet: updated to version 7.0.1
 - happstack-server: updated to version 7.0.1
 - HFuse: updated to version 0.2.4.1
 - Hipmunk: updated to version 5.2.0.8
 - language-javascript: updated to version 0.5.2
 - libmpd: updated to version 0.8.0
 - lifted-base: updated to version 0.1.0.4
 - monad-control: updated to version 0.3.1.2
 - persistent: updated to version 0.9.0.3
 - regex-compat: use latest version when building with GHC 7.4.1
 - skein: updated to version 0.1.0.7
 - snap-core: updated to version 0.8.1
 - snap-server: updated to version 0.8.1.1
 - tls: updated to version 0.9.5
 - vty: updated to version 4.7.0.12
 - wai-app-static: updated to version 1.2.0.2
 - yesod-core: updated to version 1.0.1.1

svn path=/nixpkgs/trunk/; revision=33889
2012-04-23 09:34:01 +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
Nicolas Pierron
811b035171 Mercurial: Support ssl and curses python packages for fast-export and crecord.
svn path=/nixpkgs/trunk/; revision=33799
2012-04-15 23:48:07 +00:00
Michael Raskin
351bcc3b70 Fix tailor URL
svn path=/nixpkgs/trunk/; revision=33767
2012-04-12 20:54:39 +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
4ae899f4bf * Mercurial updated to 2.1.2.
svn path=/nixpkgs/trunk/; revision=33563
2012-04-04 14:06:04 +00:00
Eelco Dolstra
ebae9a9fd7 * Git 1.7.9.5.
svn path=/nixpkgs/trunk/; revision=33553
2012-04-03 11:07:50 +00:00
Peter Simons
880dcc2c64 Removed myself as a maintainer from Haskell packages that I don't personally use.
By now, it happened twice that a commit broke GHC and thus all Haskell packages
we have in Nixpkgs. On such an occasion, I receive well in excess of 3000
notification e-mails from Hydra, and then I receive another 3000 e-mails after
the bug has been fixed. Under these circumstances, subscribing to these
notifications makes no sense for me.

svn path=/nixpkgs/trunk/; revision=33392
2012-03-24 10:21:28 +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
613dd942c7 * Subversion updated to 1.7.4.
svn path=/nixpkgs/trunk/; revision=33013
2012-03-12 13:40:40 +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
Lluís Batlle i Rossell
e1c8ab095c Removing a duplicated line so the hydra stdenv evaluation can go.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32576
2012-02-26 16:04:57 +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
Yury G. Kudryashov
38e3d7bc86 svn merge ^/nixpkgs/trunk
Not merged r32497 (tree conflict, glibc GNU Hurd update). Ludovic, could you
please look at this?

svn path=/nixpkgs/branches/stdenv-updates/; revision=32520
2012-02-23 20:06:21 +00:00
Yury G. Kudryashov
c6f0449124 Let hydra build kdesvn and krusader.
Also fix kdesvn build with qt-4.8.

svn path=/nixpkgs/trunk/; revision=32473
2012-02-22 14:51:15 +00:00
Eelco Dolstra
f71dd91a43 * Apply r32435 from the trunk (always build Python with SSL support).
Remove .ssl references from some packages missed in that commit.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32469
2012-02-21 23:35:35 +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