It turns out I hardcoded the output path that qt's tarball extracts.
But that path is versioned (4.8.5 for example).
As I've already merged x-updates on my own system, my qt version was
different (4.8.4 vs 4.8.5). Made the path-guessing more flexible, so
now it should work with any 4.8.*
Upstream insists on using private qt headers.
We do not want nixpkgs' qt to export those.
So I provided a small hack to take them directly from qt's source tarball.
I made sure everything uses the normal system qt and headers, except for the
1 .so file (qt_hack) that needs these private headers.
Because of this, there is barely any increate in size or buildtime.
Upstream release notes:
- Add Geoclue location provider by Mathieu Trudel-Lapierre.
- Allow brightness to be adjusted (-b).
- Provide option to set color temperature directly (Joe Hillenbrand).
- Add option to show program version (-V).
- Add configure.ac option to install ubuntu icons. They will no longer
be installed by default (Francesco Marella).
- config: Look in %userprofile%/.config/redshift.conf on windows platform.
- Fix: w32gdi: Obtain a new DC handle on every adjustment. This fixes a
bug where redshift stops updating the screen.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
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.
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>
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>
There were conflicts in pkgs/development/interpreters/ruby/ruby-19.nix,
which I resolved to the best of my knowledge. I'd appreciate if some of
the ruby gurus could have a look at the outcome of my merge, though.
- 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).
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)
Conflict in kerberos, which was updated both in master and in
stdenv-updates. Kept the stdenv-updates version, except pulled in the
enableParallelBuilding change from master.
Signed-off-by: Shea Levy <shea@shealevy.com>
Conflicts:
pkgs/development/libraries/kerberos/krb5.nix
This update roughly includes the following changes:
* Spanish es-ES translation
* New configuration option: print.empty.columns
* Much improved Asian character support
* More virtual tags
* Improved bash completion
* Task modification time
* Stats show blocked and blocking tasks
* New 'blocking' report
* Additional color rules
* New helper commands for third-party tools
* 'columns' command searchable
* New date shortcuts 'socm' and 'eocm'
* Improved push/pull messages
For a full list of changes, please head over to:
http://taskwarrior.org/projects/taskwarrior/wiki/Changelog
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
pitz is a distributed bug tracker, inspired by ditz. Homepage:
http://pitz.tplus1.com/
pitz has a command line interface, pitz-<command>, and a webapp,
pitz-webapp.
TODO: pitz has a pitz-shell utility that depends on ipython, but when I
enabled it it raised an exception. I think it depends on an old IPython
version:
from IPython.Shell import IPShellEmbed
ImportError: No module named Shell
A broken pitz-shell doesn't affect the rest of the command line
interface nor the webapp, so it is not critical to have it working.
There are not many distributed bug trackers out there, so I hope that
adding pitz to nixpkgs may inspire people to support pitz (or similar
software).
FFMPEG support allows a greater variety of export and import options.
SNDFILE support allows WAV and other sound file formats to be used.
JACK support allows blender to be used with XJadeo, Ardour or any other JACK away audio editor.
Conflicts:
pkgs/development/libraries/libxslt/default.nix
Commit 1764ea2b0a introduced changes to libxslt
in an awkward way to avoid re-builds on Linux. This patch has been simplified
during this merge.
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.
x-updates is supposed to merge after stdenv-updates, so let's test it
Conflicts:
pkgs/development/libraries/gtk+/2.x.nix (both updated, taking newer)
pkgs/development/libraries/mesa/default.nix (taking nativeBuildInputs)
![](/avatar/2f93d08a773b27d6548598c5f45aa3a9?size=56 "Jason \\"Don\\" O'Conal"){kind=small}
