philipp/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Activity
%!d() commits 3 branches 0 tags 1.4 GiB
Commit graph

1243 commits

Author SHA1 Message Date
Lluís Batlle i Rossell 894fad326a offrss: update to 1.3 
I also enabled the iconv linking on non-linux.
 2012-06-27 23:19:30 +02:00
Lluís Batlle 1f1a6c9773 Merge branch 'master' from viric's fork. 
It has a few updates to some packages: taskwarrior, dar.
Also made links2 cross-build.
 2012-06-27 19:33:34 +02:00
Eelco Dolstra 2ead90a36b pan: Updated to 0.138 2012-06-25 15:41:19 -04:00
Lluís Batlle fc8fb52341 Merge branch 'master' of https://github.com/viric/nixpkgs 2012-06-24 19:12:50 +02:00
aszlig d23dcbb9a5 chromium: Enable parallel building. 
Always did this manually by putting -j8 into make flags, which i didn't commit,
as it obviously doesn't make sense to hardcode. However, this flag makes more
sense and obviously we need to avoid overriding buildPhase.
 2012-06-22 15:53:30 -04:00
aszlig 59f8de864f chromium: Add support for pulseaudio. 
Which is enabled by default if neither pulseaudio or chromium.pulseaudio is
explicitly set. The reason is that chromium falls back to ALSA in case no
pulseaudio is available.

In addition it was necessary to patch media.gyp to ignore the array-out-of-
bounds warning.
 2012-06-22 15:53:30 -04:00
aszlig a2984e3d82 chromium: Simplify names of getConfig options. 
This makes it easier to remember, as so far the naming wasn't quite consistent,
sometimes "use*", sometimes "enable*". So in using just use the feature name
itself, it should be pretty clear.
 2012-06-22 15:53:30 -04:00
aszlig fc24f460f1 chromium: Use bundled versions of some libraries. 
These libraries are heavily patched by the chromium project itself, so let's use
the bundled versions as those won't build anyway and also don't break functional
purity.
 2012-06-22 15:53:30 -04:00
aszlig d8e9536498 chromium: Cleanup dependencies. 
This mostly is a code structure change, but also involves deleting some unused
dependencies and adding a few constraints on existing ones.
 2012-06-22 15:53:30 -04:00
aszlig c7db5ff34d chromium: Add dependency for libselinux. 
This doesn't really work at the current state of NixOS and SELinux support, but
will make it easier in case we someday support SELinux altogether.
 2012-06-22 15:53:30 -04:00
aszlig a88eb35ff1 chromium: Enable proprietary codecs by default. 
We now switch to using bundled ffmpeg, as this adds stuff such as support for
the H.264 codec.
 2012-06-22 15:53:30 -04:00
aszlig 04ae9f288d chromium: Implement handling of enableCUPS. 
We also need to patch the compilation process, so it allows deprecated
declarations when building support for the cups backend. In addition, we also
need to add libgcrypt to dependencies as it's needed by the cups implementation.
 2012-06-22 15:53:29 -04:00
aszlig 8371d50836 chromium: Update source to version 21.0.1179.1. 2012-06-22 15:53:29 -04:00
aszlig 70c0af9a37 chromium: Add mesa to build dependencies. 
This finally enables support for WebGL and accelerated rendering.
 2012-06-22 15:53:29 -04:00
aszlig 57e127099b chromium: Add flag to disable Gnome support. 
This also separates gcrypt and gconf from the basic dependencies.
Unfortunately we cannot get rid of dbus_glib altogether, but maybe we want to
work on a patch to get rid of it? On the other hand it seems to be a TODO of the
chromium project itself, so let's wait and see.
 2012-06-22 15:53:29 -04:00
aszlig c2b145c32f chromium: Allow to switch off openssl support. 
Currently building fails with NSS, so we're using OpenSSL by default. And that's
why we want to make this configurable so if we manage to fix that build failure,
we could switch to using NSS by default.
 2012-06-22 15:53:29 -04:00
aszlig f0cdea2e99 chromium: Use patches from system OpenSSL. 
This is mainly because of the patch to use OPENSSL_X509_CERT_FILE as a way to
specify the CA bundle. A browser which isn't able to verify SSL certificates
might be somewhat useless.
 2012-06-22 15:53:29 -04:00
aszlig b1fdecc460 chromium: Rename "chrome" binary to "chromium". 
This is to make it more consistent with the naming of the package file and also
consistent with the build, as we're not using the Google branded version.

In addition the derivation attribute set now has a packageName value which can
be used to easily switch the binary names and paths, just in case we want to
switch to using "chrome" (or something entirely different) again.
 2012-06-22 15:53:29 -04:00
