The sha256 has changed upstream for 30.0.1566.2 and in addition there is
a new version available, so let's switch to the new version.
Unfortunately the user namespaces sandbox patch doesn't apply anymore
because of http://crbug.com/242290, so this adds a rebased version on
top of the current trunk of Chromium.
In order to build version 30, file is now needed as an additional build
input, because it is used by gyp.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
So, chromium 30 entered the dev release channel, so the overview of the
current versions is:
stable: 28.0.1500.52 -> 28.0.1500.71 (builds fine, tested)
beta: 28.0.1500.52 -> 29.0.1547.22 (builds fine, tested)
dev: 29.0.1547.0 -> 30.0.1566.2 (builds fine, tested)
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
As requested by some users, we finally have support for cloud sync,
spelling, geolocation and a lot more of the services that require API
keys from Google. Details about which services are involved can be found
at: http://www.chromium.org/developers/how-tos/api-keys
Thanks to Paweł Hajdan <phajdan@google.com> for giving us permission to
distribute the API keys with our build of Chromium:
> Note that the public Terms of Service do not allow distribution of the
> API keys in any form. To make this work for you, on behalf of Google
> Chrome Team I am providing you with:
> Official permission to include Google API keys in your packages and to
> distribute these packages. The remainder of the Terms of Service for
> each API applies, but at this time you are not bound by the
> requirement to only access the APIs for personal and development use,
> and Additional quota for each API in an effort to adequately support
> your users.
As noted in the source: Those keys are for use in NixOS/nixpkgs ONLY!
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
We already enable VNC and SDL support by default and adding spice only
increases the closure size from 513 MB to 518 MB.
Closure size:
du -sch $(nix-store -qR ./result)
Slic3r is a G-code generator for 3D printers.
- Math-Clipper and Boost-Geometry-Utils have been bumped to satisfy
Slic3r.
- Slic3r has problems with perl 5.16 due to a locale issue (comma vs
period in floating point numbers). So we use perl 5.14.
- The tests fail, so we skip them. According to the author of Slic3r,
that should be safe:
"Tests failed because of a typo when the 0.9.10b tag was applied.
You can safely ignore the test results, Slic3r will work."
See https://github.com/alexrj/Slic3r/issues/1303
For reference, the errors look like this:
Use of uninitialized value $deg in numeric eq (==) at /tmp/nix-build-perl-slic3r-0.9.10b.drv-0/git-export/t/../lib/Slic3r/TriangleMesh.pm line 328.
# Looks like your test exited with 255 before it could output anything.
For some reason, SANE suddenly stopped recognizing my scanner recently:
| $ scanimage -L
|
| No scanners were identified. If you were expecting something different,
| check that the scanner is plugged in, turned on and detected by the
| sane-find-scanner tool (if appropriate). Please read the documentation
| which came with this software (README, FAQ, manpages).
I was able to remedy this issue by building SANE with the latest version
of the backends package from Git, by adding the following override to
~/.nixpkgs/config.nix:
| {
| packageOverrides = pkgs:
| {
| saneBackends = pkgs.saneBackendsGit;
| };
| }
Easytag has moved to gnome.org and thus this commit also updates and cleans up a
few meta attributes. More information about the move can be found in the
announcement:
https://mail.gnome.org/archives/easytag-list/2012-November/msg00006.html
In order to get it to compile, we need to do a bit of patching, for example the
configure script tries to find libid3tag through pkg-config, but unfortunately
libid3tag doesn't have a *.pc script, so we're patching it out of the configure
script and use NIX_LDFLAGS to inject the library during linking (note the "-lz"
- it's a propagated dependency of libid3tag).
Also added for MP4 support: taglib.
Thanks to @devhell for the notification of the new upstream release.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Thanks to @jcumming for notifying me about this in #nixos:
03:47 < jack_c> aszlig: chromium builds with -Werror by default.
03:47 < jack_c> Putting: werror = "";
03:48 < jack_c> into gypFlags fixes that..
...
03:52 < jack_c> aszlig: agree -Werror is a good linting tool, but it should
probably disabled for distribution.
So, I guess it makes sense in our case, especially because different GCC
versions will issue different warnings.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* Ensure that R can link blas, liblapack, and libgfortran at run-time.
* Ensure that R can run the Tcl/Tk interpreter.
* Add Java support.
* Install texinfo and PDF documentation.
A recent X update broke VirtualBox guest additions (vboxvideo driver version
mismatch, desktop won't start). This fixes it.
Here is the error log:
(II) "glx" will be loaded by default.
(II) LoadModule: "glx"
(II) Loading /nix/store/kzvmnjlps51q4piqmwr7zbmxcg2z9vgk-xorg-server-1.13.4/lib/xorg/modules/extensions/libglx.so
(II) Module glx: vendor="X.Org Foundation"
compiled for 1.13.4, module version = 1.0.0
ABI class: X.Org Server Extension, version 7.0
(==) AIGLX enabled
Loading extension GLX
(II) LoadModule: "vboxvideo"
(II) Loading /nix/store/4kbxi00h8xsmfgbws2qqh674lcfp03h6-VirtualBox-GuestAdditions-4.2.14-3.2.46/lib/xorg/modules/drivers/vboxvideo_drv.so
(II) Module vboxvideo: vendor="Oracle Corporation"
compiled for 10.12.0, module version = 1.0.1
Module class: X.Org Video Driver
ABI class: X.Org Video Driver, version 12.0
(EE) module ABI major version (12) doesn't match the server's version (13)
(II) UnloadModule: "vboxvideo"
(II) Unloading vboxvideo
(EE) Failed to load module "vboxvideo" (module requirement mismatch, 0)
(II) LoadModule: "vboxmouse"
(WW) Warning, couldn't open module vboxmouse
(II) UnloadModule: "vboxmouse"
(II) Unloading vboxmouse
(EE) Failed to load module "vboxmouse" (module does not exist, 0)
(EE) No drivers available.
Fatal server error:
no screens found
The second failure, and the last one I'm going to try today:
http://hydra.nixos.org/build/5404634
On the bright side there is at least the fact that version 1.4.10 has failed on
Darwin already, so I guess we don't have a lot of Mac users using Synergy.
Latest (failed) build of 1.4.10:
http://hydra.nixos.org/build/5359408
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Seems that crypto++ in nixpkgs doesn't build on Darwin, so let's use bundled
crypto++ until the version in nixpkgs works well.
This refers to the following build:
http://hydra.nixos.org/build/5404516
Hopefully, this will fix it on Mac OS X, because I don't have a Darwin machine
for testing.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
I'm heavily using synergy for daily work, so I'm most probably going to watch
out for changes/improvements/bugs :-)
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Chromium 28.0.1500.52 finally is stable, so the release channels are now:
stable: 28.0.1500.52 (builds fine, tested)
beta: 28.0.1500.52 (same as stable)
dev: 29.0.1541.2 (patch rebased, builds fine, tested)
The user namespace patch doesn't apply for version 29, so I had to rebase it
against the current trunk (revision 207742).
And as version 27 is outdated, we no longer need to distinguish versions for
patching the hardcoded gcc path in core/core.gypi.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Integration tests don't seem to work right now, so let's see if we can figure
out a way to enable them later. But at least running unit tests is better than
not running any tests :-)
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Nowadays, multiple monitor setups are quite common, so I suppose we'd want
support for that. Especially because users might get confused if synergy is
unable to pick the right screen resolution and thus cause edges to be cut off
from the available pointing area.
The postPatch hook is to force cmake into thinking that we have XRRNotifyEvent,
which we _do_ have with the xrandr version shipped in nixpkgs. Automatic
detection from CMakeLists.txt fails here because it tries to search for the
symbol within the libX11 store path.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
This brings in support for encryption and thus requires the crypto++ library as
an additional dependency. Unfortunately the upstream integration isn't quite the
way we'd like it to be, so we need to add a small patch to ignore the bundled
version and use the package from nixpkgs.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Dropbox doesn't version the CLI. This broke the download. This patch
also fixes the `dropbox-cli start' command.
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
The following new versions were introduced:
beta: 28.0.1500.45 - builds fine and tested
dev: 29.0.1521.3 - builds fine and tested
Although the version from the dev release channel isn't the latest found on
omahaproxy but it's the latest one, that actually has tarballs available.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Previously we have just checked for equality. When going back in history, that
way if the history is somewhat out-of-sync, we could end up "updating" to an
older version, which we definitely don't want.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Omahaproxy has an URL which lists a history of the published versions, which
allows to not only go back one versions, but several. Now it is ensured, that we
always have the latest _available_ version in sources.nix.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
This is especially annoying for the dev channel, as it happens quite frequently
that tarballs are unavailable. So if fetching the latest version doesn't work,
try the second latest version.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
These new versions are introduced with this commit:
stable: 26.0.1410.63 -> 27.0.1453.93 (builds fine, tested)
beta: 27.0.1453.81 -> 28.0.1500.20 (builds fine, tested)
Unfortunately the tarball for the dev version 29.0.1530.2 isn't available at the
moment, so we're going to update it later.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
- Using system-wide libs where we have them (except for portaudio, which
I couldn't make work).
- Add the soxr library (now the preferred way of audio resampling).
- vim-nox: client-server implementation without X
- latest: latest mercurial sources (still very stable)
- default: latest release
vim-plugins: Introduce an area to put vim plugins which are worth adding to nix
because they need more effort than just "unpacking". Document that
Actually, Gajim can use notifications through dbus if notification-daemon is
available. Otherwise it falls back to notify-python, which is why I disabled it
by default, especially because upstream support of that Python library isn't
especially awesome ;-)
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
This needed a bit of patching the paths to the latex and dvipng executables.
In addition, we also address a small bug by using sed:
tmpfd, tmppng = mkstemp(prefix='gajim_tex', suffix='.png')
tmpfd.close()
This obviously won't work, because mkstemp() actually returns a file descriptor
_number_ and not a Python file object.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Use a patch from Arch Linux to use drill instead of nslookup. The primary reason
for this is because nslookup is in bind, and we don't want to depend on the
whole bind package just for the sake of supporting SRV lookups.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
This brings in Chromium 27 as the new stable version.
Specific versions of the updated channels:
stable: 26.0.1410.63 -> 27.0.1453.93 (builds fine, tested)
beta: 27.0.1453.81 -> 28.0.1500.20 (builds fine, tested)
dev: 28.0.1500.11 -> 29.0.1516.3 (builds fine, tested)
We now can finally drop the following patches:
* glibc-2.16-use-siginfo_t.patch
* pulseaudio_array_bounds.patch
These were for version 26 only and thus are no longer needed.
In addition, we no longer have to use the pre/post attributes, as there is just
_one_ place that uses version specific stuff (path to webcore.gyp).
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Wanted to do this a long time ago, but never had a reason to do it. But with
Chromium 29 having no make target for chrome_sandbox, we now use ninja as well
as the official build and most other distributions.
The whole build/make flags cruft is now integrated into one buildPhase override
and we just call ninja there by exporting the specific variables.
And this also makes enableParallelBuilding obsolete, as we use NIX_BUILD_CORES
directly now.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Actually a "*[0-9]" wildcard isn't enough for some unrelated icons to slip into
the derivation output, so let's explicitely check again within the for loop.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
This fixes the following bugs:
* traceback on decryption of OpenPGP-encrypted messages
* remote_control: use GED in send_chat_message
* gajim-0.15.3 can't connect to server without StartTLS support
* "make check" fails with complaining on src/command_system/mapping.py
* Account Wizard: Make text selectable
* Gajim crashes in connect.py
Overview and details:
https://trac.gajim.org/query?status=closed&milestone=0.15.4
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
This should clean up the package expression significantly by actually using
explicit input attributes and setting PYTHONPATH and GST_PLUGIN_PATH from
environment variables in the builder.
In addition, this adds a small patch from the upstream Mercurial repository to
add an index.theme to the icons, so Gajim is able to load them correctly from
the store.
With this change, I'm adding myself to the maintainers list as well, because I'm
switching over from TKabber to Gajim.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Eagle is a schematic capture and PCB layout program from CadSoft. This
is proprietary software; CadSoft provide a self-extracting shell script
with embedded tarball of the prebuilt application.
Add the latest Eagle version, 6.4.0.
I've added a small LD_PRELOAD library that redirects operations on the
license file from <eagle_install_path>/bin/eagle.key to
$HOME/.eagle.key. Without this Eagle will never get past the license
dialog (because you cannot write to the nix store).
Eagle also has issues copying its example projects to other locations;
it seems that it wants to preserve the read-only permissions from the
source over to the destination. Because of this it cannot complete the
copy operation because it cannot write the project files into to the
(read-only) project directory it just created. So wrap chmod by OR'ing
in the write-by-owner bit.
This also adds a new package "libbs2b", which is needed in order to support
Bauer stereophonic-to-binaural DSP as an audio filter.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
This patch adds support for unprivileged user namespaces found in kernel
versions 3.8.0 and later. In case of Nix, this is especially useful to prevent
having to set up setuid wrappers.
The implementation details about this patch can be found at the top of the file
"sandbox_userns.patch". My first attempt of creating this patch was by modifying
the SUID sandbox. Unfortunately this didn't work out well, because in the event
of a sandbox failure, the host zygote process waits for an answer of the inner
zygote with no timeout. Even if I'd have set a timeout, this would have been
very ugly, giving users which don't have unprivileged user namespaces a delay on
startup.
An alternative approach to the mentioned problem would be to use select() on the
host zygote, watching for changes stdout or stderr and the synchronization
socket. But even that approach isn't feasible because it requires a whole bunch
of even more patching.
Patch was tested with older kernels (3.2.x, 3.7.x) and kernels without user
namespace support enabled, where in case the feature is unavailable it reverts
back to the previous behaviour (no zygote sandbox, only seccomp BPF).
In order to support all Chromium channels, I manually changed the first hunk of
the patch to not include the starting context of the diff, because there is a
whitespace change in more recent versions of the Chromium source tree.
See SVN revision 199882 for the change (revert in this case) in detail:
http://src.chromium.org/viewvc/chrome?view=revision&revision=199882
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
This is no feature change and only makes the installPhase look nicer and it now
doesn't exceed 80 characters in width anymore.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
This updates the following channels to the latest upstream versions:
beta: 27.0.1453.65 -> 27.0.1453.81 (builds fine, tested)
dev: 28.0.1485.0 -> 28.0.1500.5 (builds fine, tested)
For version 28, the reference to /usr/bin/gcc is now located in
third_party/WebKit/Source/core/core.gypi instead of the previous
third_party/WebKit/Source/core/core.gyp/core.gyp.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
See #490 discussion.
This reverts commit 1278859d31, reversing
changes made to 0c020c98f9.
Conflicts:
pkgs/desktops/xfce/core/xfce4-session.nix (take master)
pkgs/lib/misc.nix (auto)
Spyder says about itself that it has
...the support of IPython (enhanced interactive Python interpreter) and
popular Python libraries such as NumPy (linear algebra), SciPy (signal
and image processing) or matplotlib (interactive 2D/3D plotting).
So I think having those available as default is a the right thing to to.
(We can easily make a stripped down spyder expression if needed later.)
I've added the list of recommended and optional dependencies as
described here:
http://pythonhosted.org/spyder/installation.html#dependencies
Spyder (previously known as Pydee) is a powerful interactive development
environment for the Python language with advanced editing, interactive
testing, debugging and introspection features.
The name Spyder comes from Scientific PYthon Development EnviRonment.
This updates the channels to the following new versions:
beta: 27.0.1453.47 -> 27.0.1453.65 (builds fine, tested)
dev: 27.0.1453.47 -> 28.0.1485.0 (builds fine, tested)
As we now don't have any version below 26, this update drops all references to
all older versions as well.
In addition to that, the /usr/bin/gcc reference from:
third_party/WebKit/Source/core/core.gyp/core.gyp
Can now - starting at version 28 - be found in:
third_party/WebKit/Source/WebCore/WebCore.gyp/WebCore.gyp
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Git's Makefile has a NO_INSTALL_HARDLINKS flag to produce symlinks
instead of hard links. However, it still produces hard links between
$out/bin and $out/libexec, hence the patch.
Also, update Git to 1.8.2.1.
gets rid of the dependency on the old gnupg1. and enables decryption
even if the gpg binary is not in the users environment.
warning: i don't know whether the switch from gnupg1 to gnupg
introduces any incompatibilities. this is a works for me patch.
![](/avatar/2f93d08a773b27d6548598c5f45aa3a9?size=56 "Jason \\"Don\\" O'Conal"){kind=small}
