Commit graph

4089 commits

Author SHA1 Message Date
aszlig
6dd94d680a
Merge minor updates from jcumming.
This merges branches 'libarchive.121020', 'gphoto2.121020' and 'ncmpcpp.121020'
of git://github.com/jcumming/nixpkgs.

Octopus merge of @jcumming's minor updates, apart flrom updating the version, a
few other changes were made to these packages as well:

 * libarchive: Now depends on xz.
 * libgphoto: License changed to LGPL 2.1 plus.

And he did an overhaul of some of the meta blocks as well.

Changes during this merge:

 * Inline and reword stray comment into meta tag in
   1db34880d7 (libgphoto).

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-10-21 12:26:29 +02:00
Jack Cummings
1db34880d7 - gphoto2-2.4.14, libgphoto2-2.4.14 2012-10-20 21:59:25 -07:00
Jack Cummings
fe6d7bc907 - ncmpcpp 0.5.10 2012-10-20 21:32:25 -07:00
Peter Simons
094cbf9b4d Move lxc from "applications/virtualization" to "os-specific/linux". 2012-10-20 12:36:44 +02:00
Peter Simons
04d13e193e lxc: fix documentation build and make version 0.8.0-rc2 the default 2012-10-20 12:11:09 +02:00
Eduard Carreras
76d8f6b7be VLC: update to v2.0.4 2012-10-19 18:57:19 +02:00
Peter Simons
a29717f41f stellarium: update to version 0.11.4 2012-10-19 10:19:41 +02:00
Peter Simons
24ec840736 wxmaxima: update to version 12.09.0 2012-10-19 10:12:31 +02:00
Peter Simons
5c59edb8f4 maxima: update to version 5.28.0 2012-10-19 10:12:31 +02:00
Peter Simons
58f3e47166 git: update to version 1.7.12.4 2012-10-19 10:08:07 +02:00
Rickard Nilsson
ae573d8501 skype: Fix syntax error in .desktop-file 2012-10-19 09:53:06 +02:00
Peter Simons
278601befb Merge pull request #154 from ecarreras/synergy-foss
Synergy foss
2012-10-18 03:18:40 -07:00
Marc Weber
b18be4e5e5 adding csound 2012-10-18 06:24:32 +02:00
Michael Raskin
070f38d48d Update pqiv 2012-10-18 00:34:09 +04:00
Michael Raskin
2867563496 Adding a RC version of LinuX Containers 2012-10-17 23:16:42 +04:00
Michael Raskin
640a13c04c Update Psi 2012-10-17 22:59:41 +04:00
Michael Raskin
3b01ff4591 Update Wireshark 2012-10-17 22:45:54 +04:00
Peter Simons
82e94ccbeb Merge branch 'master' into x-updates 2012-10-16 18:27:27 +02:00
Peter Simons
c90a15a604 git-annex: update to version 3.20121010 2012-10-15 20:17:33 +02:00
Eelco Dolstra
87399d57d6 Doh! Forgot to add file 2012-10-15 14:02:15 -04:00
Eduard Carreras
9962055627 Remove pwd to know where I am 2012-10-15 20:01:45 +02:00
Eduard Carreras
1bf9b9bc7b fix align 2012-10-15 20:00:20 +02:00
Eelco Dolstra
5af277bbd1 Merge remote-tracking branch 'origin/master' into x-updates 2012-10-15 12:16:58 -04:00
Eelco Dolstra
3c2f28c67e firefox: Disable profiling since it adds 12 MB to the build 2012-10-15 12:16:01 -04:00
Eelco Dolstra
55aa7f0d6f sylpheed: Update to 3.2
http://hydra.nixos.org/build/3156892
2012-10-15 11:27:37 -04:00
Eelco Dolstra
b377586b7a Fix psi build
hydra.nixos.org/build/3154247
2012-10-15 10:52:53 -04:00
Eduard Carreras
94471a459f Updated synergy to 1.4.10-foss 2012-10-15 14:26:44 +02:00
viric
4e2da16eee Merge pull request #149 from falsifian/upgrade_firefox
Update Firefox 16.0 to 16.0.1, and switch to the high-bandwidth releases.mozilla.org for the source.
2012-10-12 12:22:01 -07:00
Rok Garbas
06eff3c860 weechat: update to 0.3.9 2012-10-12 20:07:20 +02:00
James Cook
cfebdffd58 firefox 16: Use the published sha1, and pass the ftp url to fetchurl as a fallback. 2012-10-12 10:59:33 -07:00
Peter Simons
f77a2f460a Merge branch 'master' into x-updates. 2012-10-12 15:24:24 +02:00
James Cook
9e6e5391ad Update Firefox 16.0 to 16.0.1, and switch to the high-bandwidth releases.mozilla.org for the source. 2012-10-11 21:49:25 -07:00
aszlig
50faa2cbef
chromium: Update stable and beta channels.
stable: 22.0.1229.79 (build tested)
beta: 22.0.1229.94 (build and usage tested)

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-10-11 12:44:33 +02:00
aszlig
702aec1881
chromium: Use final implementation of BPF patch.
The new version is the one already committed in trunk as revision 160697.
In order to get into beta and stable this could take some while so we're going
need to carry around that patch for some time.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-10-11 12:44:13 +02:00
Sander van der Burg
b8e30a8af6 Changed the netbeans expression to use openjdk, which should work now 2012-10-11 10:31:42 +02:00
Michael Raskin
0bf1789b6a Use newly-added taskwarrior as an update to existing taskwarrior attribute 2012-10-11 10:50:53 +04:00
Cillian de Róiste
bc4d201478 distrho: fix HybridReverb2 2012-10-11 01:23:10 +02:00
Peter Simons
0bb86f86b1 Merge branch 'master' into x-updates. 2012-10-10 19:26:31 +02:00
Peter Simons
64556b022b gravit: update to version 0.5.0 2012-10-10 19:25:42 +02:00
Peter Simons
6ff829f19d Merge branch 'master' into x-updates 2012-10-10 18:46:48 +02:00
Lluís Batlle i Rossell
b8471def24 firefox: adding 16.0. Enabling profiling, to see the new profiling features. 2012-10-10 16:37:20 +02:00
Rickard Nilsson
5dbe17f315 darktable: Update to version 1.0.5 2012-10-09 22:53:38 +02:00
Eelco Dolstra
0b056a06a0 VirtualBox-GuestAdditions: Install drivers for X.org server 1.12 2012-10-09 12:42:10 -04:00
Eelco Dolstra
54aea93a84 inkscape: Update to 0.48.3.1
http://hydra.nixos.org/build/3151653
2012-10-09 12:10:45 -04:00
Eelco Dolstra
b713d13bb4 gnucash: Update to 2.4.11 2012-10-09 11:24:38 -04:00
Sander van der Burg
27cadaa404 Added package for netbeans IDE 2012-10-09 11:40:06 +02:00
Eelco Dolstra
41e9f7cfed Merge remote-tracking branch 'origin/master' into x-updates 2012-10-08 13:48:30 -04:00
aszlig
1983d4fdfc
chromium: Build using libusb (1.0) from nixpkgs.
This dependency has recently been added to chromium while we didn't notice it,
so let's avoid to use the bundled version.

It might make sense to remove the unneeded files in third_party/ based on a
whitelist, so that we notice future changes like this earlier.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-10-08 15:06:15 +02:00
aszlig
692ad8059a
chromium: Build using libexif from nixpkgs.
While libexif has been bundled with chromium for some months already, they only
recently added the GYP option to switch to using the system library. So, let's
enable it.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-10-08 15:05:00 +02:00
aszlig
58a4edd294
chromium: Drop seccomp patch for version 21.
Version 22 is the current version of the stable channel, so we don't need to
carry around a patch for earlier versions.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-10-08 07:35:57 +02:00