Commit Graph

42496 Commits

Author SHA1 Message Date
Oliver Charles
42ae633445 Merge branch 'master' into dbus-switch-to-configuration
Conflicts:
	nixos/modules/system/activation/switch-to-configuration.pl
2014-04-20 19:17:05 +01:00
AndersonTorres
31a94915d2 mpv: minor updates and cleanup
E.g. parameterize lua.
2014-04-20 19:46:21 +02:00
AndersonTorres
193dd39d8c mpv: update to stable version 0.3.7
Also:
* minor waf update (reflecting bootstrap.py)
* lua5_sockets inclusion (not detected yet)
2014-04-20 19:46:21 +02:00
Eelco Dolstra
cf53152902 Fix GRUB 2 example
Fixes #1891.
2014-04-20 19:41:15 +02:00
Eelco Dolstra
4e8c2f0ff9 Merge branch 'systemd-update' 2014-04-20 19:31:01 +02:00
Eelco Dolstra
a0c0dfb647 Revert accidental change 2014-04-20 19:29:53 +02:00
Vladimír Čunát
cb83796abb elfutils: update 0.155 -> 0.158 2014-04-20 18:24:11 +02:00
Vladimír Čunát
b4df087f14 elfutils: fix CVE-2014-0172
Patch taken from upstream mailing-list.
2014-04-20 18:24:11 +02:00
aszlig
18234b6768
chromium: Fix package name for browser derivation.
The packageName attribute defines the output path and binary name of the
product that's going to be created, so we really want to have "chromium"
instead of "chromium-browser" here, especially for the resulting binary.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-04-20 17:46:18 +02:00
aszlig
35944168e4
Merge pull request #1970 from @ambrop72.
We already have a desktop icon from the browser wrapper, so this is only
for people who do not use the wrapper (for example if you don't want to
use Mozilla plugins).

Also, we someday might want to propagate the desktop item to the browser
wrapper as well.

Conflicts:
	pkgs/applications/networking/browsers/chromium/default.nix
2014-04-20 17:46:18 +02:00
aszlig
0517041a2f
chromium: Drop conditionals for version 33.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-04-20 17:45:25 +02:00
aszlig
11b84078c5
chromium/common: Wrap lines to 80 characters.
Yes, it's just a comment and yes, it's so insignificant that everyone
would make a "O_o" face. But I'm getting annoyed by things like this.

Obviously that means no feature changes :-)

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-04-20 17:45:25 +02:00
aszlig
ad770bea67
chromium: Move update.sh back into the main path.
This is to ensure that nothing unexpected will be after the merge of the
refactoring branch, and also my own autoupdate machinery is expecting
this location, so there really is no reason to change it now.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-04-20 17:45:25 +02:00
aszlig
c537fa6da0
chromium: Update beta and dev to latest versions.
beta: 34.0.1847.60 -> 35.0.1916.47 (builds fine, tested)
dev:  35.0.1883.0  -> 36.0.1941.0  (builds fine, tested)

For the new version 36, we needed to rebase our user namespaces sandbox
patch, because http://crbug.com/312380 is preparing for an upstream
implementation of the same functionality.

Also, we need to add ply and jinja2 to the depends on version 36. This
is done unconditionally, because I want to avoid cluttering up the
expressions with various versionOlder checks.

The sandbox binary had to be fixed as well and we no longer use system
zlib, as - who might have guessed it - it's a fast moving target at
Chromium as well.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-04-20 17:45:24 +02:00
Luca Bruno
adc65e998d uzbl: fix gsettings schemas, fix uzbl-tabbed. Closes #2332 2014-04-20 17:40:19 +02:00
wmertens
7029c291c6 Builds fine on Darwin 2014-04-20 16:17:34 +01:00
ambrop7@gmail.com
3bab2f2fc4 FreeCAD: Fix build. 2014-04-20 16:45:00 +02:00
Shea Levy
88e531d8dc Fix gcc bug 58800.
See #2330 for details, except I needed to remove the Changelog change from the patch
2014-04-20 09:46:21 -04:00
Shea Levy
2364bd807d Revert "Merge branch 'gcc-fix' of git://github.com/ambrop72/nixpkgs"
The patch doesn't apply

This reverts commit 094eea8f6a, reversing
changes made to 552d66cd9e.
2014-04-20 09:36:15 -04:00
Shea Levy
094eea8f6a Merge branch 'gcc-fix' of git://github.com/ambrop72/nixpkgs
Description from ambrop72:

http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58800

I have not been able to test this due to nix wanting to rebuild lots of
things before building gcc.
Patch was created with: svn diff -r 203872:203873
http://gcc.gnu.org/svn/gcc/branches

