1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 21:50:55 +00:00
Commit graph

4408 commits

Author SHA1 Message Date
Shea Levy acd4299e75 Merge branch 'master' into stdenv-updates
Conflicts:
	pkgs/applications/networking/browsers/chromium/default.nix
	pkgs/top-level/all-packages.nix

Merge conflicts seemed trivial, but a look from viric and aszlig would be nice.
2013-02-21 11:13:30 -05:00
aszlig b7cbb4da11
chromium: Force -fno-stack-protector for v25.
So, this is our sledgehammer, forcing -fno-stack-protector for every gcc/g++ in
the univ... Chromium build. Of course this is a somewhat nasty fix and there
should be a real fix somewhere in Chromium 26. But instead of wandering around
and picking cherries, we now go out for the slaughter until someone brings us
the damn cherries because we are FUURRRIII... no well... time for sleep :-)

May the mighty Hydra be with us!

Thanks to our great fellow @cillianderoiste, for joining the battle with his
almighty battle axe, crushing and burning some CPUs.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Tested-by: Cillian de Róiste <cillian.deroiste@gmail.com>
2013-02-21 15:23:03 +01:00
aszlig 857135c59a
chromium: Use system protobuf for versien 25.
This should at least mitigate our build error to only occur in v8 anymore.
Unfortunately we can't use v8 from nixpkgs right now, so we're going to put out
our sledgehammer in the next commit. Meanwhile, it doesn't hurt to get rid of
the bundled protobuf library, so let's do it.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-02-21 15:23:03 +01:00
Vladimír Čunát 91f559b7b5 Merge pull request #326 from bjornfor/evtest
Add evtest, a simple tool for input event debugging
2013-02-21 00:51:49 -08:00
aszlig 3a23e63dbf
chromium: Use system libvpx for version 25.
Unfortunately, we have build errors for version 25 in the bundled libvpx:

http://hydra.nixos.org/build/4173075
http://hydra.nixos.org/build/4173066

As I can't reproduce this on my local system (I've disabled the option
CONFIG_CC_STACKPROTECTOR here), let's just hope that libvpx is the only part
that fails during build because of this.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-02-21 08:51:38 +01:00
aszlig 7e5109a541
chromium: Update dev channel to v26.0.1410.5.
The upgrade currently doesn't involve the -lite package, as we need to use a few
more dependencies from nixpkgs first before we can finally fully switch over to
the lite package, even though the update script will try to fetch it anyway.

In this update, one particular problem that arises in conjuction with the
seccomp BPF sandbox is caused by this commit:

https://chromiumcodereview.appspot.com/12209029

Which particularily filters flags to the clone() syscall. I've spent (wasted?) a
few hours figuring out the troublesome flag, eventually figuring it out and -
just by curiousity ("Do other distributions have the same problem?") - searched
the web for "chromium CLONE_DETACHED" and BEHOLD...

A post from our OWN mailinglist pops up with the same patch I intended to do:

http://article.gmane.org/gmane.linux.distributions.nixos/10356

So shame on me for not being subscribed to the mailing list, and big thanks to
Ian Farmer for the patch.

As a consequence I'm now subscribed.

So, back to chromium itself, version 26 builds fine and works so far without
much (more to come in later commits) trouble.

We also had to introduce three more dependencies:

 * protobuf: This one is because we don't need to use the bundled one anymore,
             so we can use the version in nixpkgs.
 * speechd: Not sure whether this was bundled or not, but let's use nixpkgs
            version as well to keep down build time.
 * libXdamage: Needed for screen capturing support.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-02-20 23:40:45 +01:00
aszlig 073c797444
chromium: Update stable and beta channels.
stable: 24.0.1312.69 -> 24.0.1312.70 (builds fine, tested)
beta: 25.0.1364.68 -> 25.0.1364.84 (builds fine, tested)

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-02-20 23:40:45 +01:00
Bjørn Forsman 224a5ea9da Add evtest, a simple tool for input event debugging 2013-02-20 21:17:32 +01:00
Shea Levy aacca1902c Merge branch 'upstream-master' into stdenv-updates 2013-02-19 10:09:39 -05:00
Eelco Dolstra 2b5aff10b9 psimedia: Fix building against current kernel headers
http://hydra.nixos.org/build/4127993
2013-02-19 12:46:52 +01:00
Rok Garbas 13fcbc7baf notmuch: update from 0.14 to 0.15 2013-02-19 04:46:47 +01:00
Song Wenwu 679150157b emacs: add "auto-complete-clang-async" mode (aka emacs-clang-complete-async) 2013-02-18 21:06:29 +08:00
Peter Simons 9e68734d61 Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-02-18 11:54:56 +01:00
Peter Simons b076ab94d6 git-annex: update to version 3.20130216 2013-02-18 11:20:46 +01:00
Peter Simons 33b130ee69 ikiwiki: update to version 3.20130212 2013-02-18 11:11:34 +01:00
Rok Garbas 614e9b65a0 Merge pull request #318 from iElectric/xbmc-nasm
add nasm to xbmc dependencies
2013-02-17 15:46:17 -08:00
Shea Levy c42d77aa35 Merge remote-tracking branch 'upstream/master' into stdenv-updates 2013-02-17 08:19:40 -05:00
Vladimír Čunát 9885d04033 Revert "WIP", sorry, I got confused, somehow
This reverts commit 524d9b656e.
2013-02-17 11:02:25 +01:00
Vladimír Čunát 524d9b656e WIP 2013-02-17 11:01:20 +01:00
Domen Kozar 6506f9b070 add nasm to xbmc dependencies 2013-02-16 23:23:15 +01:00
Vladimír Čunát aaf607c5dc linphone: minor update and fix 2013-02-16 21:48:47 +01:00
Cillian de Róiste 48d8ab884c Fix Hydrogen to build with JACK 1.9.9.5
This patches the Hydrogen scons build script to work a failure to
parse the JACK version correctly. If I understand correctly upstream
Hydrogen now uses cmake instead of Scons, so this shouldn't be a
problem with the next Hydrogen release.
2013-02-16 21:08:15 +01:00
Eelco Dolstra a25b27a7f8 buildNativeInputs -> nativeBuildInputs 2013-02-15 13:38:07 +01:00
Eelco Dolstra 2aa6f262cb Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-02-15 13:36:34 +01:00
Vladimír Čunát 34e86bccff Merge pull request #306 from maggesi/hol_light_updates
HOL light updates
2013-02-14 12:43:35 -08:00
Lluís Batlle i Rossell 6ee6cd5ec9 Updates: kdenlive-0.9.4 mlt-0.8.8
Upstream kdenlive suggests mlt-0.8.8.
2013-02-14 20:06:54 +01:00
Vladimír Čunát 0d6bb2b51a meshlab: fix forgotten qt47 2013-02-14 14:38:23 +01:00
Vladimír Čunát e976bcffca inkscape: bugfix update 2013-02-14 14:34:20 +01:00
aszlig ec9c096e25
flashplayer-11: Update to version 11.2.202.262.
This update contains security fixes for two vulnerabilities, for details please
have a look at:

