Commit Graph

60 Commits

Author SHA1 Message Date
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
1e0012c1ab * Tribler updated to 5.5.10.
svn path=/nixpkgs/trunk/; revision=32144
2012-02-08 16:46:09 +00:00
Yury G. Kudryashov
84c0185038 svn merge ^/nixpkgs/trunk, one simple conflict in jruby
svn path=/nixpkgs/branches/stdenv-updates/; revision=31721
2012-01-19 21:31:51 +00:00
Yury G. Kudryashov
d38c5e7ee4 KTorrent 4.1.3, fix build with KDE 4.8
svn path=/nixpkgs/trunk/; revision=31713
2012-01-19 20:28:05 +00:00
Ludovic Courtès
ed221cf4cc GNUnet 0.9.1.
svn path=/nixpkgs/trunk/; revision=31677
2012-01-18 20:53:00 +00:00
Eelco Dolstra
c556a6ea46 * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless
function, so obsolete it.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31644
2012-01-18 20:16:00 +00:00
Yury G. Kudryashov
9ee0a9df9b svn merge ^/nixpkgs/trunk
A few trivial conflicts

svn path=/nixpkgs/branches/stdenv-updates/; revision=31434
2012-01-08 16:01:12 +00:00
Yury G. Kudryashov
7e320a7043 State qt version (3/4) in packages, not in all-packages.nix
svn path=/nixpkgs/trunk/; revision=31406
2012-01-07 17:06:49 +00:00
Eelco Dolstra
eda3fd1730 * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=30852
2011-12-12 16:54:35 +00:00
Ludovic Courtès
dccc3f83b3 GNUnet 0.9.0.
svn path=/nixpkgs/trunk/; revision=30725
2011-12-04 13:49:03 +00:00
Peter Simons
dfd063cf12 synchronize with trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=30027
2011-10-26 09:15:25 +00:00
Lluís Batlle i Rossell
f71f99ce48 Updating mldonkey
svn path=/nixpkgs/trunk/; revision=29998
2011-10-24 19:03:18 +00:00
Shea Levy
01df54f5cc Merge from trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=29461
2011-09-23 16:58:45 +00:00
Michael Raskin
8e6bbd66aa Update LinuxDC++. Does not eliminate some of the strange segfaults
svn path=/nixpkgs/trunk/; revision=29449
2011-09-23 06:52:10 +00:00
Lluís Batlle i Rossell
d7d6755654 Updating gnunet 0.9 svn version, although it brings little or nothing new I had noticed.
svn path=/nixpkgs/trunk/; revision=29436
2011-09-22 09:15:48 +00:00
Eelco Dolstra
267e123508 * Latest Tribler.
svn path=/nixpkgs/trunk/; revision=29396
2011-09-20 11:20:15 +00:00
Lluís Batlle i Rossell
98f6452a70 Adding the gnunet 0.9 (svn), which works incompatible with the latest gnunet released.
I updated some libs to get it built.


svn path=/nixpkgs/trunk/; revision=29313
2011-09-16 20:50:24 +00:00
Eelco Dolstra
6cec6f29db * Use the -O flag.
svn path=/nixpkgs/trunk/; revision=29288
2011-09-14 22:54:35 +00:00
Eelco Dolstra
c084ef2f61 * The latest and greatest Tribler.
svn path=/nixpkgs/trunk/; revision=28971
2011-09-02 11:11:48 +00:00
Yury G. Kudryashov
597412252a Wrap kde-related packages in kdePackagesFor
This lets hydra build kde packages for all available KDE releases.
Will commit NixOS-fix in a few minutes.

