Tuomas Tynkkynen
9d5ba6ba68
treewide: Make explicit that 'dev' output of libusb1 is used
2016-05-19 10:00:47 +02:00
Tuomas Tynkkynen
ad1a47061e
treewide: Make explicit that 'dev' output of libtiff is used
2016-05-19 10:00:46 +02:00
Tuomas Tynkkynen
f81af4e6f0
treewide: Make explicit that 'dev' output of glib is used
2016-05-19 10:00:35 +02:00
Tuomas Tynkkynen
b51b458aed
treewide: Make explicit that 'dev' output of fftwSinglePrec is used
2016-05-19 10:00:33 +02:00
Joachim Fasting
f8177f71bd
Merge pull request #15508 from jraygauthier/jrg/simple_scan_fix_missing_icon
...
simple-scan: improvements
2016-05-17 15:22:17 +02:00
Domen Kožar
b49bf121b8
rename iElectric to domenkozar to match GitHub
2016-05-17 13:00:47 +01:00
Raymond Gauthier
e7cc2de7dd
simple-scan: improvements
...
Fix missing icon. It was looking for a "scanner" device
icon that can be only found as part of gnome3 default theme.
Copied this device icon and renamed it as *the* simple-scan
application icon.
2016-05-17 00:49:28 -04:00
Peter Simons
8e462995ba
Bring my stdenv.lib.maintainers user name in line with my github nick.
2016-05-16 22:49:55 +02:00
taku0
9a6d8dd4f4
synfigstudio: fixed build error
2016-05-13 23:36:36 +09:00
Vladimír Čunát
6c2fbfbd77
Merge branch 'master' into staging
2016-05-12 04:53:38 +02:00
Vladimír Čunát
292fb98d96
imagemagick: fix evaluation on mingw
...
I made a mistake during conflict resolution in 7a005601d
.
2016-05-10 18:22:34 +02:00
Tobias Geerinckx-Rice
0ee4238026
sane-backends-git -> 2016-05-09
2016-05-10 01:22:53 +02:00
Thomas Tuegel
3a62eab2c9
antimony: mark broken
2016-05-09 10:01:46 -05:00
Vladimír Čunát
65a9fa8cdc
Merge branch 'master' into staging
2016-05-08 21:24:48 +02:00
Arseniy Seroka
25c1ff925f
Merge pull request #15288 from hrdinka/update/hugin
...
hugin: 2015.0.0 -> 2016.0.0
2016-05-08 13:46:17 +03:00
Arseniy Seroka
e33e50ac60
Merge pull request #15285 from hrdinka/update/darktable
...
darktable: 2.0.2 -> 2.0.4
2016-05-08 13:45:50 +03:00
Tobias Geerinckx-Rice
3785515c4b
sane-backends-git -> 2016-05-07
...
Color scanning for Samsung models which support JPEG Lossy compression.
2016-05-08 00:45:10 +02:00
Christoph Hrdinka
72306b762d
hugin: 2015.0.0 -> 2016.0.0
...
This updates hugin to its latest version and cleanes the derivation.
Release notes:
http://hugin.sourceforge.net/releases/2016.0.0/en.shtml
2016-05-07 16:50:06 +02:00
Christoph Hrdinka
f2ac136ec1
darktable: 2.0.2 -> 2.0.4
...
Release notes for 2.0.3 and 2.0.4 bugfix releases:
https://www.darktable.org/2016/03/darktable-2-0-3-released
https://www.darktable.org/2016/05/darktable-2-0-4-released
2016-05-07 12:59:24 +02:00
Vladimír Čunát
1dc36904d8
Merge #14920 : windows improvements, mainly mingw
2016-05-05 08:30:19 +02:00
Vladimír Čunát
7a005601d4
Merge branch 'master' to resolve conflicts
2016-05-05 08:25:38 +02:00
Michael Raskin
942db2e9ac
imagemagick: libwebp just has to be a propagated input
2016-05-04 17:55:09 +02:00
Robin Gloster
9820cb1bf2
use dontBuild instead of hacks
...
changes:
* buildPhase = "true"
* buildPhase = ":"
2016-05-04 10:11:04 +00:00
Franz Pletz
69c14985d0
imagemagick: Disable insecure coders (ImageTragick)
...
See:
* https://imagetragick.com/
* https://www.imagemagick.org/discourse-server/viewtopic.php?f=4&t=29588
2016-05-04 01:22:02 +02:00
Franz Pletz
05eae0242d
imagemagick: 6.9.3-8 -> 6.9.3-9
2016-05-04 01:22:02 +02:00
Tuomas Tynkkynen
aadaa91379
Merge remote-tracking branch 'upstream/master' into staging
...
Conflicts:
pkgs/applications/networking/browsers/vivaldi/default.nix
pkgs/misc/emulators/wine/base.nix
2016-05-03 23:12:48 +03:00
Nikolay Amiantov
fe0bb1efd1
imagemagick: add webp support
2016-05-03 13:19:41 +03:00
Raymond Gauthier
758e8bd1a1
brscan4: init at 0.4.3-3
...
A sane backend for recent brother scanners.
Depends on the presence of etc files generated by the
nixos module of the same name.
Supports network scanner specification through the
nixos module.
2016-05-01 14:42:25 -04:00
Tuomas Tynkkynen
b465dc202f
boost: Kill unnecessary 'lib' output
...
This was split in somewhere pre-2014 without the current infra which
automates parts of this, in particular the output propagation.
2016-04-28 00:41:28 +03:00
Tuomas Tynkkynen
4ff8f377af
Merge remote-tracking branch 'upstream/master' into staging
2016-04-28 00:13:53 +03:00
Tobias Geerinckx-Rice
d200e30e57
simple-scan: 3.20.0 -> 3.21.1
2016-04-27 16:55:36 +02:00
Nikolay Amiantov
d04dafd64e
gimp: add version to derivation, use symlinkJoin for a wrapper
2016-04-26 15:37:42 +03:00
Nikolay Amiantov
09f02b918e
Merge branch 'master' of git://github.com/NixOS/nixpkgs into staging
2016-04-25 18:02:10 +03:00
Nikolay Amiantov
929b0d99c1
imagemagick: support JPEG2000
2016-04-23 22:22:46 +03:00
Vladimír Čunát
7aae991fa2
imagemagick: fix on mingw, only static ATM
...
The output gets rather large (67 MB) as *each* executable gets ~5 MB of
magick stuff statically. It seems we would have to fix or disable
libxml2 first to get around this blowup.
2016-04-23 10:52:05 +02:00
Tobias Geerinckx-Rice
23f3d86a3b
sane-backends-git -> 2016-04-23
...
More Pixma fixes.
2016-04-23 01:34:25 +02:00
Tobias Geerinckx-Rice
05a7c34d47
sane-backends-git -> 2016-04-20
2016-04-22 17:11:20 +02:00
Thomas Tuegel
b4ff81ffd6
phonon-backend-vlc: init at 0.9.0
2016-04-22 08:11:10 -05:00
Nikolay Amiantov
6995d01939
rapcad: move to qmakeHook
...
This reverts commit 38d5c07b14
.
2016-04-20 18:55:41 +03:00
Nikolay Amiantov
0ca9ad08b4
qtpfsgui: move to qmake4Hook
2016-04-20 18:55:41 +03:00
Nikolay Amiantov
6dc6a549c8
phototonic: move to qmakeHook
...
This reverts commit a0dd8d5afe
.
2016-04-20 18:55:41 +03:00
Nikolay Amiantov
0b6a6c903e
openscad: move to qmake4Hook
2016-04-20 18:55:41 +03:00
Nikolay Amiantov
2a7a4ec079
meshlab: use system vcg
2016-04-20 18:55:41 +03:00
Nikolay Amiantov
7b08f65f57
leocad: move to qmake4Hook
2016-04-20 18:55:40 +03:00
Nikolay Amiantov
b0c5221ce3
awesomebump: move to qmakeHook
2016-04-20 18:55:40 +03:00
Nikolay Amiantov
62e3430b13
antimony: move to qmakeHook
...
This reverts commit 9fa8fb1dec
.
2016-04-20 18:55:40 +03:00
Micxjo Funkcio
bbc7a80619
mcomix: 1.01 -> 1.2.1
2016-04-19 20:56:08 -07:00
Bob van der Linden
2c58a7d68c
yEd: 3.14.4 -> 3.15.0.2
2016-04-19 00:30:26 +02:00
Micxjo Funkcio
68d99a82cb
feh: 2.14 -> 2.15.2
2016-04-17 19:16:24 -07:00
Jost Tobias Springenberg
8816713001
geeqie: 1.1 -> 1.2.3 update package version and use the new source location ( #14715 )
2016-04-15 13:33:11 +01:00
aszlig
38d5c07b14
rapcad: Fix running of {pre,post}Configure
...
Commit 0055c6a
introduced a new preConfigure hook that sets the right
qmake path. Unfortunately the mkDerivation attributes of rapcad
override the whole configurePhase, so this hook isn't run at all.
However, this still doesn't fix the build of rapcad, because it's unable
to find GL/glu.h.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-04-15 05:26:02 +02:00
aszlig
a0dd8d5afe
phototonic: Fix running of {pre,post}Configure
...
Commit 0055c6a
introduced a new preConfigure hook that sets the right
qmake path. Unfortunately the mkDerivation attributes of phototonic
override the whole configurePhase, so this hook isn't run at all.
This fixes the build of phototonic and it now successfully compiles on
my machine.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-04-15 05:26:02 +02:00
aszlig
9fa8fb1dec
antimony: Fix running of {pre,post}Configure
...
Commit 0055c6a
introduced a new preConfigure hook that sets the right
qmake path. Unfortunately the mkDerivation attributes of antimony
override the whole configurePhase, so this hook isn't run at all.
This fixes the build of antimony and it now successfully compiles on my
machine.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-04-15 01:34:42 +02:00
Nikolay Amiantov
755e4633c7
mass-replace glib and gtk lib/*/include paths
2016-04-14 04:13:54 +03:00
Tobias Geerinckx-Rice
af8a34a622
sane-backends-git -> 2016-04-14
2016-04-14 02:37:53 +02:00
Nikolay Amiantov
d2fec0a922
photoqt: use wrapQtProgram
2016-04-13 16:09:40 +03:00
Vladimír Čunát
39ebb01d6e
Merge branch 'staging', containing closure-size #7701
2016-04-13 09:25:28 +02:00
Graham Christensen
43bf20def9
imagemagick: 8.9.2-0 -> 8.9.3-8
2016-04-11 14:47:16 -05:00
Vladimír Čunát
30f14243c3
Merge branch 'master' into closure-size
...
Comparison to master evaluations on Hydra:
- 1255515 for nixos
- 1255502 for nixpkgs
2016-04-10 11:17:52 +02:00
Tobias Geerinckx-Rice
9435e53648
sane-backends-git -> 2016-04-06
2016-04-06 19:39:36 +02:00
Pascal Wittmann
c5741f5f52
fbida: 2.10 -> 2.11
2016-04-04 18:05:26 +02:00
Vladimír Čunát
ab15a62c68
Merge branch 'master' into closure-size
...
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
2016-04-01 10:06:01 +02:00
Lluís Batlle i Rossell
f38d620d59
Updating giv to latest from git (>0.9.25).
...
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.
2016-03-29 17:40:49 +02:00
Lluís Batlle i Rossell
f6a44bea9e
Updating wings and dependencies to match erlang
...
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.
2016-03-29 12:24:42 +02:00
Domen Kožar
b07e7bfc7b
Merge remote-tracking branch 'origin/staging'
2016-03-27 13:19:04 +01:00
Domen Kožar
f955728295
openimageio: 1.6.9 -> 1.6.11 (fixes build on i686)
...
(cherry picked from commit b5d47a8cfe359fd0a6e10c85a7e7622b24173ce9)
Signed-off-by: Domen Kožar <domen@dev.si>
2016-03-26 21:18:58 +00:00
Joachim Fasting
29c3314fe4
hugin: add missing dependencies
...
https://hydra.nixos.org/build/33609995/nixlog/2/raw
2016-03-26 16:55:00 +01:00
Joachim Fasting
6448c94e57
leocad: work around cmath problem
...
introduced by recent glibc
https://hydra.nixos.org/build/33610365/nixlog/1/raw
2016-03-26 16:18:55 +01:00
Pascal Wittmann
5455a71414
photonic: 1.7 -> 1.7.1
2016-03-25 17:22:11 +01:00
Tobias Geerinckx-Rice
96edcf403c
sane-backends-git: 2016-03-05 -> 2016-03-24
...
Changes:
- epsonds: fixed resolution setting bug
DS-60000 workaround is needed no more
- pixma: backend version 0.17.29
2016-03-24 20:23:59 +01:00
Tobias Geerinckx-Rice
e45c1aad66
simple-scan: 3.19.92 -> 3.20.0
2016-03-20 23:56:15 +01:00
Svintsov Dmitry
e8fb05f818
pencil: 2.0.15 -> 2.0.18
2016-03-17 10:06:52 +05:00
Tobias Geerinckx-Rice
11c486cd19
simple-scan: 3.19.91 -> 3.19.92
2016-03-14 03:42:12 +01:00
zimbatm
34721289d9
Merge pull request #10219 from jraygauthier/jrg/digikam_improvement_rebased_head
...
digikam: improvements
2016-03-13 23:57:24 +00:00
Arseniy Seroka
329addf0b3
Merge pull request #13831 from lancelotsix/update_darktable2
...
pkgs.darktable: 2.0.0 -> 2.0.2
2016-03-11 22:37:15 +03:00
Lancelot SIX
5fac723799
pkgs.darktable: use https in homepage
2016-03-11 13:24:48 +01:00
Lancelot SIX
9a85553590
pkgs.darktable: 2.0.0 -> 2.0.2
...
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/
2016-03-10 23:23:16 +01:00
Vladimír Čunát
7ccccec51b
antimony: fix build with glibc-2.23
...
And enableParalelBuilding = true;
2016-03-10 18:58:28 +01:00
Vladimír Čunát
09af15654f
Merge master into closure-size
...
The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.
2016-03-08 09:58:19 +01:00
Nikolay Amiantov
234c5dce67
Merge commit 'refs/pull/13667/head' of git://github.com/NixOS/nixpkgs
2016-03-06 20:39:27 +03:00
Jakub Skrzypnik
d80811d881
ahoviewer: init at 1.4.6
2016-03-06 18:36:16 +01:00
Raymond Gauthier
d2c8919a16
digikam: improvements
...
- 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.
2016-03-05 22:55:35 -05:00
Tobias Geerinckx-Rice
d5eb96938a
sane-backends-git -> 2016-03-05
2016-03-06 01:09:12 +01:00
Tobias Geerinckx-Rice
06a50554ad
simple-scan: 3.19.90 -> 3.19.91
2016-02-29 22:51:39 +01:00
Nikolay Amiantov
1af8a3498c
apitrace: add qapitrace and backtracing support
2016-02-28 15:55:45 +03:00
Graham Christensen
1aed3948d7
pythonmagick: 0.9.11 -> 0.9.12
2016-02-27 17:22:14 -06:00
Graham Christensen
4a54794d18
xara: broken due to patch-tracker.debian.org being missing.
2016-02-27 16:13:47 -06:00
zimbatm
b9db67d8e2
Merge pull request #8393 from hrdinka/update/hugin
...
hugin: update 2013.0.0 -> 2015.0.0
2016-02-26 01:03:47 +00:00
zimbatm
35f47333d0
Merge pull request #13463 from avnik/feature/gimp-with-plugins
...
Feature: gimp with plugins
2016-02-25 23:27:25 +00:00
Alexander V. Nikolaev
0649c8bde7
gimp: add gimp-with-plugin derivation
...
By default all plugins from pkgs.gimpPlugins set are enabled.
Default location of plugins changed from $out/${gimp.name} to
$out/lib/gimp/${majorVersion}. Resulting derivation for gimp+plugins
is set as search path for plugins by default (additional tweaking in
gimprc done for old plugin scheme should be removed)
2016-02-25 23:34:28 +02:00
Alexander V. Nikolaev
fdd11c2c2b
gimp: Use http link as gimp-gap sources
2016-02-25 23:34:17 +02:00
Tobias Geerinckx-Rice
500132ab5c
sane-backends-git -> 2016-02-25
2016-02-25 20:54:24 +01:00
Tobias Geerinckx-Rice
759f48ab07
sane-backends-git: 2016-02-19 -> 2016-02-22
2016-02-25 16:19:42 +01:00
Frederik Rietdijk
40ca841c5c
Merge pull request #13124 from FRidh/buildPythonApplication
...
buildPythonApplication: use new function for Python applications
2016-02-23 16:02:10 +01:00
Tobias Geerinckx-Rice
9135aea76f
sane-backends-git: 2016-01-25 -> 2016-02-19
2016-02-22 19:42:27 +01:00
Frederik Rietdijk
4d06bf70f4
buildPythonApplication: use new function for Python applications
2016-02-19 13:16:41 +01:00
Frederik Rietdijk
b3f764428f
Merge pull request #13050 from bendlas/fix-inkscape
...
inkscape: add numpy to runtime path
2016-02-18 09:17:31 +01:00
Vladimír Čunát
e9520e81b3
Merge branch 'master' into staging
2016-02-17 10:06:31 +01:00
Herwig Hochleitner
fbc147494c
inkscape: add numpy to runtime path
...
This is nessecary for some plugins
2016-02-17 01:19:17 +01:00
=
f59baafee2
glabels: init at 3.2.1 (git)
2016-02-16 11:28:51 +01:00