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

969 commits

Author SHA1 Message Date
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