This should fix a crash in OpenSCAD: openscad/openscad#514
2014-04-20 09:32:50 -04:00
ambrop7@gmail.com
7eeb94e8dc Add patch for GCC bug 58800. 2014-04-20 12:40:32 +02:00
Matt Whiteley
552d66cd9e Add swig-3.x 2014-04-20 11:30:31 +01:00
Arseniy Seroka
5ed0347063 dwb: update 2014-04-20 10:51:21 +01:00
Carles Pagès
8267fa4694 androidndk: add v9d
I also updated the buildApp expression so it can build ndk based apps, when
setting useNDK to true.
2014-04-20 11:29:10 +02:00
Eelco Dolstra
2fbb9aba43 Fix the installer test
http://hydra.nixos.org/build/10419676
2014-04-20 01:56:11 +02:00
Eelco Dolstra
37d5e9c455 Temporary fix for installer tests
http://hydra.nixos.org/build/10455979
2014-04-20 01:53:11 +02:00
Eelco Dolstra
b614ea22d4 Move files 2014-04-20 01:27:15 +02:00
Eelco Dolstra
d4f44d6db3 Move stdenv bootstrap binaries out of the tree
Commit 986f361946 started to use
<nix/fetchurl.nix> to "download" the bootstrap binaries from the
Nixpkgs tree, using the file:/// scheme. This has really bad
consequences:

* It makes any derivation depend on the path of the Nixpkgs tree. So
  evaluating a package will produce a different .drv file when run
  from different locations. No wonder Hydra evaluation has been so
  slow lately: for every Nixpkgs evaluation, it had to create tens of
  thousands of .drv files, even if nothing had changed.

* It requires the builder to have file system access to the Nixpkgs
  tree. So if your tree is in your home directory, the stdenv
  bootstrap would probably fail.

So now the binaries are downloaded from tarballs.nixos.org.

Also dropped PowerPC "support".
2014-04-20 01:16:12 +02:00
Eelco Dolstra
c49404547b Use <nix/fetchurl.nix> to download the bootstrap tools 2014-04-20 00:54:09 +02:00
Eelco Dolstra
c95cea4bfd Tarball: Check whether Nixpkgs evaluation doesn't depend on its path 2014-04-20 00:08:52 +02:00
Eelco Dolstra
5c2bd5dffc Remove obsolete line 2014-04-20 00:08:52 +02:00
Eelco Dolstra
0a256cc0ee Firewall: Only start if we have CAP_NET_ADMIN 2014-04-19 23:02:59 +02:00
Eelco Dolstra
4fb50f071f Manual: Typo fixes 2014-04-19 22:59:25 +02:00
Vladimír Čunát
4160e65931 mediastreamer: fix build by updating
Probably broken by major ffmpeg update.
2014-04-19 22:06:22 +02:00
Rok Garbas
805ec7e54a Merge pull request #2320 from iyzsong/unmaintain
drop my maintainship of orc and vala
2014-04-19 19:55:24 +01:00
宋文武
6da2470034 drop my maintainship of orc and vala 2014-04-19 23:21:51 +08:00
William A. Kennington III
3ccf990372 pcscd: Refactor service and use socket activation 2014-04-19 14:37:31 +01:00
Marco
d6aee89fd7 Fix build of MLton on Linux i686 2014-04-19 14:30:39 +01:00
Marco Maggesi
3737ec7c74 Enable compilation of MLton on darwin 2014-04-19 14:30:39 +01:00
John Wiegley
6926d6c97d Do not use GTK when building pinentry on Darwin 2014-04-19 14:29:03 +01:00
John Wiegley
1337f5f84c Do not build CUPS support for ghostscript on Darwin 2014-04-19 14:22:35 +01:00
aszlig
2d3376e84e
Merge pull request #2087 into cross-win-osx.
Thanks to @offlinehacker for the fixes.

* 'crossdev' of github.com:offlinehacker/nixpkgs:
  gifsicle: add optional static builds, make gifview optional
  libjpeg_original: add optional static builds
  optipng: use system libpng & zlib, fix cross builds and add ...
  xcode: fix hash
  libarchive: *permanently* fix patch source and hash
2014-04-19 15:04:01 +02:00
Eelco Dolstra
18a7ce76fc Enable udisks2 by default
The ability for unprivileged users to mount external media is useful
regardless of the desktop environment. Also, since udisks2 is
activated on-demand, it doesn't add any overhead if you're not using it.
2014-04-19 14:41:21 +02:00
Eelco Dolstra
894e2dfb25 Add a test for udisks2 2014-04-19 14:37:05 +02:00
Eelco Dolstra
fa9ed04997 Restart polkit if its configuration may have changed 2014-04-19 14:29:02 +02:00
Eelco Dolstra
82535e0f8f switch-to-configuration: Check overrides.conf for X-* options 2014-04-19 14:28:33 +02:00
aszlig
3378679ff9
chromium: Don't use v8 from <nixpkgs> anymore.
The version of v8 to use for Chromium is heavily tied to the specific
version of Chromium and thus it doesn't really make sense to use v8 from
<nixpkgs>, as we would need to have 3 different versions of v8, one for
each Chromium channel.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-04-19 14:18:25 +02:00
Vladimír Čunát
fbc8424cc2 libstartup_notification: remove duplicate in gnome2 2014-04-19 13:59:18 +02:00
Vladimír Čunát
c8f633564e orc: bugfix update (mainly memory leaks), doCheck 2014-04-19 13:59:18 +02:00
Eelco Dolstra
b03a2f9e90 Set personality when running a 32-bit container on a 64-bit host 2014-04-19 13:14:51 +02:00