svn path=/nixpkgs/trunk/; revision=28833
2011-08-26 13:49:23 +00:00
Shea Levy
4d70ba6cc9 Merge from trunk up through r28790
svn path=/nixpkgs/branches/stdenv-updates/; revision=28792
2011-08-24 19:16:43 +00:00
Eelco Dolstra
18509c88b3 * KTorrent updated to 4.1.1.
svn path=/nixpkgs/trunk/; revision=28193
2011-08-06 14:28:15 +00:00
Lluís Batlle i Rossell
2758c07f1e Updating mldonkey. I remove the patch needed for mips, as they put it upstream already.
svn path=/nixpkgs/trunk/; revision=27885
2011-07-21 18:34:41 +00:00
Lluís Batlle i Rossell
1229dd1400 Adding a still broken restroshare expression. I'll develop further later.
svn path=/nixpkgs/trunk/; revision=27540
2011-06-26 17:57:28 +00:00
Alexander Tsamutali
2daeebaaec applications/networking/p2p/transmission: Updated to 2.31.
svn path=/nixpkgs/trunk/; revision=27433
2011-06-13 14:15:15 +00:00
Eelco Dolstra
a423840c66 * Use a working version of Tribler.
svn path=/nixpkgs/trunk/; revision=27148
2011-05-04 14:59:17 +00:00
Eelco Dolstra
7a62283c46 svn path=/nixpkgs/trunk/; revision=27128 2011-05-04 08:55:30 +00:00
Eelco Dolstra
9afa230dfc * Added Tribler. Doesn't quite work yet.
svn path=/nixpkgs/trunk/; revision=27124
2011-05-03 17:12:31 +00:00
Eelco Dolstra
89e94123c6 * Move ktorrent to pkgs/applications/networking/p2p/.
svn path=/nixpkgs/trunk/; revision=27123
2011-05-03 16:59:24 +00:00
Alexander Tsamutali
25c7d51515 applications/networking/p2p/transmission: Updated to 2.13.
svn path=/nixpkgs/trunk/; revision=25348
2011-01-02 20:09:25 +00:00
Lluís Batlle i Rossell
5032b693b2 Fix for mips64 for mldonkey (I'll submit it upstream)
svn path=/nixpkgs/branches/stdenv-updates/; revision=24035
2010-10-03 09:18:44 +00:00
Lluís Batlle i Rossell
0c7429f8cc My attempts to build mldonkey on the fuloong
svn path=/nixpkgs/branches/stdenv-updates/; revision=24034
2010-10-03 09:18:31 +00:00
Eelco Dolstra
907bb1aac6 * ltrace: updated to 0.5.3.
* libdbi / libdbi-drivers: updated to 0.8.3, and make it compile with
  SQLite.
* qemu-image: fix the URL.
* gdmap: make it build again (requires an older GTK+).
* rlwrap: updated to 0.37.
* smbfs-fuse -> fusesmb to match the upstream name.
* x11vnc: updated to 0.9.10.
* clearlyU: fix the URL.
* Various packages: follow the coding conventions.

svn path=/nixpkgs/trunk/; revision=22814
2010-07-29 18:55:16 +00:00
Eelco Dolstra
ba498d4a43 * composedArgsAndFun -> makeOverridable for consistency.
* Rename a few single-version packages to "default.nix".

svn path=/nixpkgs/trunk/; revision=22803
2010-07-29 08:21:21 +00:00
Lluís Batlle i Rossell
14e7dc47a5 Updating mldonkey
svn path=/nixpkgs/trunk/; revision=22290
2010-06-16 07:58:22 +00:00
Eelco Dolstra
0619aaf2ac * Transmission updated to 1.93.
svn path=/nixpkgs/trunk/; revision=21923
2010-05-20 13:39:16 +00:00
Alexander Tsamutali
99f19e27de applications/networking/p2p/transmission: New nixpkg.
svn path=/nixpkgs/trunk/; revision=20840
2010-03-28 00:06:30 +00:00
Ludovic Courtès
f07aa3d96d GNUnet 0.8.1b.
svn path=/nixpkgs/trunk/; revision=20245
2010-02-25 10:31:36 +00:00
Lluís Batlle i Rossell
df68759142 Updating from trunk, to get the new mldonkey.
Cleaning the mldonkey expression to build with the ocaml native compiler in some
platforms, and with the bytecode in others.
Removing the flag to support ocaml-3.11.1, as it is included in this new
version of mldonkey.


svn path=/nixpkgs/branches/stdenv-updates/; revision=19487
2010-01-16 16:41:33 +00:00
Lluís Batlle i Rossell
9183f21f7e Merging from trunk.
I fixed conflicts regarding the renaming 'kernel' -> 'linux' in all-packages.
Also a small conflict in all-packages about making openssl overridable.
And I some linux 2.6.31-zen kernel files also marked in conflict.


svn path=/nixpkgs/branches/stdenv-updates/; revision=19438
2010-01-14 14:49:31 +00:00
Ludovic Courtès
5080aa43d3 GNUnet: Add `meta.platforms'.
svn path=/nixpkgs/trunk/; revision=19414
2010-01-13 21:34:45 +00:00
Ludovic Courtès
bfb476c7d6 GNUnet 0.8.1.
svn path=/nixpkgs/trunk/; revision=19219
2010-01-05 11:16:42 +00:00
Lluís Batlle i Rossell
4b27d28701 Porting changes from stdenv-updates into this branch.
This comes from:
svn diff  ^/nixpkgs/trunk/@18255 ^/nixpkgs/branches/stdenv-updates/ > diff
patch -p0 < diff
and then adding into svn all files new from the patch.

trunk@18255 comes from the last time I updated stdenv-updates from trunk.


svn path=/nixpkgs/stdenv-updates2/; revision=18272
2009-11-08 00:32:12 +00:00
Marc Weber
52647ea3b0 FullDepEntry -> fullDepEntry, PackEntry -> packEntry
svn path=/nixpkgs/trunk/; revision=15662
2009-05-19 23:25:58 +00:00
Lluís Batlle i Rossell
291260a325 Updating mldonkey to 3.0.0.
svn path=/nixpkgs/trunk/; revision=15628
2009-05-17 20:34:04 +00:00
Eelco Dolstra
27152e987a * ldcpp in all-packages.nix still referred to 1.0.1.
svn path=/nixpkgs/trunk/; revision=15547
2009-05-11 11:22:26 +00:00
Michael Raskin
648b4ccf0f Update Linux DC++
svn path=/nixpkgs/trunk/; revision=15535
2009-05-10 19:39:59 +00:00
Eelco Dolstra
fcad0b0a5a * Cleaned up a lot of description fields that contained newlines.
Some of these should be longDescriptions, but most others just
  shouldn't contain newlines.  E.g. write

    description = "Bla";

  and not

    description = ''
      Bla
    '';

  This pollutes "nix-env -qa --description" output.

svn path=/nixpkgs/trunk/; revision=14310
2009-03-03 13:27:40 +00:00
Michael Raskin
73b0973818 Adding MLDonkey multiprotocol data distribution client - patch by Lluis Batlle
svn path=/nixpkgs/trunk/; revision=13702
2009-01-04 17:35:11 +00:00
Michael Raskin
c5363217ad meta.function -> passthru.function, not killing other contents of passthru
svn path=/nixpkgs/trunk/; revision=13190
2008-11-04 21:24:10 +00:00