Commit Graph

1651 Commits

Author SHA1 Message Date
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
Robin Gloster c92bca56f8 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-05-02 22:58:02 +00: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
Robin Gloster d020caa5b2 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-04-18 13:49:22 +00: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
Robin Gloster 3e68106afd Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-04-07 21:52:26 +00:00
Tobias Geerinckx-Rice 9435e53648
sane-backends-git -> 2016-04-06 2016-04-06 19:39:36 +02:00
Robin Gloster a73a28de7b fix grammar errors 2016-04-06 16:16:23 +00: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
Robin Gloster a4e65c3639 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-03-30 09:01:20 +00: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
Robin Gloster f60c9df0ba Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-03-28 15:16:29 +00: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
Robin Gloster 3f45f0948d Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-03-15 01:44:24 +00: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
Franz Pletz e9fc4e7db6 Merge remote-tracking branch 'origin/master' into hardened-stdenv 2016-03-07 22:08:27 +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
Franz Pletz aff1f4ab94 Use general hardening flag toggle lists
The following parameters are now available:

  * hardeningDisable
    To disable specific hardening flags
  * hardeningEnable
    To enable specific hardening flags

Only the cc-wrapper supports this right now, but these may be reused by
other wrappers, builders or setup hooks.

cc-wrapper supports the following flags:

  * fortify
  * stackprotector
  * pie (disabled by default)
  * pic
  * strictoverflow
  * format
  * relro
  * bindnow
2016-03-05 18:55:26 +01:00
Robin Gloster d47857c3d9 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-03-01 21:09:17 +00:00
Tobias Geerinckx-Rice 06a50554ad simple-scan: 3.19.90 -> 3.19.91 2016-02-29 22:51:39 +01:00
Robin Gloster 3b4765c9e5 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-02-28 16:32:57 +00: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
Robin Gloster 3477e662e6 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-02-27 00:08:08 +00: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
Robin Gloster 8edbf1cb03 qtpfsgui: disable format hardening 2016-02-24 21:45:16 +00: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
Robin Gloster ea1de67f35 tesseract: turn off format hardening 2016-02-20 22:33:10 +00:00
Robin Gloster 55b83dc0a0 xfig: turn off format hardening 2016-02-20 22:00:56 +00:00
Robin Gloster bc21db3692 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-02-19 21:16:14 +00: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
Franz Pletz 41698c9efa Merge branch 'master' into hardened-stdenv 2016-02-15 20:05:29 +01:00
Vladimír Čunát 5d2c5a920d Merge #12900: armv7l-linux improvements 2016-02-15 17:14:10 +01:00
Tobias Geerinckx-Rice bc00989ca5 simple-scan: 3.19.4 -> 3.19.90 2016-02-15 15:49:44 +01:00
Tomas Hlavaty 6c53262480 ImageMagick: build also on armv7l-linux 2016-02-14 23:45:32 +01:00
Vladimír Čunát d039c87984 Merge branch 'master' into closure-size 2016-02-14 08:33:51 +01:00
rnhmjoj 16d6eb45f1 imv: 1.2.0 -> 2.0.0 2016-02-13 05:13:49 +01:00
Robin Gloster 136562adab meshlab: turn off format hardening 2016-02-12 12:50:38 +00:00
Robin Gloster a9de8d4f18 gqview: turn off format hardening 2016-02-11 00:43:52 +00:00
Robin Gloster 5969a59052 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-02-09 16:28:44 +00:00
Robin Gloster 0e28c9abd8 giv: turn off format hardening 2016-02-09 11:10:09 +00:00
Robin Gloster 75f8122c2c cinepaint: turn off format hardening 2016-02-09 02:24:58 +00:00
Profpatsch 71d01db76f sane: *really* fix udev error
\#12874 tried to patch out the literal /bin/sh, but an additional space
sneaked in.
2016-02-09 00:13:07 +01:00
Profpatsch 9a72bf5c0f udev: sane: fix udev error
The new udev checks that no script references any absolute /bin/sh
paths, so this patches that out.
2016-02-08 01:48:34 +01:00
Vladimír Čunát a115bff08c Merge branch 'master' into staging 2016-02-07 13:52:42 +01:00
Christoph Hrdinka 86de7b1d2b hugin: update 2013.0.0 -> 2015.0.0 2016-02-06 13:50:32 +01:00
Lancelot SIX c5379e7da8 pkgs.darktable: 1.6.9 -> 2.0.0
See http://www.darktable.org/2015/12/darktable-2-0-released/

changes by @globin: added wrapGAppsHook and adwaita-icon-theme

