Commit Graph

1077 Commits

Author SHA1 Message Date
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