aszlig 22f5045bde chromium: Use system libraries whenever possible. 
There are still some libraries left, which we either need to patch or provide
more recent versions. Plus we're going to use openssl, as libnss doesn't want to
do proper SSL (let's debug this later).
 2012-06-22 15:53:28 -04:00
aszlig 6350706c0d chromium: Add "which" to build dependencies. 
This is needed by a lot of scripts within chromium, so we're not going to patch
them using type, which is shell-specific anyway.
 2012-06-22 15:53:28 -04:00
aszlig ef45195126 chromium: Enable seccomp by default. 
If useSELinux is not set, enable seccomp mode by default and avoid building the
SUID helper sandbox at all. This involves a small patch which causes the
commandline arguments to be swapped: --disable-seccomp-sandbox to disable it,
while the option is active by default.
 2012-06-22 15:53:28 -04:00
aszlig 2571488e6a chromium: Clean up build flags. 
This also includes setting compiler architectures and paths.
 2012-06-22 15:53:28 -04:00
aszlig dc32b4caef chromium: Generate the latest source.nix. 2012-06-22 15:53:28 -04:00
aszlig d342672f5a chromium: Add an update script. 
It fetches the latest version based on the bucketlist XML from
commondatastorage and generates a "source.nix" which contains an attribute set
about where to fetch the latest version.

The XML is parsed in a somewhat hackish way using sed, but as this is just an
updater, its okay and we don't want to break a fly on the wheel by employing a
full XML parser.
 2012-06-22 15:53:28 -04:00
aszlig b5956ec179 chromium: Add an install phase. 
This tries to put pathes unte the same directory as the previous prebuilt
version of Chromium.
 2012-06-22 15:53:28 -04:00
aszlig a31301dab4 chromium: Minimal build (no install) from source. 
This only gets chromium to build so far, installation is missing by upstream, so
we need to manually copy the corresponding files. And I guess with nix, we also
need to patch a few paths on installation.

Another issue is that at the moment, a lot of dependencies are used from the
source tree, rather than from the system.

Also, it would be nice to build using LLVM, as it really speeds up compilation a
*LOT* and also has the side effect of resulting in smaller binaries.

Working unit tests would be nice, too. Unfortunately they're quite heavyweight
and take hours to run, so I guess "someday" would be the most appropriate time
to integrate.

Further todo's:

- Allow to disable GConf, GIO and CUPS.
- Option to disable the sandbox (for whatever reason the user might have).
- Integrate gold binutils.
- Pulseaudio support.
- Clearly separate Linux specific stuff.
 2012-06-22 15:53:27 -04:00
aszlig b06fb762b4 Add tkabber plugins v0.11.1. 2012-06-22 14:47:34 -04:00
aszlig 74b408e151 Add tkabber v0.11.1. 2012-06-22 14:47:34 -04:00
Lluís Batlle i Rossell 18ac2b9ebc Making links2 cross-build again 
The bzip2 target binary was breaking the unpackPhase.
 2012-06-22 16:04:02 +02:00
Vladimír Čunát 1a856c200d Updated transmission to 2.52. 
svn path=/nixpkgs/trunk/; revision=34545
 2012-06-18 15:18:45 +00:00
Lluís Batlle i Rossell 19be0c1f27 Updating skype from 2.2 to 4.0 
svn path=/nixpkgs/trunk/; revision=34544
 2012-06-18 12:39:44 +00:00
Lluís Batlle i Rossell 8a79b20781 Fixing the firefox 13 crash of plugin-container, using wrapProgram instead of patchelf. 
svn path=/nixpkgs/trunk/; revision=34543
 2012-06-18 11:10:43 +00:00
Lluís Batlle i Rossell 71882eb193 Fixing bad version in xulrunner for firefox 13. 
svn path=/nixpkgs/trunk/; revision=34532
 2012-06-17 20:44:49 +00:00
Lluís Batlle i Rossell d3ffbea9d6 Updating firefox 13.0 to 13.0.1. Maybe this improves the flash issue. 
svn path=/nixpkgs/trunk/; revision=34530
 2012-06-17 17:12:31 +00:00
Yury G. Kudryashov 5487fbe94a telepathy-glib-0.18.1 (0.19.x requires glib-2.32.x) 
Drop pkg-config patch, pass pkgconfigUpstream to rakia and salut.

svn path=/nixpkgs/trunk/; revision=34495
 2012-06-13 07:09:23 +00:00
Yury G. Kudryashov 316222e2e1 Mass telepathy update, add telepathy-haze 
svn path=/nixpkgs/trunk/; revision=34494
 2012-06-13 07:09:19 +00:00
Yury G. Kudryashov 28aabd6311 kde-telepathy-0.4.0, tweak update script etc. 
svn path=/nixpkgs/trunk/; revision=34493
 2012-06-13 07:09:15 +00:00
Lluís Batlle i Rossell fece483f5e Updating vimprobable2. 
svn path=/nixpkgs/trunk/; revision=34472
 2012-06-11 20:24:55 +00:00
Mathijs Kwik 25b199771d google-talk-plugin: upgraded to 2.9.10.0 
svn path=/nixpkgs/trunk/; revision=34467
 2012-06-11 17:41:03 +00:00
Yury G. Kudryashov 6b6dba1bce kde-telepathy-0.3.1 
Drop upstream patches already included in this version

svn path=/nixpkgs/trunk/; revision=34402
 2012-06-09 13:09:37 +00:00
Eelco Dolstra f677edf57f * Firefox 13.0. It's not stable yet though - it seems to hang the 
first time a Flash control is loaded, with the following message on
  stderr:

    /nix/store/c5ma4l7nlzcwdkjzrflni58aacqrfs1y-xulrunner-13.0/lib/xulrunner-13.0/plugin-container: symbol lookup error: /nix/store/c5ma4l7nlzcwdkjzrflni58aacqrfs1y-xulrunner-13.0/lib/xulrunner-13.0/plugin-container: undefined symbol: malloc_message

  Need to investigate where malloc_message is defined.

svn path=/nixpkgs/trunk/; revision=34368
 2012-06-06 14:35:56 +00:00
Cillian de Roiste 2d85463e7d Applying patch from Rok Garbas to update weechat to 0.3.7, also taking the opportunity to tidy up the style a bit. 
svn path=/nixpkgs/trunk/; revision=34318
 2012-06-01 22:04:08 +00:00
Eelco Dolstra 503576d277 * Pan 0.137. 
svn path=/nixpkgs/trunk/; revision=34139
 2012-05-16 20:04:56 +00:00
Rickard Nilsson 840b2b013c opera 11.64. 
svn path=/nixpkgs/trunk/; revision=34129
 2012-05-15 21:46:56 +00:00
Eelco Dolstra 87693235b8 * Dropbox updated to 1.4.0. Patch by Michel Alexandre Salim 
<michel@sylvestre.me>.

svn path=/nixpkgs/trunk/; revision=33965
 2012-05-01 16:25:48 +00:00
Eelco Dolstra 48b2a26898 * Firefox 12.0. 
svn path=/nixpkgs/trunk/; revision=33931
 2012-04-26 13:25:20 +00:00
Lluís Batlle i Rossell 86232ad5f7 Updating mldonkey. Upstream picked the patch we had. 
svn path=/nixpkgs/trunk/; revision=33900
 2012-04-24 07:54:57 +00:00
Nicolas Pierron 82b308bf11 Add armv7l support. 
svn path=/nixpkgs/trunk/; revision=33798
 2012-04-15 23:41:25 +00:00
Ludovic Courtès d656d037f2 GNUnet 0.9.2. 
svn path=/nixpkgs/trunk/; revision=33711
 2012-04-09 20:52:05 +00:00
Lluís Batlle i Rossell 5d15ef0e7c Updating vimprobable2 to 1.0.0 
I took mainly the patch from Alexandr Foremny, but I had to solve conflicts.

Moreover it required the old webkit.


svn path=/nixpkgs/trunk/; revision=33596
 2012-04-04 21:30:49 +00:00
Eelco Dolstra bf791214c9 * Thunderbird updated to 11.0.1. 
svn path=/nixpkgs/trunk/; revision=33568
 2012-04-04 15:33:33 +00:00
Florian Friesdorf a09f26e1a2 notmuch-0.12 (thx garbas) 
svn path=/nixpkgs/trunk/; revision=33535
 2012-04-02 10:24:30 +00:00
Eelco Dolstra 63bf8c3a0d * Support the 32-bit version of the Google Talk plugin. 
svn path=/nixpkgs/trunk/; revision=33533
 2012-04-02 09:59:25 +00:00
Eelco Dolstra 1d2ec6c314 * Forgot to commit. 
svn path=/nixpkgs/trunk/; revision=33520
 2012-04-01 15:32:48 +00:00
Eelco Dolstra 1405f49820 * With a nice bit of hackery, get the Google Talk plugin to work. Yay 
for proprietary software.  Tested with Firefox and Chrome.

svn path=/nixpkgs/trunk/; revision=33519
 2012-04-01 15:21:30 +00:00
Yury G. Kudryashov 5299c1f6fb svn merge ^/nixpkgs/trunk 
- 1 conflict (gnome-doc-utils)
- final merge before --reintegrate

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33500
 2012-03-31 20:01:40 +00:00
Yury G. Kudryashov ce85d430bc Batch update telepathy-related packages 
Some of these packages need glib-2.30.x, so I commit it to this branch.

Add sofia-sip and telepathy-rakia.

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33475
 2012-03-29 16:33:32 +00:00
Michael Raskin 3decf956d4 Porting a fix from nixpkgs trunk - vimprobable2 now builds (against obsolete WebKit/GTK2) 
svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33467
 2012-03-29 10:30:47 +00:00
Yury G. Kudryashov 3c72ac97eb Fix typo 
svn path=/nixpkgs/trunk/; revision=33466
 2012-03-29 10:17:40 +00:00
Yury G. Kudryashov a87c8d9bee Add telepathy-logger 
svn path=/nixpkgs/trunk/; revision=33457
 2012-03-28 19:23:42 +00:00
Yury G. Kudryashov defd86049c Merge ^/nixpkgs/trunk. 
This merge leads to a big rebuild, but this wouldn't hurt as I'm going to
reintegrate this branch soon.

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33455
 2012-03-28 15:42:42 +00:00
Lluís Batlle i Rossell 00dc25ba43 Making wrapFirefox also propagate the browser to the userenv, so it gets 
the manpages. That's useful for vimperator2 for example.


svn path=/nixpkgs/trunk/; revision=33417
 2012-03-25 20:21:45 +00:00
Lluís Batlle i Rossell 778abfc6c0 Updating vimprobable2. 
svn path=/nixpkgs/trunk/; revision=33416
 2012-03-25 20:16:01 +00:00
Lluís Batlle i Rossell e4443dfc8d Telling hydra to build vimprobable. 
svn path=/nixpkgs/trunk/; revision=33402
 2012-03-25 11:39:43 +00:00
Michael Raskin 99f198ab9f Update/fix Midori 
svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33400
 2012-03-25 11:22:32 +00:00
Arie Middelkoop c2e7aa68e4 Bumb of Chromium version. I've been using this one for a while now. 
svn path=/nixpkgs/trunk/; revision=33348
 2012-03-22 10:29:43 +00:00
Michael Raskin 8dddfbeea6 Update/fix Uzbl 
svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33340
 2012-03-21 19:14:34 +00:00
Shea Levy 0728828fac Remove old Thunderbird with Eelco's blessing 
svn path=/nixpkgs/trunk/; revision=33335
 2012-03-21 17:15:39 +00:00
Shea Levy f67b9d8f2d Thunderbird: Blind update 
svn path=/nixpkgs/trunk/; revision=33320
 2012-03-21 01:26:21 +00:00
Eelco Dolstra b449705587 * Firefox 11 (contributed by Kirill Elagin). Unfortunately it's not 
called "Firefox" anymore when built without official branding.
  Apparently that was a SNAFU in Firefox 10.

svn path=/nixpkgs/trunk/; revision=33319
 2012-03-20 23:59:09 +00:00
Eelco Dolstra f682391220 * Fix Firefox desktop item. Contributed by Kirill Elagin. 
svn path=/nixpkgs/trunk/; revision=33316
 2012-03-20 23:23:00 +00:00
Yury G. Kudryashov 0d90c06ba1 Remove some packages with Qt3 dependency 
kde3.k3b: use kde4.k3b instead
kde3.kphone: there are many other SIP phones
valknut: last version from 2009, doesn't support new ADC protocol
qdu: latest release in 2004, use kde4.filelight

REVIEWBOARD:5

svn path=/nixpkgs/trunk/; revision=33273
 2012-03-19 18:31:02 +00:00
Yury G. Kudryashov 062d040413 Let hydra build telepathy-salut 
svn path=/nixpkgs/trunk/; revision=33216
 2012-03-17 20:57:24 +00:00
Yury G. Kudryashov 11410436e5 Let hydra build kde-telepathy 
svn path=/nixpkgs/trunk/; revision=33210
 2012-03-17 17:35:29 +00:00
Yury G. Kudryashov 776bedbb5f Remove some files not reachable from all-packages.nix 
List of removed files:
* pkgs/applications/misc/kiwixbuilder/default.nix
* pkgs/applications/misc/simgrid/default.nix
* pkgs/applications/networking/instant-messengers/carrier/2.4.2.nix
* pkgs/applications/networking/mailreaders/thunderbird/7.x.nix
* pkgs/applications/networking/mailreaders/thunderbird/thunderbird-build-deps.patch
* pkgs/development/libraries/bluez-libs/default.nix
* pkgs/development/libraries/libjingle/0.4.0.nix
* pkgs/development/perl-modules/Font-TTF/default.nix
* pkgs/tools/X11/xauth/default.nix
* pkgs/tools/security/p0f/default.nix
* pkgs/tools/security/p0f/p0f.patch

svn path=/nixpkgs/trunk/; revision=33205
 2012-03-17 17:20:30 +00:00
Yury G. Kudryashov f0925eeded pidgin-2.10.2 
Use rec to prevent "name != src.basename" in the future.
REVIEW:6

svn path=/nixpkgs/trunk/; revision=33204
 2012-03-17 17:12:48 +00:00
Florian Friesdorf 88e5f7e2c7 conkeror-1.0pre-20120316 
svn path=/nixpkgs/trunk/; revision=33185
 2012-03-17 09:18:11 +00:00
Florian Friesdorf 9fd94809e5 notmuch-0.11.1 
svn path=/nixpkgs/trunk/; revision=33184
 2012-03-17 09:18:06 +00:00
Yury G. Kudryashov 0ebb258668 telepathy: don't include unstable in full 
svn path=/nixpkgs/trunk/; revision=33179
 2012-03-16 22:22:50 +00:00
Cillian de Roiste 0546a7e79a Updating mumble to 1.2.3 and adding pkgconfig as an input as it fails to build without it. 
svn path=/nixpkgs/trunk/; revision=33169
 2012-03-16 19:19:00 +00:00
Yury G. Kudryashov 2aed4ebe88 Add telepathy-salut 
svn path=/nixpkgs/trunk/; revision=33143
 2012-03-16 06:58:03 +00:00
Yury G. Kudryashov fe1115caf4 Make nixpkgs ready for gst_all attrset removal 
svn path=/nixpkgs/trunk/; revision=33092
 2012-03-14 22:44:52 +00:00
Yury G. Kudryashov 03875e0bce Make nixpkgs ready to gtkLibs attrset removal 
svn path=/nixpkgs/trunk/; revision=33091
 2012-03-14 22:44:41 +00:00
Yury G. Kudryashov 68fe867e19 Get rid of most references to gtkLibs 
svn path=/nixpkgs/trunk/; revision=33088
 2012-03-14 21:57:32 +00:00
Yury G. Kudryashov f105c2353b Pass libgnome_keyring, not gnome_keyring 
svn path=/nixpkgs/trunk/; revision=33082
 2012-03-14 19:35:55 +00:00
Yury G. Kudryashov 044361ec18 Pass qt_gstreamer to ktp-call-ui 
svn path=/nixpkgs/trunk/; revision=33080
 2012-03-14 19:35:46 +00:00
Yury G. Kudryashov 7a31872261 Add kde4.telepathy.call_ui 
Very experimental, fails to build (missing deps)

svn path=/nixpkgs/trunk/; revision=33077
 2012-03-14 19:35:30 +00:00
Yury G. Kudryashov 0a7c3ff061 Add telepathy-mission-control 
svn path=/nixpkgs/trunk/; revision=33066
 2012-03-14 16:28:11 +00:00
Yury G. Kudryashov 4874ff1144 Move some IM clients to instant-messengers/ 
svn path=/nixpkgs/trunk/; revision=33065
 2012-03-14 15:41:44 +00:00
Yury G. Kudryashov dc2d99ec96 Move telepathy-gabble to applications 
svn path=/nixpkgs/trunk/; revision=33064
 2012-03-14 15:41:37 +00:00
Yury G. Kudryashov cddd413130 Add KDE-Telepathy 
It compiles but I haven't tried to run it.

svn path=/nixpkgs/trunk/; revision=33063
 2012-03-14 09:52:21 +00:00
Eelco Dolstra c6ac45f832 * Tribler updated to 5.5.21. 
svn path=/nixpkgs/trunk/; revision=33036
 2012-03-13 17:35:11 +00:00
Yury G. Kudryashov 11f64b0449 rekonq-0.9.0-1 needs pkg-config 
svn path=/nixpkgs/trunk/; revision=32865
 2012-03-07 22:06:29 +00:00
Yury G. Kudryashov ce5a0fdf68 rekonq-0.9.0-1 
svn path=/nixpkgs/trunk/; revision=32825
 2012-03-06 13:08:46 +00:00
Yury G. Kudryashov 57fd764a39 svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32792
 2012-03-05 10:00:23 +00:00
Eelco Dolstra c1b59aa71d * Firefox 10.0.2. 
svn path=/nixpkgs/trunk/; revision=32776
 2012-03-04 16:34:01 +00:00
Yury G. Kudryashov 0210e20b5a svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32713
 2012-03-01 07:04:39 +00:00
Arie Middelkoop 45120513fb Cosmetic changes to newsreaders/kwooty and dropbox expressions. 
svn path=/nixpkgs/trunk/; revision=32689
 2012-02-29 12:54:35 +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
Arie Middelkoop 72450d9b73 Added dropbox (binary). 
svn path=/nixpkgs/trunk/; revision=32545
 2012-02-24 17:53:19 +00:00
Arie Middelkoop 2c7845859f Added the irc proxy "bip". 
svn path=/nixpkgs/trunk/; revision=32529
 2012-02-23 23:47:26 +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
Peter Simons 31e7a2ce7a gecko-mediaplayer: updated to version 1.0.5 
I hoped this update would fix the build errors, but in fact it didn't. :-(

svn path=/nixpkgs/trunk/; revision=32518
 2012-02-23 18:32:42 +00:00
Peter Simons 7c2ca58329 xchat: fixed trivial syntax error 
svn path=/nixpkgs/trunk/; revision=32516
 2012-02-23 17:56:52 +00:00
Lluís Batlle i Rossell 211be0db63 Tell hydra to build xchat 
svn path=/nixpkgs/trunk/; revision=32515
 2012-02-23 16:20:09 +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
Yury G. Kudryashov 313a029f16 svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32396
 2012-02-19 11:16:24 +00:00
Eelco Dolstra cdece69773 * Fix building Firefox 3.6 with GCC 4.6. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32387
 2012-02-18 18:07:22 +00:00
Eelco Dolstra 2eb0d0f246 * Chatzilla updated to 0.9.88. 
svn path=/nixpkgs/trunk/; revision=32384
 2012-02-18 17:11:57 +00:00
Yury G. Kudryashov 79d0d410cb svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32350
 2012-02-17 13:43:31 +00:00
Yury G. Kudryashov 950d8f5d60 linphone: set meta.platforms 
svn path=/nixpkgs/trunk/; revision=32345
 2012-02-17 13:03:37 +00:00
Yury G. Kudryashov 84c3137a96 linphone: use external mediastreamer 
svn path=/nixpkgs/trunk/; revision=32344
 2012-02-17 13:03:33 +00:00
Yury G. Kudryashov e5027e5b36 svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32330
 2012-02-16 15:02:26 +00:00
Eelco Dolstra 95e87e71c5 * Tribler: optionally support streaming playback of torrents via VLC. 
svn path=/nixpkgs/trunk/; revision=32306
 2012-02-15 16:24:02 +00:00
Eelco Dolstra c29e492417 * Tribler updated to to 5.5.13. 
svn path=/nixpkgs/trunk/; revision=32299
 2012-02-15 15:39:12 +00:00
Peter Simons 02eaa57b56 merge latest changes from trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32270
 2012-02-14 13:47:27 +00:00
Cillian de Roiste 1c885d3dee Updating to 2.10.1, security fixes and also fixes #14351 'multiple display of room members' 
svn path=/nixpkgs/trunk/; revision=32267
 2012-02-14 09:56:46 +00:00
Lluís Batlle i Rossell af1b08ac32 Updating firefox to 10.0.1. I'll let hydra build it. 
svn path=/nixpkgs/trunk/; revision=32266
 2012-02-13 21:04:39 +00:00
Yury G. Kudryashov fc21cca549 svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32231
 2012-02-12 09:33:54 +00:00
Arie Middelkoop af2f845060 Kwooty binary newsreader version bump 0.8.0 -> 0.8.1. 
Newer version builds against the updated dependencies of the package.

svn path=/nixpkgs/trunk/; revision=32226
 2012-02-11 09:06:09 +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
Yury G. Kudryashov c84eb70b51 Latest exosip and linphone 
svn path=/nixpkgs/trunk/; revision=32172
 2012-02-10 10:13:48 +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
Florian Friesdorf af8aceb847 notmuch cosmetical change 
svn path=/nixpkgs/trunk/; revision=32121
 2012-02-07 17:39:59 +00:00
Yury G. Kudryashov 215a07c1a9 svn merge ^/nixpkgs/trunk 
Merge conflicts:
* unzip (almost trivial)
* dvswitch (trivial)
* gmp (copied result of `git merge`)

The last item introduced gmp-5.0.3, thus full rebuild.
+ensureDir->mkdir -p in TeX packages was catched by git but not svn.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32091
 2012-02-06 23:03:12 +00:00
Peter Simons 4e3dcd9254 esniper: updated to version 2.27.0 
svn path=/nixpkgs/trunk/; revision=32087
 2012-02-06 21:26:46 +00:00
Michael Raskin 8bae3c51ff Add Firefox 11beta 
svn path=/nixpkgs/trunk/; revision=32048
 2012-02-06 08:28:24 +00:00
Lluís Batlle i Rossell cf2591c5ec Updating rdesktop to 1.7.1 
svn path=/nixpkgs/trunk/; revision=31993
 2012-02-03 16:16:18 +00:00
Eelco Dolstra 9d9e33b98d * Added Firefox 10.0. P.S. it seems that Firefox 10 no longer needs 
--enable-official-branding to get a browser that calls itself
  "Firefox".  But I'll leave the flag in for the moment.
* Removed Firefox 8.0.

svn path=/nixpkgs/trunk/; revision=31984
 2012-02-02 15:44:22 +00:00
Yury G. Kudryashov 2b3fb5a824 Merge two nix exprs for links2, upgrade to 2.5 
svn path=/nixpkgs/trunk/; revision=31962
 2012-02-01 22:33:35 +00:00
Arie Middelkoop cc145f2ae9 Update of skype expression: make the use of pulse audio optional based on the configuration setting for pulse audio (off by default). 
Removing pulse audio from the build inputs when it is not used prevents the bug of Skype taking 100% cpu from showing up.
This demonstrates nicely nix' features: in other distributions the recomended solution was to remove read permission from the
pulse audio libs.

svn path=/nixpkgs/trunk/; revision=31959
 2012-02-01 22:09:35 +00:00
Yury G. Kudryashov 3256c40575 svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=31878
 2012-01-27 11:48:58 +00:00
Arie Middelkoop 7c8ab92620 kwooty expression: slight improvement of the build inputs. 
svn path=/nixpkgs/trunk/; revision=31873
 2012-01-26 23:24:40 +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
Arie Middelkoop f9fabb4626 added kwooty: a binary newsreader (kde). 
svn path=/nixpkgs/trunk/; revision=31829
 2012-01-24 22:09:17 +00:00
Karn Kallio 8e00bbb06b Get kadu to compile with kde48 (as well as kde47). 
svn path=/nixpkgs/trunk/; revision=31800
 2012-01-24 00:00:41 +00:00
Karn Kallio 39206f5b44 Get psi to compile with kde47 and kde48. 
svn path=/nixpkgs/trunk/; revision=31799
 2012-01-24 00:00:34 +00:00
Florian Friesdorf a8a8f5df23 notmuch-0.11 
svn path=/nixpkgs/trunk/; revision=31767
 2012-01-21 18:29:11 +00:00
Florian Friesdorf 2d0a86d057 conkeror-1.0pre-20120105 
svn path=/nixpkgs/trunk/; revision=31761
 2012-01-21 18:28:51 +00:00
Florian Friesdorf c9a2081809 conkeror, added myself as maintainer 
svn path=/nixpkgs/trunk/; revision=31760
 2012-01-21 18:28:48 +00:00
Florian Friesdorf 0c01cddb03 chromium 18.0.975.0-pre114925 
svn path=/nixpkgs/trunk/; revision=31759
 2012-01-21 18:28:44 +00:00
Florian Friesdorf 98613aa43d chromium, added myself as maintainer 
svn path=/nixpkgs/trunk/; revision=31758
 2012-01-21 18:28:39 +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
Eelco Dolstra d4d7931a62 * Cleanup: remove obsolete references to ‘xz’, which is in stdenv now. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=31678
 2012-01-18 20:53:01 +00:00
Ludovic Courtès ed221cf4cc GNUnet 0.9.1. 
svn path=/nixpkgs/trunk/; revision=31677
 2012-01-18 20:53:00 +00:00
Peter Simons 1e4a7842d2 rsync: optional feature (disabled by default) to sync devices 
I use this feature for doing snapshot backups, which is way faster
than copying a huge files tree.

The patch is semi-official, rsync-patches is maintained by rsync
upstream itself.
The patch doesn't affect any behaviour, it only adds 1 option
so it shouldn't affect you if you don't use it.

svn path=/nixpkgs/trunk/; revision=31659
 2012-01-18 20:38:24 +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
Eelco Dolstra 48ee2523da * Sync with the trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=31633
 2012-01-18 15:53:12 +00:00
Alexander Tsamutali 6b174cfb82 applications/networking/remote/freerdp: Updated to 1.0.0. 
svn path=/nixpkgs/trunk/; revision=31620
 2012-01-18 13:45:46 +00:00
Michael Raskin 6fd326a636 Remove obsolete phase 
svn path=/nixpkgs/trunk/; revision=31618
 2012-01-18 10:27:48 +00:00
Michael Raskin a975a35254 Update Vacuum-IM 
svn path=/nixpkgs/trunk/; revision=31617
 2012-01-18 10:26:38 +00:00
Arie Middelkoop ef07990836 Update of the 'thunderbird' package to 9.0.1. 
Note: this update simplified the nix expression, as some of the problems mentioned in
the original expression do not seem present anymore.

Also note: the original expression did not compile in combination with the 3.1 kernel. 

svn path=/nixpkgs/trunk/; revision=31615
 2012-01-17 22:43:26 +00:00
Yury G. Kudryashov 0c79434ccb svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=31567
 2012-01-14 21:34:37 +00:00
Arie Middelkoop edc1c525ba Removed some debugging info that I forgot to remove *oops*. 
svn path=/nixpkgs/trunk/; revision=31525
 2012-01-13 22:31:42 +00:00
Arie Middelkoop 0368987722 Desktopitem for the Skype package. 
svn path=/nixpkgs/trunk/; revision=31522
 2012-01-13 22:21:48 +00:00
Lluís Batlle i Rossell 1c186a3207 Making 'withGpg' optional in centerim. 
svn path=/nixpkgs/trunk/; revision=31504
 2012-01-12 19:00:35 +00:00
Lluís Batlle i Rossell 72aa6f5ffc Adding centerim. 
svn path=/nixpkgs/trunk/; revision=31503
 2012-01-12 18:55:08 +00:00
Arie Middelkoop 9cea0dd1c6 Update of XChat to 2.8.8; old version 2.8.4 does not compile. 
svn path=/nixpkgs/trunk/; revision=31485
 2012-01-11 22:32:17 +00:00
Alexander Tsamutali b61e32f19d google-talk-plugin: Updated x86_64 hash. 
svn path=/nixpkgs/trunk/; revision=31470
 2012-01-10 20:04:37 +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
Yury G. Kudryashov 900c6e18cd svn merge ^/nixpkgs/trunk 
Conflicts: openssl, libplist

svn path=/nixpkgs/branches/stdenv-updates/; revision=31337
 2012-01-06 01:07:45 +00:00
Lluís Batlle i Rossell b1ba53e50d Adding vimprobable2. Patch by Alexander Forenmy. 
svn path=/nixpkgs/trunk/; revision=31303
 2012-01-04 22:12:43 +00:00
Yury G. Kudryashov 2bca92e32d Merge trunk 
Conflicts:
1. cmake upgrade: use 2.8.7
2. openssl: left FreeBSD-asm patch.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31245
 2012-01-03 17:25:24 +00:00
Eelco Dolstra ab13fb0c34 * Firefox updated to 9.0.1. 
svn path=/nixpkgs/trunk/; revision=31236
 2012-01-03 15:18:03 +00:00
Yury G. Kudryashov f77741e018 merge trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=31067
 2011-12-25 05:47:23 +00:00
Eelco Dolstra 63c643d072 * Firefox 9.0. 
svn path=/nixpkgs/trunk/; revision=30985
 2011-12-20 14:51:26 +00:00
Yury G. Kudryashov a670a7aca1 merge trunk 
A few conflicts due to renames

svn path=/nixpkgs/branches/stdenv-updates/; revision=30947
 2011-12-16 22:57:21 +00:00
Yury G. Kudryashov 2c3b02169f rekonq-0.8.1 
svn path=/nixpkgs/trunk/; revision=30930
 2011-12-16 10:48:59 +00:00
Yury G. Kudryashov 0971831ddc Reintegrate branches/drop-kde4.5 
svn path=/nixpkgs/trunk/; revision=30928
 2011-12-16 10:39:22 +00:00
Yury G. Kudryashov b077940b3b svn merge https://nixos.org/repos/nix/nixpkgs/trunk 
No conflicts

svn path=/nixpkgs/branches/stdenv-updates/; revision=30916
 2011-12-15 19:16:38 +00:00
Alexander Tsamutali 7e82cfb7d6 Added support for Quake Live to Firefox wrapper. 
svn path=/nixpkgs/trunk/; revision=30856
 2011-12-12 17:25:51 +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
Peter Simons a856742950 torchat: tell Hydra that it shouldn't attempt to build that package an Cygwin (fails with an assertion) 
svn path=/nixpkgs/trunk/; revision=30833
 2011-12-11 18:35:20 +00:00
Piotr Pietraszkiewicz 6cb70eea88 upgraded to kadu-0.10.1 
svn path=/nixpkgs/trunk/; revision=30781
 2011-12-06 19:11:15 +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 72e5c8176e rsync: stripped trailing whitespace 
svn path=/nixpkgs/trunk/; revision=30715
 2011-12-03 16:11:57 +00:00
Peter Simons 74d6145917 rsync: added meta.maintainers section 
svn path=/nixpkgs/trunk/; revision=30714
 2011-12-03 16:11:54 +00:00
Lluís Batlle i Rossell 0160f222cc Adding flashplayer11. It builds fine for me on x86_64. 
Patch by Eduard Carreras.


svn path=/nixpkgs/trunk/; revision=30712
 2011-12-03 15:16:17 +00:00
Lluís Batlle i Rossell b330b79160 Updating rsync. 
svn path=/nixpkgs/trunk/; revision=30707
 2011-12-02 23:14:09 +00:00
Ludovic Courtès 57b602b5ae Remove GNU IceCat 4, which never built. 
svn path=/nixpkgs/trunk/; revision=30660
 2011-12-01 22:43:17 +00:00
Eelco Dolstra a7b50dc5de * Do an "exec" to get rid of an unnecessary shell. 
svn path=/nixpkgs/trunk/; revision=30566
 2011-11-25 17:01:54 +00:00
Eelco Dolstra ec390f4bbb * Fix incorrect URL. 
svn path=/nixpkgs/trunk/; revision=30548
 2011-11-24 14:22:13 +00:00
Eelco Dolstra 7a7fb5bc5a * Firefox 8.0.1. 
* Make Firefox 8 the default.

svn path=/nixpkgs/trunk/; revision=30546
 2011-11-24 11:55:15 +00:00
Florian Friesdorf 50bfde368e notmuch use license path instead of string 
svn path=/nixpkgs/trunk/; revision=30498
 2011-11-20 21:49:06 +00:00
Florian Friesdorf b555892dff notmuch-0.9 
svn path=/nixpkgs/trunk/; revision=30491
 2011-11-20 19:22:53 +00:00
Evgeny Egorochkin 351ff3583d TorChat: packaged 
svn path=/nixpkgs/trunk/; revision=30480
 2011-11-19 17:12:00 +00:00
Rob Vermaas a456047fc1 update chrome 
svn path=/nixpkgs/trunk/; revision=30462
 2011-11-18 02:40:33 +00:00
Peter Simons 1a4f43c7b3 wireshark: updated to version 1.6.2 
svn path=/nixpkgs/trunk/; revision=30426
 2011-11-14 15:11:23 +00:00
Lluís Batlle i Rossell 45388a9ae1 Updating aMSN. 
svn path=/nixpkgs/trunk/; revision=30420
 2011-11-14 09:59:26 +00:00
Michael Raskin 94149403e5 Firefox 9.0beta1 
svn path=/nixpkgs/trunk/; revision=30391
 2011-11-12 09:38:31 +00:00
Eelco Dolstra c8da189d39 * Added Firefox 8.0. 
* Removed Firefox 6.

svn path=/nixpkgs/trunk/; revision=30382
 2011-11-10 23:06:58 +00:00
Peter Simons 368ac01473 synchronize with trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=30316
 2011-11-08 10:18:35 +00:00
Peter Simons dd8a7b38db esniper: fixed build with current version of curl 
svn path=/nixpkgs/trunk/; revision=30299
 2011-11-07 17:48:51 +00:00
Lluís Batlle i Rossell c95d373b68 Patching gtmess; it did not build on arm. 
svn path=/nixpkgs/trunk/; revision=30230
 2011-11-04 18:10:44 +00:00
Lluís Batlle i Rossell 6d9179983b Semicolon 
svn path=/nixpkgs/trunk/; revision=30222
 2011-11-04 10:35:21 +00:00
Lluís Batlle i Rossell 0f0ca48a8d Adding gtmess 
svn path=/nixpkgs/trunk/; revision=30221
 2011-11-04 10:28:18 +00:00
Peter Simons 69488d688d synchronize with trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=30186
 2011-11-02 10:28:32 +00:00
Shea Levy 3447d62e64 pidgin-sipe: Bump to 1.12.0 
svn path=/nixpkgs/trunk/; revision=30177
 2011-11-02 00:19:19 +00:00