about summary refs log tree commit diff
path: root/pkgs/applications/graphics
Commit message (Collapse)AuthorAge
* Merge branch 'staging', containing closure-size #7701Vladimír Čunát2016-04-13
|\
| * Merge branch 'master' into closure-sizeVladimír Čunát2016-04-10
| |\ | | | | | | | | | | | | | | | Comparison to master evaluations on Hydra: - 1255515 for nixos - 1255502 for nixpkgs
| * \ Merge branch 'master' into closure-sizeVladimír Čunát2016-04-01
| |\ \ | | | | | | | | | | | | | | | | Beware that stdenv doesn't build. It seems something more will be needed than just resolution of merge conflicts.
| * \ \ Merge master into closure-sizeVladimír Čunát2016-03-08
| |\ \ \ | | | | | | | | | | | | | | | | | | | | The kde-5 stuff still didn't merge well. I hand-fixed what I saw, but there may be more problems.
| * \ \ \ Merge branch 'master' into closure-sizeVladimír Čunát2016-02-14
| |\ \ \ \
| * \ \ \ \ Merge recent 'staging' into closure-sizeVladimír Čunát2016-02-03
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Let's get rid of those merge conflicts.
| * | | | | | treewide: Mass replace 'xorg.libX11}/lib' to refer the 'out' outputTuomas Tynkkynen2016-01-24
| | | | | | |
| * | | | | | treewide: Mass replace 'libusb1}/lib' to refer the 'out' outputTuomas Tynkkynen2016-01-24
| | | | | | |
| * | | | | | Merge branch 'staging' into closure-sizeVladimír Čunát2016-01-19
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into closure-sizeVladimír Čunát2015-12-31
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TODO: there was more significant refactoring of qtbase and plasma 5.5 on master, and I'm deferring pointing to correct outputs to later.
| * \ \ \ \ \ \ \ Merge branch 'master' into closure-sizeLuca Bruno2015-12-11
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into closure-sizeLuca Bruno2015-11-29
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/master' into closure-sizeLuca Bruno2015-11-25
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge staging into closure-sizeVladimír Čunát2015-11-20
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The most complex problems were from dealing with switches reverted in the meantime (gcc5, gmp6, ncurses6). It's likely that darwin is (still) broken nontrivially.
| | * | | | | | | | | | | Revert "Revert "Merge pull request #9543 from NixOS/staging.post-15.06""William A. Kennington III2015-11-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 741bf840dad05cd1728481045466811ae8ae8281. This reverts the fallout from reverting the major changes.
| | * | | | | | | | | | | Merge commit 'cb21b77' into master.upstreamWilliam A. Kennington III2015-11-13
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a partial merge of staging for builds which are working
| | | * \ \ \ \ \ \ \ \ \ \ Merge branch 'master.upstream' into staging.upstreamWilliam A. Kennington III2015-11-07
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master.upstream' into staging.upstreamWilliam A. Kennington III2015-10-30
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ Merge master into stagingVladimír Čunát2015-10-23
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master.upstream' into staging.upstreamWilliam A. Kennington III2015-10-15
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | Revert "Merge pull request #9543 from NixOS/staging.post-15.06"Eelco Dolstra2015-10-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit f61176c5396ed513f3d399f73f38ab78a066667f, reversing changes made to a27ca029ee2b39e04d7d2a516a7228f4b62067fb. Conflicts: pkgs/development/libraries/ncurses/default.nix
| * | | | | | | | | | | | | | | | | imagemagick, soxr, fftw, libraw: remove explicit gcc.libVladimír Čunát2015-10-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is no longer needed after cc-wrapper fixes.
| * | | | | | | | | | | | | | | | | xorg: split outputs of various libsVladimír Čunát2015-10-14
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | feh: fix with multiple outputs and split docsVladimír Čunát2015-10-13
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | cairo, pango: fix some string referencesVladimír Čunát2015-10-13
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | gtk3: split into multiple outputsVladimír Čunát2015-10-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All references OK, hopefully. Seems surprisingly smooth.
| * | | | | | | | | | | | | | | | | Merge staging into closure-sizeVladimír Čunát2015-10-03
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes gcc5 the default builder, etc.
| * | | | | | | | | | | | | | | | | Merge commit staging+systemd into closure-sizeVladimír Čunát2015-10-03
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Many non-conflict problems weren't (fully) resolved in this commit yet.
| * | | | | | | | | | | | | | | | | | fix "libc}/lib" and similar referencesVladimír Čunát2015-05-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Done mostly without any verification. I didn't bother with libc}/include, as the path is still correct.
| * | | | | | | | | | | | | | | | | | Merge staging into closure-sizeVladimír Čunát2015-05-05
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | soxr, libraw, fftw, imagemagick: fix build by a hackVladimír Čunát2015-04-21
| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | imagemagick: 8.9.2-0 -> 8.9.3-8Graham Christensen2016-04-11
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | sane-backends-git -> 2016-04-06Tobias Geerinckx-Rice2016-04-06
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | fbida: 2.10 -> 2.11Pascal Wittmann2016-04-04
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Updating giv to latest from git (>0.9.25).Lluís Batlle i Rossell2016-03-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We were using a version years old. I picked the git version instead of the last release because the git version has fixes not released for almost one year.
* | | | | | | | | | | | | | | | | | Updating wings and dependencies to match erlangLluís Batlle i Rossell2016-03-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I updated the erlang esdl lib, added the erlang cl lib, added opencl-headers and ocl-icd to make wings build and run. I have not tested its opencl part; I only added dependencies so it builds.
* | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/staging'Domen Kožar2016-03-27
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | hugin: add missing dependenciesJoachim Fasting2016-03-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://hydra.nixos.org/build/33609995/nixlog/2/raw
| * | | | | | | | | | | | | | | | | | leocad: work around cmath problemJoachim Fasting2016-03-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | introduced by recent glibc https://hydra.nixos.org/build/33610365/nixlog/1/raw
* | | | | | | | | | | | | | | | | | | openimageio: 1.6.9 -> 1.6.11 (fixes build on i686)Domen Kožar2016-03-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit b5d47a8cfe359fd0a6e10c85a7e7622b24173ce9) Signed-off-by: Domen Kožar <domen@dev.si>
* | | | | | | | | | | | | | | | | | | photonic: 1.7 -> 1.7.1Pascal Wittmann2016-03-25
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | sane-backends-git: 2016-03-05 -> 2016-03-24Tobias Geerinckx-Rice2016-03-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes: - epsonds: fixed resolution setting bug DS-60000 workaround is needed no more - pixma: backend version 0.17.29
* | | | | | | | | | | | | | | | | | | simple-scan: 3.19.92 -> 3.20.0Tobias Geerinckx-Rice2016-03-20
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | pencil: 2.0.15 -> 2.0.18Svintsov Dmitry2016-03-17
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | simple-scan: 3.19.91 -> 3.19.92Tobias Geerinckx-Rice2016-03-14
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge pull request #10219 from jraygauthier/jrg/digikam_improvement_rebased_headzimbatm2016-03-13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | digikam: improvements
| * | | | | | | | | | | | | | | | | | | digikam: improvementsRaymond Gauthier2016-03-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Now usable in non kde desktop environments. Build a immutable sycoca database and use wrappers to tie programs to this database and avoid interference from the outside by specifying a fixed `KDELIBS` and fixed/empty `XDG_DATA_DIRS`. Added missing dependencies to syscoca database so that the program is complete. Added all build time optional packages. Kipi-plugins now properly detected. Added almost all optional dependencies so that almost all plugins are usable. Now with vlc phonon backend for video playback. Now with ffmpeg thumbnailer for video items thumbnail creation. Now run without any error log. Tests: - Ran most features of the standard program. Everything work perfectly without error logs. - Ran some of the kipi plugins. Work fine there too. - Ran face detection and fingerprint generation successfully. - Oxygen icons are now displayed properly. - Ran other wrapped executable successfully.
* | | | | | | | | | | | | | | | | | | | Merge pull request #13831 from lancelotsix/update_darktable2Arseniy Seroka2016-03-11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pkgs.darktable: 2.0.0 -> 2.0.2
| * | | | | | | | | | | | | | | | | | | | pkgs.darktable: use https in homepageLancelot SIX2016-03-11
| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | pkgs.darktable: 2.0.0 -> 2.0.2Lancelot SIX2016-03-10
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | darktable-2.0.1 and darktable-2.0.2 are two bugfix releases: http://www.darktable.org/2016/02/darktable-2-0-1-released/ http://www.darktable.org/2016/03/darktable-2-0-2-released/