http://www.adobe.com/support/security/bulletins/apsb13-04.html

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-02-12 10:42:19 +01:00
Peter Simons 801237ceb2 xmonad: install man page into the proper location 2013-02-11 23:26:06 +01:00
Peter Simons 2191cbb0a1 haskell-darcs: update to version 2.8.4 2013-02-09 18:24:50 +01:00
Marco Maggesi 42a4178c2b Update HOL Light to revision 155 2013-02-08 15:26:35 +01:00
Marco Maggesi 34411286a6 Update HOL Light to revision 154 2013-02-08 15:20:06 +01:00
aszlig 265fea5788
google-talkplugin: Note how to get latest version.
This is just in order to make it easier to determine the latest upstream version
from the Packages file of Google's APT repository.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-02-08 08:45:15 +01:00
aszlig 59d79e97e8
virtualbox: Fix unpacking of extension pack.
This fixes a typo introduced by 5a3f9c08b0.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-02-08 07:03:36 +01:00
aszlig dd832a3e8f
chromium: Update beta channel to v25.0.1364.68.
This update is a bit more problematic, as the bundled version of libpng is
version 1.2.45 and the version in nixpkgs is 1.5.13. Even if trying to run with
libpng12 from nixpkgs, it seems to collide with parts of the bundled version.

So, until this is either fixed upstream or we have a good solution, we're using
bundled libpng for chromium version 25 and higher.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-02-08 07:03:36 +01:00
aszlig 9b726e94a8
chromium: Update stable channel to v24.0.1312.69.
Let's begin with the most trivial one: The stable version.
This version just contains a few bug fixes and builds fine so far.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-02-08 07:03:36 +01:00
aszlig 01cbb17c12
chromium: Fix updater to handle versions > 26.
Starting with version 26, there is a chromium-$version-lite package and it is an
LZMA archive as well, so download size is reduced by about 44%.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-02-08 07:03:36 +01:00
Shea Levy 8f51038a13 qemu-1.3.1
Also, old qemu is unreferenced in nixos and nixpkgs tree, so remove it absent explicit need.
2013-02-07 20:44:02 -05:00
Shea Levy 5e11e727ca Merge branch 'virt' of https://github.com/aristidb/nixpkgs 2013-02-07 18:09:40 -05:00
Rob Vermaas 2656f1df25 Fix Firefox 13.0 URL. 13.0 is still used by selenium. 2013-02-07 22:19:09 +01:00
Eelco Dolstra 41b4931100 firefox: Update to 18.0.2 2013-02-07 13:47:41 +01:00
Rickard Nilsson b3cfae1acf darktable: Update to 1.1.2 2013-02-06 01:26:24 +01:00
Rickard Nilsson cb4c42e9c3 gnumeric: Update to 1.12.0
Also update dependencies (goffice, libgsf) to required versions.
2013-02-06 01:26:24 +01:00
Aristid Breitkreuz 07c64a7a6c virtinst: could not find python modules, add python wrapper 2013-02-05 18:16:50 +01:00
Vladimír Čunát 19721fe792 vim: fix a typo from commit ab3eea 2013-02-05 17:51:30 +01:00
Александр Цамутали 52d265fd12 applications/audio/guitarix: New nixpkg. 2013-02-03 20:36:32 +04:00
Александр Цамутали 5784dbb095 qjackctl: Update to 0.3.9, --enable-jack-version 2013-02-03 19:58:11 +04:00
Lluís Batlle i Rossell 511f3b7a61 Adding mplayer2, a mplayer fork.
It can play files very well with "vdpau". It has a reworked
vdpau pipeline compared to mplayer1. Mplayer1 fails to play well in
my computer.
2013-01-31 00:26:30 +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