Commit Graph

1103 Commits

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