Signed-off-by: Robin Gloster <mail@glob.in>
2016-02-06 01:30:07 +00:00
Vladimír Čunát ae74c356d9 Merge recent 'staging' into closure-size
Let's get rid of those merge conflicts.
2016-02-03 16:57:19 +01:00
Michiel Leenaars 313b88621b synfigstudio: 1.0.1 -> 1.0.2 (close #12308)
vcunat cleaned autoreconf-related stuff and indentation.
2016-01-29 17:20:43 +01:00
Vladimír Čunát de0af30716 Merge branch 'master' into staging 2016-01-29 10:19:48 +01:00
Tobias Geerinckx-Rice ac33b4724a More version attribute tidying where maintainers |= nckx 2016-01-25 20:08:34 +01:00
Tobias Geerinckx-Rice 9fb8020e4e Add version attribute where maintainers |= nckx
This will probably be mandatory soon, and is a step in the right
direction. Removes the deprecated meta.version, and move some meta
sections to the end of the file where I should have put them in
the first place.
2016-01-25 17:35:21 +01:00
Vladimír Čunát 2af19df364 Merge branch 'master' into staging 2016-01-25 10:02:25 +01:00
Tobias Geerinckx-Rice 87df7fc745 sane-backends: propagate libjpeg library path 2016-01-25 03:43:18 +01:00
Tobias Geerinckx-Rice d186a66d33 sane-backends-git -> 2016-01-25 2016-01-25 01:40:20 +01:00
Tuomas Tynkkynen 5d52f55426 treewide: Mass replace 'xorg.libX11}/lib' to refer the 'out' output 2016-01-24 10:03:37 +02:00
Tuomas Tynkkynen 69498299dd treewide: Mass replace 'libusb1}/lib' to refer the 'out' output 2016-01-24 10:03:36 +02:00
Tobias Geerinckx-Rice 32d40f0f98 Remove no longer (or never) referenced patches
55 files changed, 6041 deletions. Tested with `nix-build -A tarball`.
2016-01-24 02:02:21 +01:00
Nikolay Amiantov c3abcd8415 Merge pull request #12368 from abbradar/ghostscript-update
Ghostscript and CUPS updates
2016-01-22 21:46:52 +03:00
Vladimír Čunát 0957359568 Merge branch 'staging' 2016-01-22 13:48:35 +01:00
Vladimír Čunát 535b112038 imagemagick: add a more "reliable" mirror to fix #12493 2016-01-20 09:11:23 +01:00
Joe Hermaszewski 319acb0af5 openimageio: 1.4.16 -> 1.6.9 2016-01-19 19:01:22 +00:00
Vladimír Čunát 716aac2519 Merge branch 'staging' into closure-size 2016-01-19 09:55:31 +01:00
Robin Gloster 53b389327e refactor to use autoreconfHook where possible
Close #12446.
2016-01-18 10:45:31 +01:00
vbgl 877d9af793 Merge pull request #12451 from eduarrrd/photoqt
photoqt: fix breakage from qt infrastucture transition
2016-01-18 09:56:01 +01:00
Eduard Bachmakov 0e55c43718 photoqt: fix breakage from qt infrastucture transition 2016-01-17 22:53:25 -05:00
Tobias Geerinckx-Rice 34dc7fe49f simple-scan: 3.19.3 -> 3.19.4 2016-01-18 04:26:09 +01:00
Nikolay Amiantov fbd3ad83e5 gimp: enable parallel building 2016-01-17 15:50:40 +03:00
Louis Taylor 487a684bad gimp: 2.8.14 -> 2.8.16 2016-01-13 11:08:21 +00:00
Tobias Geerinckx-Rice 5ddf2bf856 sane-backends-git -> 2016-01-09 2016-01-09 23:15:16 +01:00
Vladimír Čunát d81538ff49 djview: minor update 4.10.3 -> 4.10.5 2016-01-08 20:42:15 +01:00
Pascal Wittmann 43ae5ad38c Merge pull request #12067 from mdorman/shotwellupdate
shotwell: 0.20.2 -> 0.22.0
2016-01-08 11:07:46 +01:00
Aristid Breitkreuz fa6ec6b057 mozjpeg: fix libpng dependency 2016-01-07 22:55:20 +01:00
Aristid Breitkreuz 6acad9ea04 mozjpeg: init at 3.1 2016-01-07 22:05:26 +01:00
Tobias Geerinckx-Rice ad200bb5bc Fix remaining sane{Front,Back}ends 2016-01-05 20:44:35 +01:00
Tim Cuthbertson d057af5b00 ufraw: 0.20 -> 0.22 2016-01-05 11:54:48 +01:00
Mateusz Kowalczyk ce662d1f64 sxiv: update to v1.3.2 2016-01-03 20:51:14 +00:00
Kranium Gikos Mendoza dc36c1b14c xzgv: init at 0.9.1 2016-01-03 22:43:34 +08:00
Tobias Geerinckx-Rice 99075fb402 saneBackends{,Git} -> sane-backends{,-git}
Fixes xsane evaluation.
2016-01-03 03:31:38 +01:00
Tobias Geerinckx-Rice 8b9a9fd9f5 saneBackendsGit: 2015-12-27 -> 2016-01-01 2016-01-01 21:43:20 +01:00
Michael Alan Dorman 1b5873a720 shotwell: 0.20.2 -> 0.22.0
This release has actually been out for nine months, and the existing
release completely failed to be able to import photos in my setup.
2016-01-01 14:08:26 -05:00
Aristid Breitkreuz 0c7db6c696 jpegoptim: init at 1.4.3 2015-12-31 16:55:50 +01:00
Vladimír Čunát f9f6f41bff Merge branch 'master' into closure-size
TODO: there was more significant refactoring of qtbase and plasma 5.5
on master, and I'm deferring pointing to correct outputs to later.
2015-12-31 09:53:02 +01:00
Tobias Geerinckx-Rice 4ef9b7558f saneBackendsGit: 2015-12-20 -> 2015-12-27 2015-12-27 22:56:43 +01:00
Tobias Geerinckx-Rice 8b4273a65d saneBackends: add generic extraFirmware support
This usurps the model-specific gt68xxFirmware and snapscanFirmware,
which are still supported for backwards compatibility – hopefully
not forever.
2015-12-26 19:50:17 +01:00
Tobias Geerinckx-Rice c05165ba5c saneBackends: don't add epson2 to dll.conf
It's already in there by default.
2015-12-26 19:50:17 +01:00
Tobias Geerinckx-Rice cf699caf4d saneBackends: don't add option for 1 udev rule 2015-12-26 19:50:17 +01:00
Aristid Breitkreuz 6ef92e0d11 Merge pull request #11914 from nckx/update-darktable
darktable: 1.6.8 -> 1.6.9
2015-12-24 13:11:41 +01:00
Tobias Geerinckx-Rice fd9e991616 saneBackends: remove udevSupport == hotplugSupport 2015-12-24 04:05:57 +01:00
Tobias Geerinckx-Rice 6a76cd1336 saneBackends: drop libusb override; use libusb1 directly 2015-12-24 04:05:57 +01:00
Tobias Geerinckx-Rice eeca8c0441 saneBackends: add translations (gettext) 2015-12-24 04:05:57 +01:00
Tobias Geerinckx-Rice d398926993 saneBackends: simplify buildInputs 2015-12-24 04:05:57 +01:00
Tobias Geerinckx-Rice d91765d2e0 saneBackends: append epson2 to dll.conf if installed 2015-12-24 04:05:57 +01:00
Tobias Geerinckx-Rice 61106207cd saneBackends: remove some redundancies (no hash change) 2015-12-24 04:05:57 +01:00
Tobias Geerinckx-Rice 58bf694071 saneBackends: factor out common code into generic.nix
The git version was duplicated from the stable one and the two had
begun to diverge significantly. For example, commit
88d731925d fixed a supposedly real
bug — but only in the stable package.

Factor out the shared code to avoid trouble — or worse, subtle
differences or bugs — in future.
2015-12-24 04:05:57 +01:00
Tobias Geerinckx-Rice ffc04a67e3 sanebackends{,Git}: add avahi support 2015-12-24 04:05:57 +01:00
Tobias Geerinckx-Rice 94dbaa7dbf saneBackends{,Git}: add SNMP support 2015-12-24 04:05:57 +01:00
Tobias Geerinckx-Rice 6ddca8f9b0 darktable: 1.6.8 -> 1.6.9 2015-12-23 23:07:16 +01:00
Tobias Geerinckx-Rice 56f6be2583 saneBackendsGit 1.0.25-180-g6d8b8d5 -> 2015-12-20 2015-12-20 19:58:50 +01:00
Thomas Tuegel 5af2e7b76e rapcad: Qt 5 infrastructure update 2015-12-20 07:56:46 -06:00
Thomas Tuegel 3e6a70d974 phototonic: Qt 5 infrastructure update 2015-12-20 07:56:45 -06:00
Thomas Tuegel 8bbbb31f3f awesomebump: Qt 5 infrastructure update 2015-12-20 07:56:45 -06:00
Thomas Tuegel 1f28d76190 luminance-hdr: Qt 5 infrastructure update 2015-12-20 07:56:45 -06:00
Thomas Tuegel d086276c1e photoqt: Qt 5 infrastructure update 2015-12-20 07:56:44 -06:00
Thomas Tuegel b829137151 apitrace: Qt 5 infrastructure update 2015-12-20 07:56:44 -06:00
Thomas Tuegel 7450865827 antimony: Qt 5 infrastructure update 2015-12-20 07:56:36 -06:00
Tobias Geerinckx-Rice 535b4279c7 ipad_charge, simple-scan: libusb{-compat -> 1} 2015-12-17 23:51:43 +01:00
Eelco Dolstra b797a67ffb awesomebump: Add 2015-12-16 23:31:41 +01:00
Tobias Geerinckx-Rice 99816323f9 saneBackendsGit 1.0.25.{177-g753d123 -> 180-g6d8b8d5} 2015-12-16 04:22:08 +01:00
Tobias Geerinckx-Rice 29ab5c3b9c simple-scan: 3.19.2 -> 3.19.3 2015-12-15 00:20:59 +01:00
Thomas Tuegel f7edf63b23 ipe: use texlive-new 2015-12-12 10:57:38 -06:00
Pascal Wittmann de37086064 potrace: 1.12 -> 1.13 2015-12-12 12:05:19 +01:00
Luca Bruno 5b0352a6a4 Merge branch 'master' into closure-size 2015-12-11 18:31:00 +01:00
Roel van Dijk b0bb9cd5fe fontmatrix: init at 0.6.0 2015-12-11 14:50:16 +01:00
Pavan Rikhi bd5ad569aa pencil: v2.0.14 -> v2.0.15 2015-12-10 13:26:08 -05:00
Tobias Geerinckx-Rice 34e1b71c62 simple-scan: drop obsolete systemd dependency 2015-12-10 03:42:48 +01:00
Tobias Geerinckx-Rice 120f8eef67 simple-scan: makeWrapper -> wrapGAppsHook 2015-12-10 03:37:38 +01:00
Arseniy Seroka e298da511f Merge pull request #11555 from rnhmjoj/imv
imv: 1.0.0 -> 1.1.0
2015-12-09 00:17:30 +03:00
Domen Kožar 4b0fcf8ea1 Merge pull request #11553 from FRidh/pil
WIP: remove PIL as dependency
2015-12-08 22:15:05 +01:00
rnhmjoj e8c55a06e2 imv: 1.0.0 -> 1.1.0 2015-12-08 16:22:16 +01:00
Frederik Rietdijk 60e2dced1a mirage: use pillow instead of pil 2015-12-08 15:11:00 +01:00
Frederik Rietdijk a044b590fc mcomix: use pillow instead of pil 2015-12-08 15:10:40 +01:00
Thomas Tuegel 4b950d233e ipe: 7.1.8 -> 7.1.10 2015-12-07 05:50:02 -06:00
Tobias Geerinckx-Rice b3635acffb swingsane: init at 0.2 2015-12-06 23:44:13 +01:00
Tobias Geerinckx-Rice 1d4b4dc8b6 saneBackends{,Git}: add more descriptive descriptions 2015-12-05 23:42:56 +01:00
Tobias Geerinckx-Rice df4ab4c9cc saneBackendsGit: add myself as maintainer 2015-12-05 23:42:56 +01:00
Tobias Geerinckx-Rice d3d5c79582 saneBackendsGit 1.0.24.73-g6c4f6bc -> 1.0.25.177-g753d123 2015-12-05 23:42:56 +01:00
Tobias Geerinckx-Rice 5bcd13156c saneBackends: add myself as maintainer 2015-12-05 23:42:56 +01:00
Tobias Geerinckx-Rice 256cec9756 saneBackends 1.0.24 -> 1.0.25
Changes too numerous to list here:

http://anonscm.debian.org/cgit/sane/sane-backends.git/tree/ChangeLog?h=RELEASE_1_0_25
2015-12-05 23:42:56 +01:00
Luca Bruno 920b1d3591 Merge branch 'master' into closure-size 2015-11-29 16:50:26 +01:00
Domen Kožar 67e03d0c50 Merge branch 'buildPythonPackage+wheels' 2015-11-26 17:38:35 +01:00
Tobias Geerinckx-Rice 2742025f29 apitrace 7.0 -> 7.1 2015-11-26 08:00:02 +01:00
Luca Bruno a412927924 Merge remote-tracking branch 'origin/master' into closure-size 2015-11-25 21:37:30 +01:00
Michael Raskin d53213677d Merge pull request #11248 from joachifm/more-trivial-builderDefs
More trivial builderDefs translations
2015-11-24 17:15:45 +03:00
Michael Alan Dorman 1c331d0c33 shotwell: fix failure to configure
Without this change, shotwell would fail even to configure, for lack of
gudev; I infer that libgudev was recently split off of udev, since this
was working fine until a couple of weeks ago.
2015-11-24 08:52:48 -05:00
Joachim Fasting ddb9c3b701 xaos: reimplement using mkDerivation 2015-11-24 14:45:15 +01:00
Tobias Geerinckx-Rice ef0265e3dc simple-scan 3.19.1 -> 3.19.2 2015-11-24 01:40:41 +01:00
Pascal Wittmann 9877cfb600 phototonic: init at 1.7 2015-11-22 13:00:57 +01:00
Domen Kožar 704c8bab41 buildPythonPackage: fix standalone applications using it 2015-11-21 21:44:12 +01:00
Vladimír Čunát 333d69a5f0 Merge staging into closure-size
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.
2015-11-20 14:32:58 +01:00
Lluís Batlle i Rossell bec459a94e Updating freecad to 0.15
(cherry picked from commit 8a18bc8722dc1739b5b2109d556032ca9a068bbd)

Conflicts:
	pkgs/top-level/all-packages.nix
2015-11-18 17:21:01 +01:00
William A. Kennington III 6602f49495 Revert "Revert "Merge pull request #9543 from NixOS/staging.post-15.06""
This reverts commit 741bf840da.

This reverts the fallout from reverting the major changes.
2015-11-14 12:32:51 -08:00
rnhmjoj 994753322c imv: add version in the package name 2015-11-14 10:11:12 +01:00
William A. Kennington III 9579c9ec7f Merge commit 'cb21b77' into master.upstream
This is a partial merge of staging for builds which are working
2015-11-13 15:53:10 -08:00
Arseniy Seroka 7ee9959984 Merge pull request #10990 from rnhmjoj/imv
imv: init at 1.0.0
2015-11-13 17:41:42 +03:00
rnhmjoj 03121cd5ac imv: init at 1.0.0 2015-11-12 19:40:00 +01:00
William A. Kennington III a26c8e9b83 Merge branch 'master.upstream' into staging.upstream 2015-11-07 15:51:51 -08:00
William A. Kennington III dd2de66d61 Merge branch 'master.upstream' into staging.upstream 2015-10-30 17:16:07 -07:00
Demin Dmitriy 0d12bbe574 pinta: Add installation of manpages and .desktop, locale and icon files 2015-10-30 06:39:09 +03:00
Demin Dmitriy 0ec62e0759 pinta: 1.4 -> 1.6 2015-10-29 21:51:41 +03:00
Vladimír Čunát 6c75f4c9aa imagemagick, soxr, fftw, libraw: remove explicit gcc.lib
It is no longer needed after cc-wrapper fixes.
2015-10-28 10:17:07 +01:00
Tobias Geerinckx-Rice 86805242ac simple-scan: remove PackageKit dependency
It has now been made properly optional.
2015-10-27 03:17:17 +01:00
Tobias Geerinckx-Rice 4b27f54db7 simple-scan 3.18.1 -> 3.19.1 2015-10-27 03:17:16 +01:00
Vladimír Čunát 4917a4f8b3 Merge master into staging 2015-10-23 01:57:14 +02:00
William A. Kennington III 8a44a36ca4 Merge branch 'master.upstream' into staging.upstream 2015-10-15 10:22:28 -07:00
Pavan Rikhi 01a903335c pencil: v2.0.13 -> v2.0.14 2015-10-15 11:40:37 -04:00
Nikolay Amiantov 2a117cda41 yed: 3.14.3 -> 3.14.4 2015-10-15 17:06:23 +03:00
Vladimír Čunát e25da7e5c8 xorg: split outputs of various libs 2015-10-14 14:27:07 +02:00
Vladimír Čunát 14332a282c feh: fix with multiple outputs and split docs 2015-10-13 20:18:59 +02:00
Vladimír Čunát cba6641623 cairo, pango: fix some string references 2015-10-13 20:18:51 +02:00
Vladimír Čunát a6e4c87391 gtk3: split into multiple outputs
All references OK, hopefully. Seems surprisingly smooth.
2015-10-13 20:18:45 +02:00
Tobias Geerinckx-Rice 8222eeca6e simple-scan 3.18.0 -> 3.18.1 2015-10-13 20:07:18 +02:00
Eelco Dolstra 741bf840da Revert "Merge pull request #9543 from NixOS/staging.post-15.06"
This reverts commit f61176c539, reversing
changes made to a27ca029ee.

Conflicts:
	pkgs/development/libraries/ncurses/default.nix
2015-10-06 15:24:20 +02:00
William A. Kennington III d9813ed4ac feh: 2.13.1 -> 2.14 2015-10-05 11:05:40 -07:00
Gabriel Ebner ff308d06e9 viewnior: 1.4 -> 1.5 2015-10-04 11:56:32 +02:00
Vladimír Čunát f361938b21 Merge staging into closure-size
This makes gcc5 the default builder, etc.
2015-10-03 15:23:13 +02:00
Vladimír Čunát 5227fb1dd5 Merge commit staging+systemd into closure-size
Many non-conflict problems weren't (fully) resolved in this commit yet.
2015-10-03 13:33:37 +02:00
Tobias Geerinckx-Rice 4a92863fd5 enblend-enfuse: rename to actual package name
Retain old and unreadable "enblendenfuse" alias for compatibility.
2015-10-02 05:34:34 +02:00
Thomas Tuegel 2e0589b4ca kde414: build with kdelibs-4.14.12
Upstream changes to the build system required adjusting many packages'
dependencies. On the Nixpkgs side, we no longer propagate the dependency
on cmake (to reduce closure size), so downstream dependencies had to be
adjusted for most packages that depend on kdelibs.
2015-09-27 15:08:12 -05:00
Vladimír Čunát 76ef7a93e3 Merge: xlibs and x11 attribute cleanup
Frequently using multiple *almost* identical attributes is bad.
2015-09-23 10:42:34 +02:00
Tobias Geerinckx-Rice 19dd43ba32 simple-scan: 3.17.92 -> 3.18.0 2015-09-22 03:44:48 +02:00
Vladimír Čunát a4d721efd7 djview: update 4.8 -> 4.10.3
Also kill tabs, remove unneeded (and failing) patch.
No qt5 yet, unfortunately.
2015-09-20 08:44:24 +02:00
Vladimír Čunát 88c9f8b574 xlibs: replace occurrences by xorg
This seems to have been confusing people, using both xlibs and xorg, etc.
- Avoided renaming local (and different) xlibs binding in gcc*.
- Fixed cases where both xorg and xlibs were used.
Hopefully everything still works as before.
2015-09-15 12:54:34 +02:00
Vladimír Čunát 21e3ff658a x11: replace its usage by xlibsWrapper directly
Scilab note: the parameters already had pointed to nonexistent dirs
before this set of refactoring. But that config wasn't even used by
default.
2015-09-15 12:08:24 +02:00
Mathnerd314 eb7404d97a all-packages: Use callPackage where possible 2015-09-14 22:27:19 -06:00
Tobias Geerinckx-Rice 49abb378e3 simple-scan: 3.17.91 -> 3.17.92 2015-09-14 10:20:38 +02:00
Cillian de Róiste a3a522286d synfigstudio: upgrade 0.64.3 -> 1.0.1 2015-09-13 20:58:22 +02:00
Arseniy Seroka 0948ead400 Merge pull request #9761 from eduarrrd/photoqt
Photoqt bump
2015-09-10 22:20:02 +03:00
Eduard Bachmakov 09bf6c95c6 photoqt: 1.2 -> 1.3 2015-09-09 19:00:51 -04:00
Eduard Bachmakov f040a1443e graphicsmagick: 1.3.18 -> 1.3.21 2015-09-09 19:00:37 -04:00
Tobias Geerinckx-Rice fb61a48ebf simple-scan: 3.17.90 -> 3.17.91 2015-09-05 04:20:23 +02:00
Luca Bruno 5c014feb0a imagemagick: fix ghostscript reference in .la files 2015-09-03 12:21:33 +02:00
Domen Kožar 0dfdb8938b meshlab: broken on i686 2015-09-02 20:26:02 +02:00
koral f5615752ae imagemagick: 6.9.1-0 -> 6.9.2-0, fixes #9591 2015-09-01 21:55:24 +02:00
Cillian de Róiste e67a0119e2 kde4.digikam: update from 4.11.0 to 4.12.0 2015-08-30 17:38:03 +02:00
Eelco Dolstra 1502117418 sane-backends: Separate doc output 2015-08-27 19:07:44 +02:00
Cillian de Róiste 2afaaf157e darktable: update from 1.6.7 to 1.6.8 2015-08-26 22:59:37 +02:00
Nikolay Amiantov fdb5ab0bba yed: change the go-to page per vendor request 2015-08-24 12:03:49 +03:00
Nicolas B. Pierron bb81ba7ef6 sane-config: Prevent find warnings by moving maxdepth argument first. 2015-08-23 13:55:25 +02:00
Nicolas B. Pierron f8caa49f00 sane-config: Merge /etc/sane.d/dll.conf content. 2015-08-23 13:54:34 +02:00
Nikolay Amiantov c6c2e253a6 yed: 3.14.2 -> 3.14.3, mark as not redistributable
Their license explicitly prohibits distribution and it's unclear whether they allow to download their binary automatically. I've asked to clarify their terms; this may be temporary.
2015-08-22 13:54:11 +03:00
Nikolay Amiantov 21c9f40b4d yed: fix checksum 2015-08-22 11:38:13 +03:00
Bjørn Forsman c9c3a3cb72 meshlab: add missing patch (doh!)
Should have been included in af7d5f27d0 ("meshlab: 1.3.2 -> 1.3.3").
2015-08-20 16:06:29 +02:00
Bjørn Forsman af7d5f27d0 meshlab: 1.3.2 -> 1.3.3
Remove patches that no longer apply (integrated upstream I guess), but
forward port the part that adds the missing "include <unistd.h>"[1].

Build and run tested.

[1]: http://sourceforge.net/p/meshlab/bugs/342/
2015-08-20 07:36:47 +02:00
Tobias Geerinckx-Rice 8131ca52d1 simple-scan: update 3.17.4 -> 3.17.90
Adds a dependency on PackageKit...

In better news:
 - Default to PDF when saving in all cases.
 - Always show file format options and use a combo box to fit better into
   dialog.
 - Detect HP scanners and install drivers using PackageKit if found.
 - If SANE detects no scanners but we see USB IDs of Brother, Epson or
   Samsung scanners then prompt the user to go to their website to install
   drivers.
 - Use GUsb instead of GUdev.
 - Fix error dialogs not showing.
2015-08-20 04:41:11 +02:00
Bjørn Forsman 2d17e52dc1 solvespace: download from github instead of gitorious
gitorious has shut down. Long live github.
2015-08-16 19:09:27 +02:00
Thomas Tuegel f0a11cd1eb ipe: add missing libjpeg dependency 2015-08-14 22:30:48 -05:00
Thomas Tuegel 7203497ce4 ipe: set LUA_PACKAGE name for make 2015-08-14 22:30:21 -05:00
Thomas Tuegel cce9a0f4d8 ipe: version 7.1.8 2015-08-14 22:29:58 -05:00
Thomas Tuegel df5f0cfb7c ipe: set platforms = linux 2015-08-14 22:28:51 -05:00
Thomas Tuegel 48a2034308 ipe: add ttuegel to maintainers 2015-08-14 22:28:42 -05:00
Thomas Tuegel c40dae0863 ipe: fix homepage 2015-08-14 22:28:23 -05:00
Lluís Batlle i Rossell 587f4f022e Making openimageio use parallel building.
(cherry picked from commit ff31b14cc51d3f493c62fb3074edc0c57fe8b7ce)
2015-08-12 11:04:54 +02:00
Damien Cassou a73336ad67 pencil 2.0.11 -> 2.0.13 2015-08-09 00:08:05 +02:00
Tobias Geerinckx-Rice fa7a0f24a4 Revert "simple-scan: fix build by adding lcms to buildInputs"
This reverts commit 37ff33196f.

This can't be it. `lcms` and `lcms2` are two entirely different packages.

Furthermore, the dependency is propagated through colord and should be
fixed there, if needed.
2015-08-07 01:45:18 +02:00
Pascal Wittmann 37ff33196f simple-scan: fix build by adding lcms to buildInputs 2015-08-06 16:32:46 +02:00
Ambroz Bizjak ce32291716 openscad: 2014.03 -> 2015.03-1
- Added dependencies harfbuzz, qscintilla, gettext.
- Removed redundant CFLAGS hack for eigen.
2015-08-06 10:30:17 +02:00
Arseniy Seroka a75c725fd4 Merge pull request #7954 from qknight/inkscape_boxmaker
inkscape with boxmaker plugin
2015-08-04 17:14:35 +03:00
Eelco Dolstra 55932c1bec Don't statically depend on cacert for certificates
This reverts commit cd52c04456 and
others.

Managing certificates (including revoking certificates and adding
custom certificates) becomes extremely painful if every package in the
system potentially depends on a different copy of cacert. Also, it
makes updating cacert rather expensive.
2015-07-31 01:34:58 +02:00
lethalman 35231964af Merge pull request #8859 from rycee/update/gimpPlugin.gmic
gimpPlugins.gmic: 1.5.7.2 -> 1.6.5.0
2015-07-30 18:19:20 +02:00
Luca Bruno 8dbc328ad6 shotwell: use gnome3.rest to fix build 2015-07-30 13:01:03 +02:00
Eelco Dolstra 7e8165b277 imagemagick: Move docs to separate output
This reduces the size of out from 21 MB to 8.7 MB.
2015-07-26 23:39:47 +02:00
Eelco Dolstra 7f0a596473 imagemagick: Reduce dependency bloat
The closure size of imagemagick has recently gone up from 530 MB
(already bad) to 846 MB, which is a bit excessive. So revert most of
the recent changes.
2015-07-26 23:33:49 +02:00
Eelco Dolstra a68de0cc16 Revert "geeqie: update from 1.1 to 1.2"
This reverts commit 82e07fb1e8. See
fee59b1235.
2015-07-26 22:46:45 +02:00
Tobias Geerinckx-Rice b8a5fab116 Merge pull request #8943 from lancelotsix/update_digikam
kde4.digikam: 4.10.0 -> 4.11.0
2015-07-25 01:37:52 +02:00
Tobias Geerinckx-Rice ec15244f1a apitrace: 6.1 -> 7.0
- Many bug fixes
- Switch to Qt 5
2015-07-23 03:12:24 +02:00
Tobias Geerinckx-Rice b1e58a7720 simple-scan: 3.17.3 -> 3.17.4 2015-07-22 16:57:41 +02:00
Lancelot SIX bb823e900a kde4.digikam: 4.10.0 -> 4.11.0 2015-07-22 09:28:58 +00:00
Robert Helgesson 3eaa7ba417 gmic: 1.5.7.2 -> 1.6.5.0 2015-07-21 21:45:00 +02:00
Luca Bruno 5a4d349ce7 processing: fix build (ZHF) 2015-07-21 16:18:21 +02:00
William A. Kennington III d605663ae2 Merge branch 'master.upstream' into staging.upstream 2015-07-05 13:06:02 -07:00
Eelco Dolstra 24d922ec3a openimageio: Update to 1.4.16 and fix name
(cherry picked from commit 17994d9e54448d71246f1221b188118fa7653ff7)
2015-07-02 15:36:42 +02:00
William A. Kennington III 612f0bdd67 Merge branch 'master.upstream' into staging.upstream 2015-06-30 23:58:07 -07:00
Pascal Wittmann 5ade71b1d7 pencil: wrap bin/pencil correctly, fixes #8551 2015-06-29 17:04:35 +02:00
Tuomas Tynkkynen 3dafe7a466 xfig: Fix build failure now visible due to #7524
The first 'find' command in postUnpack that attempts to add +x
permissions fails, because the +x permission is needed by the find
itself, and with the xargs method it's added too late.
2015-06-27 18:44:06 +03:00
Tobias Geerinckx-Rice 67f3c77fe6 simple-scan -> 3.17.3 2015-06-22 14:38:34 +02:00
Christoph Hrdinka fe010d893d darktable: update 1.6.6 -> 1.6.7 2015-06-18 14:13:27 +02:00
Tobias Geerinckx-Rice 98b2d7b727 Separate nativeBuildInputs where maintainers |= nckx 2015-06-17 22:21:32 +02:00
Pascal Wittmann 681b9bf9f9 Merge pull request #8284 from eduarrrd/photoqt
photoqt: 1.1.0.1 -> 1.2
2015-06-11 11:36:45 +02:00
Eduard Bachmakov 11f0f3cba9 photoqt: 1.1.0.1 -> 1.2
remove no longer necessary patch
2015-06-10 21:47:50 -04:00
lethalman 9ed71a26fe Merge pull request #8094 from rzetterberg/antimony
Adds antimony 0.8.0b CAD program
2015-06-08 15:04:01 +02:00
William A. Kennington III ffd0539eba cacert: store ca-bundle.crt in $out/etc/ssl/certs instead of $out 2015-06-05 13:00:52 -07:00
goibhniu c17aa9d3c6 Merge pull request #7875 from fkz/digikam
updated digikam to version 4.10.0
2015-06-05 17:53:55 +02:00
Eelco Dolstra 5d8fe045b6 Revert "Refactor mkFlag out of old packages"
This reverts commit 3117e0c897.

Conflicts:
	pkgs/development/libraries/wayland/default.nix
	pkgs/servers/samba/4.x.nix
2015-06-04 14:54:50 +02:00
Richard Zetterberg 1847e204e0 Adds antimony 0.8.0b CAD program 2015-06-02 11:11:39 +02:00
Pavan Rikhi 8bea2bc5bb pencil: v2.0.10 -> v2.0.11 2015-06-01 10:18:14 +02:00
Pascal Wittmann a35161177e fbida: update from 2.09 to 2.10
add meta info and adpot it
2015-05-31 16:30:24 +02:00
Cillian de Róiste 72b259f61e darktable: update from 1.6.4 to 1.6.6 2015-05-31 13:12:39 +02:00
Tobias Geerinckx-Rice 1d4bfeacc5 simple-scan 3.16.0.1 -> 3.17.2 2015-05-30 21:09:25 +02:00
William A. Kennington III cd52c04456 Fix more ca-bundle paths 2015-05-29 14:26:32 -07:00
Peter Simons 99273a6716 Merge pull request #8047 from nckx/master
Don't use "with licenses;" for single licences
2015-05-28 22:14:53 +02:00
Tobias Geerinckx-Rice 158e1cfdd0 Don't use "with licenses;" for single licences
And don't use square brackets on such lines.
2015-05-28 19:20:29 +02:00
Pascal Wittmann 8b38912260 potrace: update from 1.11 to 1.12 2015-05-28 19:06:11 +02:00
Tobias Geerinckx-Rice b2d7f4b1ba Use common licence attributes from lib/licenses.nix
Many (less easily automatically converted) old-style strings
remain.

Where there was any possible ambiguity about the exact version or
variant intended, nothing was changed. IANAL, nor a search robot.

Use `with stdenv.lib` wherever it makes sense.
2015-05-27 22:00:06 +02:00
William A. Kennington III 114b3b064b feh: 2.13 -> 2.13.1 2015-05-26 01:36:35 -07:00
William A. Kennington III 6e41581809 feh: 2.12.1 -> 2.13 2015-05-24 01:52:12 -07:00
Joachim Schiele 582ecf4771 inkscape with boxmaker plugin 2015-05-23 12:47:15 +02:00
Mateusz Kowalczyk 6014752e73 tesseract: fix postInstall
We needed to separate each of the unpack commands.
2015-05-23 02:27:47 +01:00
William A. Kennington III 3117e0c897 Refactor mkFlag out of old packages 2015-05-22 13:54:52 -07:00
aszlig adb7581459
tesseract: Allow to specify a subset of languages.
Especially useful for our OCR based VM tests, where we only need the
english language. By default the argument is null so all languages are
included. If a list of language name is passed only those languages are
enabled, for example:

tesseract.override { enableLanguages = [ "eng" "spa" ]; };

To only enable support for English and Spanish languages.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-05-22 07:45:59 +02:00
Pascal Wittmann 10e001ab5b ocrad: update from 0.24 to 0.25 2015-05-19 20:08:15 +02:00
Luca Bruno 1b6401fd2e More usage of gnome3.defaultIconTheme 2015-05-19 14:40:04 +02:00
Fabian Schmitthenner 86cfcabfbb digikam: enable face recognition 2015-05-18 10:07:56 +00:00
Fabian Schmitthenner b2dc40401b updated digikam to version 4.10.0 2015-05-17 18:06:49 +00:00
Eric Seidel 67fe5d46d4 Merge pull request #7817 from gridaphobe/cc-wrapper-isgnu-isclang
Add isGNU and isClang attributes to cc-wrapper
2015-05-14 10:09:07 -07:00
Nikolay Amiantov b575dc53ad yEd: update 2015-05-12 17:25:24 +03:00
Eric Seidel 662a6b1ca6 remove all references to `stdenv.cc.cc.is{GNU,Clang}`
use the new `stdenv.cc.is{GNU,Clang}` instead, which will always be
defined.
2015-05-11 14:44:50 -07:00
William A. Kennington III 074c4a7f78 Merge remote-tracking branch 'upstream/master' into staging 2015-05-07 01:44:49 -07:00
Peter Simons 324719a5a6 Drop obsolete pre-NG Haskell builds. 2015-05-05 21:44:47 +02:00
Vladimír Čunát 3b9ef2c71b fix "libc}/lib" and similar references
Done mostly without any verification.
I didn't bother with libc}/include, as the path is still correct.
2015-05-05 11:52:08 +02:00
Vladimír Čunát 375bc8def7 Merge staging into closure-size 2015-05-05 11:49:03 +02:00
Vladimír Čunát 30f31c9afc Merge 'master' into staging
(relatively simple conflicts)
2015-04-26 22:52:08 +02:00
William A. Kennington III 1adb482638 Convert more applications to libmysql 2015-04-22 16:09:41 -07:00
Joachim Fasting 8488d133f3 meta.licenses -> license 2015-04-21 23:10:07 +02:00
Vladimír Čunát 082843bdeb soxr, libraw, fftw, imagemagick: fix build by a hack 2015-04-21 09:59:37 +02:00
Joel Moberg 49f4dba4c7 xournal: add license info 2015-04-20 18:22:37 +02:00
Cillian de Róiste 3c656e1014 darktable: update from 1.6.3 to 1.6.4 2015-04-20 14:49:55 +02:00
Tobias Geerinckx-Rice 6e6a41d1d6 apitrace 09519af205 -> 6.1 2015-04-17 00:46:21 +02:00
Arseniy Seroka f029ccadc9 Merge pull request #7385 from Forkk/screencloud
Add package for Screencloud 1.2.0
2015-04-16 06:28:00 +03:00
Forkk f7865c29c2 screencloud: init at 1.2.0
Added a package for Screencloud, a program for taking screenshots and
uploading them to various websites.

This package was a bit finicky due to some nonsense in the CMakeLists
file, but it seems to work properly.

The package also includes API keys for the screencloud.net website.
According to the author of the Arch Linux User Repo package for
screencloud, these keys are only used for usage tracking, so we should
be fine including them in the package here.
2015-04-15 22:04:39 -05:00
Pavan Rikhi 8571ce2a8a pencil: v2.0.9 -> v2.0.10 2015-04-14 07:25:36 -04:00
William A. Kennington III 6044bfe3af feh: 2.12 -> 2.12.1 2015-04-12 20:34:20 -07:00
Thomas Tuegel 88918e10e9 Merge branch 'master' into staging 2015-04-10 07:45:38 -05:00
Pavan Rikhi 251f801719
pencil: v2.0.8 -> v2.0.9 2015-04-09 03:54:13 -04:00
Aristid Breitkreuz 13360ba5dc Merge pull request #7257 from spwhitt/inkscape
Fixes to build inkscape on Darwin
2015-04-08 21:59:48 +02:00
Spencer Whitt 22dfdbd2cf inkscape: patch to build with clang (Darwin) 2015-04-08 01:05:51 -04:00
Spencer Whitt ce1e7cccb6 feh: enable build on Darwin 2015-04-07 18:49:27 -04:00
Eric Seidel 6ec373d776 Merge branch master into staging 2015-04-06 18:58:08 -07:00
Ryan Mulligan 93f1029b0f Get rid of fetchurlGnome
closes #1707
2015-04-04 22:22:12 -07:00
Arseniy Seroka d7382dc748 Merge pull request #7130 from spwhitt/gimp
Get GIMP to build on Darwin and misc. related fixes
2015-04-02 06:02:49 +03:00
William A. Kennington III a604b42480 mysql: Use libs in place of the binary mysql 2015-04-01 16:46:53 -07:00
Spencer Whitt 2b79ac6339 gimp: build on Darwin 2015-04-01 19:25:06 -04:00
lethalman b6c7eba554 Merge pull request #7097 from prikhi/update-pencil
pencil: v2.0.5 -> v2.0.8
2015-03-31 10:10:23 +02:00
Pavan Rikhi f67ce9160d
pencil: v2.0.5 -> v2.0.8
Switch to actively developed fork.
2015-03-30 22:59:04 -04:00
Tobias Geerinckx-Rice ee7c9bd86a Add simple-scan 3.16.0.1 2015-03-31 00:51:47 +02:00
Michael Raskin 70a1e3c837 propagate many inputs in imagemagick: otherwise dependent builds fail 2015-03-30 08:46:16 +03:00
William A. Kennington III b058f829d2 ImageMagick: Disable HDRI for now 2015-03-29 19:37:53 -07:00
William A. Kennington III fa2e5b25ba Merge branch 'master' into staging 2015-03-29 14:25:48 -07:00
Nikolay Amiantov c7a0925ac2 yEd: update 2015-03-29 13:01:47 +03:00
William A. Kennington III 7ccccc15ba Merge branch 'master' into staging 2015-03-27 16:03:03 -07:00
William A. Kennington III 49e980fa32 imagemagick: More cleanups 2015-03-27 15:46:08 -07:00
William A. Kennington III 1f632813e4 imagemagick: Refactor 2015-03-27 15:36:26 -07:00
William A. Kennington III 5d2fd00457 imagemagick: 6.9.0 -> 6.9.1 2015-03-27 15:36:25 -07:00
William A. Kennington III 767c179a94 Merge branch 'master' into staging 2015-03-26 14:44:05 -07:00
Mateusz Kowalczyk e104a7870f sxiv: update to latest git 2015-03-25 00:46:58 +00:00
Thomas Tuegel 5d1f6ad57c qt5: make qt-5.4.1 default 2015-03-24 17:14:56 -05:00
Vladimír Čunát e924f05cc3 Merge branch 'master' into staging 2015-03-17 13:35:05 +01:00
Cillian de Róiste 849df05f6c digiKam: tidy up, and add myself to the maintainers 2015-03-15 14:56:09 +01:00
Cillian de Róiste a2c488e6c0 digiKam: fix gphoto camera support 2015-03-15 14:56:09 +01:00
Peter Simons 6694ef42a9 Merge branch 'master' into staging.
Conflicts:
      pkgs/development/libraries/gtk+/2.x.nix
      pkgs/tools/security/gnupg/21.nix
      pkgs/top-level/all-packages.nix
2015-03-10 12:09:43 +01:00
Luca Bruno aae9e49cbc Add setup-hook to hicolor_icon_theme 2015-03-09 15:55:24 +01:00
Cillian de Róiste 79d7605311 darktable: update from 1.6.2 to 1.6.3 2015-03-07 19:02:55 +01:00
Vladimír Čunát 33153a2166 paraview, vtk: fix build after mesa update 2015-03-06 12:09:01 +01:00
Peter Simons 5341196f01 Merge branch 'master' into staging. 2015-03-02 21:10:36 +01:00
Cillian de Róiste 66dc6872ce darktable: update from 1.6.1 to 1.6.2 2015-02-28 17:12:12 +01:00
Bob van der Linden 0ae99380d0 yed: upgraded to yed-3.14 2015-02-24 15:35:09 +01:00
Luca Bruno bf521d7b55 Add setup-hook to hicolor_icon_theme 2015-02-24 14:09:31 +01:00
aszlig 7cd6dd9ada
inkscape: Clean up and update to version 0.91.
This now also includes support vor visio and cdr and also adds the
missing dependency on libexif.

Forcing -lX11 in NIX_LDFLAGS is no longer needed in 0.91, so we drop
that as well as the patch and the --with-python configure flag, which is
now no longer even valid.

Tests now seem to run fine without -j1 as well.

I also tested it against the DXF test file mentioned in #3449, to be
sure we don't regress here.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-02-22 08:14:53 +01:00
Mateusz Kowalczyk 2875250c5f mcomix: update to 1.01 2015-02-09 12:16:38 +00:00
Cillian de Róiste 90e9c1a63c synfigstudio 0.64.2 -> 0.64.3 2015-02-07 18:21:18 +01:00
Shea Levy c45372f038 Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae'
Partial staging merge, including cc-wrapper fixes

Conflicts:
	pkgs/applications/audio/spotify/default.nix
	pkgs/build-support/cc-wrapper/default.nix
	pkgs/development/compilers/cryptol/1.8.x.nix
2015-02-02 21:14:28 -05:00
Sibi 7f5718b06f Version bump and made name attribute to lowercase.
(Tested the fix in my local machine just to be sure)
2015-01-30 18:49:38 +05:30
Vladimír Čunát b35e0a09a8 imagemagick: fixup URL after #6056 2015-01-29 23:18:19 +01:00
Sibi 8e5cf5889c imagemagick: rename package to lowercase (close #6056)
Change it to lowercase to according to the convention presented here:
http://nixos.org/nixpkgs/manual/#chap-conventions

Thanks to goibhniu from #nixos for pointing me this.
2015-01-29 19:36:26 +01:00
lethalman cd487d6489 Merge pull request #5911 from echo-oddly/leocad
new package: leocad
2015-01-27 12:59:26 +01:00
David Virgilio cd96404ff9 new package: leocad 2015-01-26 01:44:33 -06:00
Mateusz Kowalczyk 5881401348 sxiv: update to most recent git 2015-01-23 19:41:28 +00:00
Lluís Batlle i Rossell 205e338a83 Updating digikam to 4.6.0 and adding libpgf.
4.6.0 fixes the build with current gcc/glibc, and libpgf was a new requirement.

(cherry picked from commit 91b63783e1cd28801c69c4c28a0e320de0500787)
2015-01-23 10:30:16 +01:00
vbgl 7edbd7ad19 Merge pull request #5041 from vbgl/mono
Updates mono, fsharp and monodevelop

Closes #4782.
2015-01-21 13:54:37 +01:00
Vincent Laporte abfee3e840 feh: enable exif support 2015-01-21 10:54:54 +01:00
Vincent Laporte 480148f2ce Removes f-spot (broken) 2015-01-20 09:30:09 +01:00
Eric Seidel f272730399 rename <gcc-frontend>.gcc to <gcc-frontend>.cc 2015-01-14 20:59:10 -08:00
Pascal Wittmann 82e07fb1e8 geeqie: update from 1.1 to 1.2
Fetch source from debian as the geeeqie team stopped using sourceforge, see
https://www.mail-archive.com/geeqie-devel@lists.sourceforge.net/msg01484.html
2015-01-14 14:23:46 +01:00
Ludovic Courtès 41b53577a8 unmaintain a bunch of packages 2015-01-13 22:33:49 +01:00
Cillian de Róiste d168e77b71 darktable: update from 1.6.0 to 1.6.1 2015-01-02 23:48:48 +01:00
Eelco Dolstra fee59b1235 geeqie: Revert to 1.1
Version 1.2 has some relatively critical issues:

  https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=762257
  https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=765437

Until these are fixed, it's better to stick to 1.1.
2015-01-02 17:15:20 +01:00
Lluís Batlle i Rossell b985a9e0a1 Adding scantailor.
(cherry picked from commit 7eda68709e9e50b1c4a608ab141f6c7065708c0f)
2014-12-29 10:23:27 +01:00
Eduard Bachmakov 5e4a8d9fd8 Add photoqt-1.1.0.1
Also, add myself to maintainers.
2014-12-27 22:13:41 +01:00
Matthias C. M. Troffaes 29575e4901 Also install hicolor_icon_theme. 2014-12-22 09:36:20 +00:00
Matthias C. M. Troffaes 1aacda5490 shotwell: Fix "Using the 'memory' GSettings backend" (fix suggested by lethalman, see issue #5433). 2014-12-22 09:36:20 +00:00
Matthias C. M. Troffaes 59e22e8879 shotwell: uses icons from gnome3.gnome_icon_theme and gnome3.gnome_icon_theme_symbolic 2014-12-22 08:47:21 +00:00
Pascal Wittmann f94580da69 Fix license attribute of many bsd-like licensed packages 2014-12-21 00:00:35 +01:00
Pascal Wittmann f55545c0c9 fix maintainer information
s/maintainer/maintainers
2014-12-20 21:54:22 +01:00
Oliver Charles 6221af50c4 apitrace: New expression 2014-12-14 15:41:51 +00:00
Vladimír Čunát 8ca78f0376 luminance-hdr: fix build by Debian patch 2014-12-10 13:36:57 +01:00
Markus Kohlhase 3826c3fc32 nixpkgs: darktable 1.4.2 -> 1.6.0 2014-12-09 18:50:42 +01:00
Domen Kožar 4aa3eec330 Merge branch 'master' into staging
Conflicts:
	pkgs/development/libraries/fontconfig/default.nix
2014-12-07 14:02:48 +01:00
Mateusz Kowalczyk 4106631b96 sxiv: update git revision 2014-12-03 16:55:17 +00:00
Vladimír Čunát cbd2305d4d Merge branch 'master' into staging 2014-11-28 18:59:07 +01:00
Vladimír Čunát e86ebdc0e3 synfigstudio: fix a strange build error
Also enableParallelBuilding.
fonts.conf isn't supposed to be put into buildIputs, but it's still weird.
2014-11-26 23:17:43 +01:00
Edward Tjörnhammar d177b477c1 Merge pull request #5138 from abbradar/yed
yed: add package
2014-11-26 22:17:48 +01:00
Nikolay Amiantov 88aa54a09f yed: add package 2014-11-27 00:15:30 +03:00
Domen Kožar 00146e3e08 shotwell: 0.18.0 -> 0.20.2, fix build 2014-11-26 22:13:07 +01:00
Igor Pashev 53fc3e178f ImageMagick: update (close #5133) 2014-11-26 21:49:11 +01:00
Vladimír Čunát b1803465d9 imagemagick: use a stable URL, reshuffle mirrors
CC: #5133.
2014-11-26 21:42:42 +01:00
Cillian de Róiste d250ca4e31 openimageio: update from 1.4.14 to 1.4.15 2014-11-25 15:33:22 +01:00
Cillian de Róiste 909311b650 openimageio: update from 1.4.13 to 1.4.14 2014-11-24 22:17:00 +01:00
lethalman 44628e9e90 Merge pull request #5036 from abbradar/sane-mfd-fix
sane: fix multifunctional devices rights conflict with cups
2014-11-19 17:29:40 +01:00
Cillian de Róiste 86fd3ad7a4 kde4.digikam: update from 3.5.0 to 4.4.0, potentially fixes CVE-2012-4514 2014-11-18 21:32:58 +01:00
Michael Raskin fb76f0fe7d Fix XSane build 2014-11-16 11:28:21 +03:00
Nikolay Amiantov 88d731925d sane: fix multifunctional devices rights conflict with cups 2014-11-16 03:44:37 +03:00
Mateusz Kowalczyk 55ec78eac4 sxiv: update revision
Mainly to kick off Hydra again: it thinks the build is broken because we
used a SSH URL for git before.
2014-11-15 01:54:00 +00:00
Pascal Wittmann 8df0e0b151 Fixed many descriptions 2014-11-11 14:36:34 +01:00
Eelco Dolstra 6f53886360 imagemagick: Use --with-gcc-arch
Without this, ImageMagick's configure script will generate code
specific to the machine building the package. This code may then fail
on other CPU types.

http://hydra.nixos.org/build/16564129
Signed-off-by: Domen Kožar <domen@dev.si>
2014-11-06 11:10:32 +01:00
Mateusz Kowalczyk 007f80c1d0 Turn more licenses into lib.licenses style
Should eval cleanly, as far as -A tarball tells me.

Relevant: issue #2999, issue #739
2014-11-06 00:48:16 +00:00
Eelco Dolstra ebfdfdb7e4 geeqie: Disable libchamplain dependency for now
It causes Geeqie to depend on both GTK+ 2 and 3, which is undesirable.
2014-11-05 14:45:52 +01:00
Eelco Dolstra 4942acc0d9 geeqie: Don't use fetchgit
Fetchgit considered harmful.
2014-11-05 14:45:49 +01:00
Eelco Dolstra 1aafb0a700 Revert "geeqie: xxd is required as build dependency"
This reverts commit 852f0bf2d4. Geeqie
builds fine without vim.
2014-11-05 14:45:20 +01:00
Pascal Wittmann 852f0bf2d4 geeqie: xxd is required as build dependency 2014-11-05 13:52:58 +01:00
Mateusz Kowalczyk 6e726e1348 sxiv: use https 2014-11-05 11:33:45 +00:00
Michael Raskin 0e3a86e145 Fix GeeQie build 2014-11-04 15:12:23 +03:00
Michael Raskin a2fffba5cf Re-remove boost.lib 2014-11-04 12:19:37 +03:00
Michael Raskin dddf86ca28 Update Rapcad 2014-11-04 12:15:20 +03:00
Mateusz Kowalczyk de96fb7cc7 sxiv: update to 1.3-git and fix runtime behaviour
The fix involves using imlib2 built with giflib instead of a libungif.
Initially I split imlib2 into two but other distros seem to build imlib2
with giflib already and everything still builds with giflib version so I
migrated imlib2 to giflib all together.

Closes #4622
2014-11-03 23:03:51 +00:00
Peter Simons b5fed52c43 Merge pull request #4238 from wkennington/master.boost
Make boost 156 the default
2014-11-03 23:03:01 +01:00
Michael Raskin b8069e784e Update zgrviewer 2014-11-03 16:54:38 +03:00
William A. Kennington III d660565747 synfigstudio: Refactor 2014-11-02 18:58:40 -08:00
William A. Kennington III 096e002f0b geeqie: Refactor 2014-11-02 17:22:28 -08:00
William A. Kennington III aa3e800be7 boost: Remove boost.lib 2014-11-02 17:22:27 -08:00
Cillian de Róiste 9751c9a1cc synfigstudio: update from 0.64.1 to 0.64.2 2014-11-03 00:02:48 +01:00
Mateusz Kowalczyk 7f7233b61d sxiv: use giflib 5.0
https://github.com/muennich/sxiv/issues/180
2014-10-22 18:42:35 +01:00
Justin Bedo cd1bacb03d Update ImageMagick version 2014-10-20 17:49:30 +11:00
Longrin Wischnewski 6e7de2155b change md5sum to sha256sum for a few packages 2014-10-12 16:13:21 +02:00
Domen Kožar 9ca95f700e sxiv: add missing patch 2014-10-11 18:19:58 +02:00
Domen Kožar 51ac867551 sxiv: 1.1.1 - 1.2 2014-10-11 18:06:46 +02:00
Aristid Breitkreuz 6f07399727 ufraw: update from 0.19.2 to 0.20 2014-10-08 20:23:25 +02:00
Michael Raskin d171942ed1 Update Dia 2014-10-07 16:23:27 +04:00
Pascal Wittmann e42f5edb7c ocrad: update from 0.23 to 0.24 2014-10-07 10:47:39 +02:00
Michael Raskin fdad3e5661 Geeqie release is a Git tag, apparently Gitorious gave non-deterministic archive 2014-10-04 16:38:09 +04:00
Pascal Wittmann d156824f48 geeqie: update from 1.1 to 1.2 and adopt it 2014-09-26 23:18:57 +02:00
Pascal Wittmann d1c7ac1388 Merge pull request #4281 from sztupi/openimageio-version-fix
openimageio: using tagged version as src url instead of (moving) branch
2014-09-26 16:09:47 +02:00
Attila Sztupak 4a9f541a86 openimageio: using tagged version as src url instead of (moving) branch 2014-09-26 11:44:02 +01:00
David Guibert 691c8393ea Merge pull request #4276 from k0ral/xournal
xournal: 0.4.5 -> 0.4.8
2014-09-26 09:45:31 +02:00
koral d178ce6e1e xournal: 0.4.5 -> 0.4.8 2014-09-25 23:58:53 +02:00
Pascal Wittmann d9fb16ebd7 ocrad: update from 0.21 to 0.23 and adopt it 2014-09-25 21:14:17 +02:00
Domen Kožar 6e3114a8a3 k3d: 0.8.0.2 -> 0.8.03 2014-09-23 11:33:40 +02:00
William A. Kennington III 31220480d8 boost: Update depdendent packages 2014-09-21 17:20:59 -07:00
Moritz Ulrich fe3c2a56c8 New package: Solvespace.
A parametric 2D/3D CAD application.
2014-09-15 16:29:08 +02:00
Pascal Wittmann 8d67b9a240 transformed meta.maintainers of some packages into lists 2014-09-13 13:52:02 +02:00
Rob Vermaas fdfd948d96 panotools: update from 2.9.18 to 2.9.19 2014-09-11 13:34:50 +02:00
Luca Bruno 83c968fa2c Add new kgraphviewer and massif-visualizer packages
I chose the unstable versions because the stable versions
seemed too outdated to me. They work with kde 4.12 anyway.
2014-09-03 17:04:22 +02:00
Cillian de Róiste cc1866eacb processing: apply patch from IRC to make it work without the IDE too 2014-09-02 08:58:09 +02:00
Cillian de Róiste 622bdca26c processing: keep processing-java and patch it to make it work 2014-08-31 22:46:02 +02:00
Michael Raskin 347dd52019 Fix K3D build 2014-08-31 12:53:13 +04:00
Michael Raskin dcb38fc8aa Add missing libXmu dependency 2014-08-31 00:26:03 +04:00
Michael Raskin d593d3ac88 Fix K3D patching and cmake-configuration phases 2014-08-30 23:49:11 +04:00
Cillian de Róiste ef9c1d612d processing: add license 2014-08-30 19:54:03 +02:00
Cillian de Róiste c40a256548 Add processing: A language and IDE for electronic arts
(cherry picked from commit 0db6387d1c3a8a8f7a9a1e111532d8acd1f794d6)
2014-08-30 19:20:13 +02:00
Mateusz Kowalczyk 4210665c4f mcomix: update to 1.00 2014-08-30 13:48:02 +01:00
Rüdiger Sonderfeld 4d84ac77f9 gimp: Update to 2.8.14. 2014-08-27 18:46:24 +02:00
Cillian de Róiste 307924bbcc synfigstudio: fix chroot build / hydra
The error message was:
Fontconfig error: Cannot load default config file
make[2]: *** [128x128/synfig_icon.png] Segmentation fault

(cherry picked from commit 759980c4fe9b07932f671d2e657189068d117405)

Conflicts:
	pkgs/top-level/all-packages.nix
2014-08-25 23:00:59 +02:00
Bjørn Forsman c9baba9212 Fix many package descriptions
(My OCD kicked in today...)

Remove repeated package names, capitalize first word, remove trailing
periods and move overlong descriptions to longDescription.

I also simplified some descriptions as well, when they were particularly
long or technical, often based on Arch Linux' package descriptions.

I've tried to stay away from generated expressions (and I think I
succeeded).

Some specifics worth mentioning:
 * cron, has "Vixie Cron" in its description. The "Vixie" part is not
   mentioned anywhere else. I kept it in a parenthesis at the end of the
   description.

 * ctags description started with "Exuberant Ctags ...", and the
   "exuberant" part is not mentioned elsewhere. Kept it in a parenthesis
   at the end of description.

 * nix has the description "The Nix Deployment System". Since that
   doesn't really say much what it is/does (especially after removing
   the package name!), I changed that to "Powerful package manager that
   makes package management reliable and reproducible" (borrowed from
   nixos.org).

 * Tons of "GNU Foo, Foo is a [the important bits]" descriptions
   is changed to just [the important bits]. If the package name doesn't
   contain GNU I don't think it's needed to say it in the description
   either.
2014-08-24 22:31:37 +02:00
Domen Kožar bd32f323d8 k3d: move patches into source 2014-08-23 11:46:53 +02:00
Peter Simons e910c8d6c9 Disable Hydra builds for broken Haskell packages.
The following packages are broken with GHC 7.8.3:

 - filesystem-conduit version 1.0.0.2
 - ghc-events-analyze version 0.2.0
 - haskelldb version 2.2.2
 - haskell-mpi version 1.2.1
 - haxr-th version 3000.5
 - hoauth version 0.3.5
 - holy-project version 0.1.1.0
 - hoogle version 4.2.32
 - hspread version 0.3.3
 - instant-generics version 0.4
 - ivor version 0.1.14.1
 - jmacro-rpc-happstack version 0.3
 - lambdacube-engine version 0.2.4
 - language-c-inline version 0.6.0.0
 - lockfree-queue version 0.2.3
 - monad-peel version 0.1.1
 - network-transport-tests version 0.1.0.1
 - poppler version 0.12.3
 - profiteur version 0.1.2.1
 - prolog-graph-lib version 0.2.0.1
 - semigroupoid-extras version 4.0
 - setlocale version 0.0.3
 - sized-types version 0.5.0
 - snaplet-postgresql-simple version 0.5
 - snap-loader-dynamic version 0.10.0.2
 - uhc git version 20120502
 - uniqueid version 0.1.1
 - unix-process-conduit version 0.2.2.3
 - vado version 0.0.1
 - vcsgui version 0.0.4
 - xml-html-conduit-lens version 0.3.2.0

The following packages depend on one of the broken ones above:

 - hoodle-builder version 0.3
 - hoodle-core version 0.14
 - hoodle-extra version 0.1
 - hoodle-parser version 0.3
 - hoodle-render version 0.4
 - hoodle-types version 0.3
 - hoodle version 0.3
 - kansas-lava version 0.2.4
 - liblastfm version 0.4.0.0
 - prolog-graph version 0.1.0.2
 - vacuum-cairo version 0.5
 - wcwidth version 0.0.2
2014-08-20 20:26:57 +02:00
Mateusz Kowalczyk 03a37d5851 Add Japanese to default tesseract languages 2014-08-17 11:54:25 +01:00
Vladimír Čunát 6af1388fbd kipi_plugins: mark as broken; should come from digikam 2014-08-14 15:43:35 +02:00
Vladimír Čunát df76cbaa21 hugin, enblend-enfuse: enbaleParallelBuilding, default boost
Also unset meta.broken.
2014-08-12 21:17:53 +02:00
Vladimír Čunát 54c18db1ca Merge master into this PR 2014-08-12 21:16:47 +02:00
Christoph Hrdinka f44e69a55d luminanceHDR: add version 2.4.0
fixes #3229
2014-08-12 10:19:35 +02:00
Michael Raskin 004be1bf51 Fix oiio build; maybe will fix blender build 2014-08-12 04:33:10 +04:00
Cillian de Róiste d597651949 inkscape: add python to the PATH, fixes #3449 2014-08-09 17:02:36 +02:00
Peter Simons 5ebc4d829b Re-generate Haskell expressions with latest cabal2nix. 2014-08-09 13:49:24 +02:00
Vladimír Čunát 52d9c93abe Merge 'staging' into master 2014-08-08 20:13:23 +02:00
Eelco Dolstra 8a7f3c3618 Mark a bunch of packages as broken or not supported on Darwin 2014-08-08 17:59:02 +02:00
Peter Simons 9226fbf56a Merge remote-tracking branch 'origin/master' into staging. 2014-08-08 09:51:01 +02:00
Christoph Hrdinka 83f78fa82d mcomix: add sqlite3 dependency 2014-08-07 08:57:02 +02:00
NOTtheMessiah 682f215084 Update default.nix 2014-08-07 01:17:01 +02:00
NOTtheMessiah 9e9e628417 Added gcolor2 2014-08-07 01:17:01 +02:00
Peter Simons 2d326e5032 Merge remote-tracking branch 'origin/master' into staging.
Conflicts:
	pkgs/desktops/e18/enlightenment.nix
2014-08-04 16:51:47 +02:00
Bjørn Forsman 5fc4ab1dfe freecad: small cleanup
* FreeCAD v0.14 switched from pyqt4 to pyside, remove unneeded pyqt4 dependency
* cmake.patch is not used anymore, remove it
* License is now only LGPLv2+ (since v0.14)
* Homepage moved to http://www.freecadweb.org/

Ref. http://www.freecadweb.org/wiki/index.php?title=Release_notes_014
2014-08-03 13:26:14 +02:00
Vladimír Čunát 6295a3ca36 Merge recent master into x-updates
Hydra: ?compare=1142825

Conflicts (easy):
	pkgs/applications/audio/lmms/default.nix
	pkgs/desktops/e18/enlightenment.nix
	pkgs/games/exult/default.nix
	pkgs/os-specific/linux/alsa-plugins/default.nix
2014-08-02 05:08:07 +02:00
Lluís Batlle i Rossell 5e35fef0eb freecad: updating to 0.14
I had to update all the pyside programs, or freecad failed to build.  I picked
the versions advertised in http://qt-project.org/wiki/PySideDownloads . The
rest I took for github latest releases.
2014-08-01 16:56:27 +02:00
Peter Simons d0ca8c237e Fix broken license references. 2014-07-28 11:43:20 +02:00
Mateusz Kowalczyk 7a45996233 Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
Vladimír Čunát b9045a7d96 Merge branch 'x-updates' into staging
...in preparation for a merge to master
2014-07-22 22:28:39 +02:00
Eelco Dolstra 7f410ef923 Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/misc/vim-plugins/default.nix
2014-07-22 11:00:00 +02:00
Vladimír Čunát 9b02635faa Merge recent master into x-updates
Hydra: ?compare=1138350

Conflicts:
	nixos/modules/services/x11/desktop-managers/default.nix
	Two imports were added independently on the same line.
	I split it as well, as it was very long now.
2014-07-21 12:05:57 +02:00
Cillian de Róiste bc8fe732d0 Add gimpPlugins.focusblur 2014-07-20 21:28:50 +02:00
Vladimír Čunát df99ec18dc inkscape: enableParallelBuilding, doCheck, add meta 2014-07-18 11:56:47 +02:00
Vladimír Čunát 7e9a0b8ec2 inkscape: maintenance update
Needed to fix build with poppler-0.26.
2014-07-18 11:56:44 +02:00
Vladimír Čunát 16e35532e4 Merge recent master into x-updates 2014-07-17 19:30:56 +02:00
Peter Simons f0de2bd4a1 Re-generate Haskell expressions with cabal2nix. 2014-07-16 12:10:10 +02:00
Ian-Woo Kim 02d6445409 update hoodle-types 0.2.2 -> 0.3, hoodle-builder 0.2.2.0 -> 0.3, hoodle-parser 0.2.2 -> 0.3, hoodle-render 0.3.2 -> 0.4, hoodle-core 0.13.0.0 -> 0.14, and hoodle 0.2.2.1 -> 0.3 2014-07-16 12:10:10 +02:00
Eelco Dolstra ff97b7dbe6 Merge remote-tracking branch 'origin/master' into staging 2014-07-14 17:04:55 +02:00
Peter Simons d2e731e111 Add "please don't edit" comment at the top of every auto-generated Haskell file. 2014-07-14 13:21:41 +02:00
Christoph Hrdinka 75518f748f hugin: update to version 2013.0.0 2014-07-12 13:18:22 +02:00
Vladimír Čunát 4b263946dd qt3, graphicsmagick137, fox, neverball: fix build
Broken after freetype propagating libpng, which hid the older ones.
Reordering is enough to ensure the older libpng gets picked.
2014-07-09 21:52:04 +02:00
Eelco Dolstra 06fc1ec34d Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/servers/serfdom/default.nix
2014-07-01 11:25:41 +02:00
Eelco Dolstra 40f7b0f9df Another attempt to eradicate ensureDir
See c556a6ea46.
2014-06-30 14:56:10 +02:00
Benno Fünfstück e10001042d fetchbzr, fetchdarcs, fetchhg: use `rev` attr
This makes it match the behaviour of fetchgit and fetchsvn, so it's
easier to write scripts that support all of them.
2014-06-28 21:06:10 +02:00
Bjørn Forsman a14365b568 alchemy: add meta.longDescription 2014-06-22 21:46:34 +02:00
Michael Raskin 566ef0e31a Adding an auto-updater script for qiv and updating it to 2.3.1 2014-06-13 13:37:12 +04:00
Michael Raskin ed7b509fbf Oops. Fix the permissions on initialized persistence file for Dia 2014-06-13 01:33:18 +04:00
Michael Raskin 6b35f37005 Fix dia when run not from $PATH 2014-06-13 01:22:56 +04:00
Michael Raskin 80b701ca94 Put a correct Dia persistence file in ~/.dia unless such a file exists. Fixes #1691. 2014-06-12 15:02:49 +04:00
John Wiegley 0085a1aae3 potrace: allow building on any unix 2014-06-10 08:57:41 +00:00
Michael Raskin 26c8490ea1 Install libpotrace 2014-06-10 11:24:43 +04:00
Pascal Wittmann b40ce8a1f1 Update feh from 2.11 to 2.12.
The relevant source code of giblib was imported into feh,
therefore giblib is no longer a dependency.
2014-06-07 15:22:20 +02:00
Pascal Wittmann 91b2021782 feh: Set the default theme explicitly to 'feh'
feh uses argv[0] to set the default theme, because
feh is wrapped this will be .feh-wrapper. This makes
it hard to use the configuration on multiple systems
and can be confusion. Therefore the theme is explicity
set to 'feh'.
2014-06-07 15:18:09 +02:00
Eelco Dolstra 36f5ede37a geeqie: Fix incorrect longDescription formatting
Note that longDescription should not be formatted as:

  longDescription =
    '' Bla bla
       bla bla
    '';

because this will cause the second line to have more preceding
whitespace. It should be:

  longDescription =
    ''
      Bla bla
      bla bla
    '';
2014-06-03 11:47:39 +02:00
Michael Raskin 80cc011f77 Merge pull request #2617 from ttuegel/hplip
hplip: update and fix scanning
2014-05-27 02:31:27 -07:00
Eelco Dolstra 1e6c82825a gimp: Fix download URL 2014-05-22 12:11:52 +02:00
Vladimír Čunát 8e9ead8656 berlios.de probably shut down, replace it
The shutdown was announced years ago, only now it stopped working.
2014-05-18 13:30:27 +02:00
Thomas Tuegel b4c8981064 sane: add mkSaneConfig 2014-05-11 14:01:07 -05:00
cillianderoiste 885a2d9c53 Merge pull request #2410 from pSub/potrace
Add potrace-1.11, a tool for tracing bitmaps
2014-05-11 14:46:12 +02:00
Pascal Wittmann 8b0d0e3601 Add potrace-1.11, a tool for tracing bitmaps 2014-05-09 14:23:00 +02:00
Eelco Dolstra 46b77d3bb4 fetchurl_gnome -> fetchurlGnome 2014-05-08 15:30:17 +02:00
Benjamin Podszun 313900d819 nixpkgs: Bump feh to 2.11 2014-05-08 13:15:09 +02:00
Cillian de Róiste 849f6788ac darktable: update from 1.4.1 to 1.4.2 2014-05-03 15:16:12 +02:00
Jaka Hudoklin b12b180fc2 meshlab: fix build
Patches are from the Arch Linux package.
2014-04-21 11:24:26 +02:00
ambrop7@gmail.com 3bab2f2fc4 FreeCAD: Fix build. 2014-04-20 16:45:00 +02:00
James Cook ee79d43e40 ImageMagick: update to 6.8.9-0 2014-04-19 11:25:01 +01:00
Luca Bruno 35ccaa2e52 Fix gsettings schemas usage for several packages due to #1901
Also add icons to epiphany
2014-04-06 11:02:21 +02:00
Domen Kožar d7bd83d0ae shotwell: 0.15.1 -> 0.18 2014-03-21 18:02:15 +01:00
Vladimír Čunát 5bb0803254 fix evaluation (shotwell license) 2014-03-19 21:10:43 +01:00
Domen Kozar 902b059967 Add shotwell 1.15.1 2014-03-18 18:23:13 +01:00
Bjørn Forsman 562f937d21 openscad: bump 2013.06 -> 2014.03
openscad now depends on glib, and it needs pkgconfig to find glib.
2014-03-14 22:21:15 +01:00
Cillian de Róiste fcfbe753e7 Add synfig: A 2D animation program 2014-03-13 01:14:05 +01:00
James Cook 5d14048867 ImageMagick: update to 6.8.8-7
Fixes CVE-2014-{1947,1958,2030}.
2014-03-08 10:35:05 +01:00
Peter Simons db2776ee8a feh: update from 2.9.3 to 2.10 2014-03-03 11:10:27 +01:00
Domen Kožar 40b8b3206e fix remaining broken python packages due to refactoring 2014-02-21 23:27:06 +01:00
Cillian de Róiste 30fb0365df openimageio: update from 1.1.12 to 1.3.12 2014-02-19 22:49:21 +01:00
Sergey Mironov a629aaee72 viewnior: version bump (1.4) (close #1781) 2014-02-19 20:44:30 +01:00
Jaka Hudoklin d34f77fd1f feh: add jpeg image manipulation support 2014-02-16 14:11:32 +01:00
Cillian de Róiste e2151230ab darktable: update from 1.2.3 to 1.4.1 2014-02-15 18:49:18 +01:00
Petr Rockai d2758ce017 freecad: Fix build with current cmake. 2014-02-15 10:27:39 +01:00
Vladimír Čunát 32cd198d8f gimp: remove 2.6, because it's old and vulnerable
CVE-2012-2763 and three others. If we really need to resurrect it,
I think I saw debian could have patches for these somewhere.

Also add linux platforms for 2.8.
2014-02-06 19:56:28 +01:00
Song Wenwu 1c83b079d2 gimp: wrap plugins with PYTHONPATH, fix #223 2014-01-31 14:05:53 +08:00
Rickard Nilsson e28c0da32e sane-backends: Add extra source url
It seems alioth.debian.org has some problem (login needed for download), so
I've added a pkgs.fedoraproject.org url.
2014-01-30 12:26:11 +01:00
Petr Rockai 6f5be260b4 Adopt packages. 2014-01-28 17:31:17 +01:00
Petr Rockai cf7ee03377 photivo: Fix paths. 2014-01-25 18:08:47 +01:00
Petr Rockai 2953c39409 photivo: Update. 2014-01-25 18:08:47 +01:00
Peter Simons 4e983788cd feh: update from 2.8 to 2.9.3 2014-01-21 20:19:21 +01:00
Vladimír Čunát ac6761c908 Merge master into stdenv-updates
Conflicts:
	pkgs/applications/version-management/gource/default.nix
	pkgs/top-level/all-packages.nix
2014-01-20 19:39:28 +01:00
Peter Simons b4e1774272 haskell-hoodle: re-generate with cabal2nix 2014-01-20 18:04:59 +01:00
Ian-Woo Kim 7b51e24de9 add hoodle (pen notetaking program written in haskell) to nixpkgs 2014-01-20 15:18:04 +00:00
Vladimír Čunát 0a58b512cb Merge master into stdenv-updates
Conflicts (simple):
	pkgs/development/compilers/gcc/4.8/default.nix
	pkgs/development/compilers/llvm/default.nix
	pkgs/development/libraries/gmp/5.1.1.nix
	pkgs/development/libraries/gmp/5.1.3.nix
	pkgs/development/libraries/gmp/5.1.x.nix
	pkgs/top-level/all-packages.nix
2014-01-18 14:46:20 +01:00
Peter Simons 2d1c8d6f60 gocr: update to version 0.50 2014-01-13 17:05:45 +01:00
Eelco Dolstra 6fb27abf33 Merge branch 'java' 2014-01-13 13:16:17 +01:00
Eelco Dolstra 16e626a80d Replace lib/java -> share/java 2014-01-09 13:01:38 +01:00
Vladimír Čunát d91e03d422 k3d: fix build with newer gcc versions (-fpermissive) 2014-01-05 13:09:41 +01:00
Vladimír Čunát 9443129b08 Merge master into stdenv-updates
Conflicts:
	pkgs/development/libraries/glibc/2.18/common.nix (take stdenv-updates)
	pkgs/misc/emulators/zsnes/default.nix (more complex, build tested)
	pkgs/top-level/all-packages.nix (auto-solved)
2014-01-04 18:34:53 +01:00
Peter Simons 72629aa7da sane-backends-git: update to version 1.0.24.73-g6c4f6bc (i.e. current Git HEAD) 2014-01-03 12:42:48 +01:00
Bjørn Forsman 4d6605e882 Whitespace fixes in package expressions I maintain 2014-01-02 17:58:08 +01:00
Ricardo M. Correia dd93ce3378 saneBackends: Update to 1.0.24 2014-01-02 15:53:07 +01:00
Vladimír Čunát 506a304181 fftw: minor update and major refactoring
- Unify the "single" and "float" variants, which are the same thing.
- Enable threads and openmp wrapper by default (they are very small).
- Don't use sse on i686, as I'm quite sure we have no warrant for that.
  Cf. http://en.wikipedia.org/wiki/Pentium_Pro
- Disable static libs (big, no indication we need them).
- I tested most builds using fftw (they build OK).
2014-01-01 13:05:56 +01:00
Vladimír Čunát e740b565cf Merge master into stdenv-updates
Conflicts (easy):
	pkgs/development/compilers/llvm/default.nix
	pkgs/development/compilers/openjdk/default.nix
	pkgs/development/libraries/icu/default.nix
	pkgs/development/libraries/libssh/default.nix
	pkgs/development/libraries/libxslt/default.nix
	pkgs/development/tools/parsing/bison/3.x.nix
2013-12-29 10:01:22 +01:00
Vladimír Čunát cb639302df Merge glibc-2.18 branch into stdenv-updates
It's to separate from other changes coming from master.

Conflicts:
	pkgs/development/libraries/glibc/2.18/common.nix (taking both changes)
	pkgs/development/libraries/ncurses/5_4.nix (deleted)
2013-12-28 18:51:23 +01:00
Vladimír Čunát 50ac037864 Merge master into x-updates 2013-12-23 19:27:14 +01:00
Mathijs Kwik a508d30c53 openimageio: hash change 2013-12-23 10:25:15 +01:00
Vladimír Čunát 2b24f1349a Merge master into x-updates 2013-12-21 10:20:55 +01:00
Evgeny Egorochkin c4c10e8826 ufraw: add missing lensfun dependency 2013-12-21 02:28:27 +02:00
Nixpkgs Monitor d0e950867c ufraw: update from 0.18 to 0.19.2 2013-12-21 02:28:27 +02:00
Nixpkgs Monitor 102a88e469 xsane: update from 0.998 to 0.999 2013-12-21 02:28:26 +02:00
Vladimír Čunát 4c5a71f777 Merge master into x-updates
Conflicts:
	pkgs/desktops/gnome-2/desktop/gvfs/default.nix
	pkgs/development/libraries/cogl/default.nix
	pkgs/development/libraries/libsoup/2.44.nix
2013-12-18 23:21:29 +01:00
Nixpkgs Monitor 20f3c4de3d gimp: update from 2.8.8 to 2.8.10 2013-12-18 18:18:28 +02:00
Nixpkgs Monitor 6fb71755b8 cinepaint: update from 1.0 to 1.1 2013-12-18 18:18:22 +02:00
Sander van der Burg 010273bf1e Fix imagemagick compilation on darwin, because it still includes ghostscript which should not be the case 2013-12-17 11:45:07 +01:00
Peter Simons 45e8de9a7d Merge branch 'origin/master' into stdenv-updates.
Conflicts:
	pkgs/tools/misc/less/default.nix
2013-12-16 21:13:24 +01:00
Nixpkgs Monitor 6112fc7fff xaos: update from 3.5 to 3.6 2013-12-16 01:36:18 +02:00
Nixpkgs Monitor b92620f680 kde4.digikam: update from 3.2.0 to 3.5.0, potentially fixes CVE-2012-4514, CVE-2012-4514 2013-12-15 23:32:32 +02:00
Bjørn Forsman 4353a1a873 freecad: add matplotlib and pycollada dependencies
When FreeCAD is started it prints that it's missing matplotlib and
pycollada:

  $ FreeCAD
  [...]
  matplotlib not found, Plot module will be disabled
  pycollada not found, collada support will be disabled.

The closure size of freecad is currently at 1.9 GiB. Adding these two
deps increase it to 2.0 GiB.

Reflow the expression function argument list.
2013-12-14 13:00:46 +01:00
Petr Rockai 8f583cced9 photivo: Add photivo photo processor / RAW development laboratory. 2013-12-13 20:56:35 +02:00
Nixpkgs Monitor 1cedd2647f autopanosiftc: update from 2.5.0 to 2.5.1 2013-12-12 03:26:11 +02:00
Vladimír Čunát db426d4601 k3d: fix changed URL/patch 2013-12-11 12:01:46 +01:00
Peter Simons 486e7736df Merge remote-tracking branch 'origin/master' into stdenv-updates.
Conflicts:
	pkgs/tools/networking/p2p/amule/default.nix
2013-12-10 00:25:54 +01:00
Vladimír Čunát 6690c97569 Merge branch 'master' into x-updates
Conflicts (just different styles, same semantics):
	pkgs/development/libraries/libusb1/default.nix
2013-12-07 14:17:16 +01:00
Nixpkgs Monitor 1beca24707 sxiv: update from 1.1 to 1.1.1 2013-12-07 14:39:52 +02:00
Peter Simons c32bf83301 Merge remote-tracking branch 'origin/master' into stdenv-updates.
Conflicts:
	pkgs/development/interpreters/perl/5.16/default.nix
	pkgs/tools/networking/curl/default.nix
	pkgs/top-level/all-packages.nix
	pkgs/top-level/release-python.nix
	pkgs/top-level/release-small.nix
	pkgs/top-level/release.nix
2013-12-04 18:33:52 +01:00
Nixpkgs Monitor 99bf1945d1 graphicsmagick: update from 1.3.13 to 1.3.18, potentially fixes CVE-2013-4589 2013-12-04 05:44:15 +02:00
Vladimír Čunát d09b722f77 Merge master into x-updates 2013-12-02 21:41:16 +01:00
Michael Raskin e8246aa3ee Merge pull request #1307 from bjornfor/pencil
pencil: new package
2013-12-01 05:32:59 -08:00
Bjørn Forsman 5443dd4c00 pencil: new package
Pencil is a GUI prototyping/mockup tool.

Homepage: http://pencil.evolus.vn/
2013-11-30 17:51:47 +01:00
Kim Simmons e18686d8a0 grafx2: Fixed install error.
My bad for not checking suggested changes.
2013-11-30 12:03:34 +01:00
Michael Raskin 1e3ed11000 Merge pull request #1262 from Zoomulator/add_grafx2
grafx2: new package
2013-11-29 09:10:37 -08:00