Commit Graph

1462 Commits

Author SHA1 Message Date
Frederik Rietdijk
16dd61d6c9 gimp: use python2 2016-10-22 16:47:22 +02:00
Vladimír Čunát
4d5b893002 Merge #19081: gnome-3.22
Also master commits are brought in.
2016-10-20 23:04:10 +02:00
Frederik Rietdijk
8ec17dab32 inkscape: use python2
because of syntax error. And don't depend on pyxml
because that shouldn't be necessary anymore
https://bugs.archlinux.org/task/26774
2016-10-18 23:16:09 +02:00
Thomas Tuegel
e2204b72b8
kde5.kipi-plugins: init at 5.2.0 2016-10-18 06:45:19 -05:00
Imuli
3a73ce2427 zgrviewer: pass arguments and use full java path
So the user doesn't need java in their environment and can pass
filenames on the command line.
2016-10-17 22:11:54 -04:00
mimadrid
07fba2591d
gthumb: hicolor_icon_theme dependency 2016-10-14 21:03:20 +02:00
Vladimír Čunát
061758490f Merge branch 'master' into staging
... to get the openssl mass rebuild: 942dbf89c.
2016-10-14 13:16:11 +02:00
Franz Pletz
8435c1637b
gimpPlugins.gap: disable format hardening 2016-10-13 20:33:16 -04:00
Franz Pletz
bb7d270d85
pythonmagick: 0.9.12 -> 0.9.14 2016-10-13 20:33:16 -04:00
Graham Christensen
241cd0e5db
imagemagick: 6.9.5-10 -> 6.9.6-2 for CVE-2016-7799, CVE-2016-7906 2016-10-13 20:33:10 -04:00
Vladimír Čunát
6eeea6effd Python: more evaluation fixups. 2016-10-14 00:03:12 +02:00
Franz Pletz
4771ccd896
graphicsmagick: apply patches to fix security issues
Fixes CVE-2016-7996, CVE-2016-7996, CVE-2016-7800.

cc #19481
2016-10-14 00:02:30 +02:00
Tobias Geerinckx-Rice
61a789888a Merge pull request #19482 from peterhoeg/ss
simple-scan: 3.21 -> 3.22
2016-10-12 17:36:35 +02:00
Peter Hoeg
f2c3e29ac4 simple-scan: 3.21 -> 3.22
Additionally, fix the icons and use a newer version of vala.
2016-10-12 19:14:25 +08:00
Michael Raskin
48388dde18 gimpPlugins.resynthesizer2: init at 2.0.1. A rewrite with python wrappers; GUI is better for some tasks and worse for some other tasks. 2016-10-11 19:57:52 +02:00
Alexander Ried
9c44aa664e gthumb: 3.4.3 -> 3.4.4 2016-10-11 17:37:29 +02:00
Moritz Ulrich
f57465755c rawtherapee-git: 2016-09-21 -> 2016-10-10 2016-10-10 17:25:03 +02:00
Moritz Ulrich
194cc803c1 rawtherapee: Fix build by backporting patch. 2016-10-10 17:24:49 +02:00
Mica Semrick
0223ab8fa9
hugin: 2016.0.0 -> 2016.2.0 2016-10-02 23:36:06 +02:00
Jörg Thalheim
fd8e5bf117 Merge pull request #17843 from lucas8/imlibsetroot
imlibsetroot: init at 1.2
2016-10-02 16:39:27 +02:00
Tuomas Tynkkynen
5bf5de58ea treewide: Fix 'lib.optional' misuses
These add a singleton list of a package to buildInputs.
2016-10-01 23:38:06 +03:00
Frederik Rietdijk
3ba16c8234 Do not use top-level buildPythonPackage or buildPythonApplication
but instead use the one in pythonPackages.
2016-09-26 11:10:51 +02:00
Frederik Rietdijk
0ccf17590b mypaint: do not use top-level python packages 2016-09-26 11:10:50 +02:00
Frederik Rietdijk
9f8916e519 jbrout: do not use top-level python packages 2016-09-25 23:52:22 +02:00
Frederik Rietdijk
0721cd2f7d gimp: do not use top-level python packages 2016-09-25 23:19:01 +02:00
Frederik Rietdijk
f2e0a3c43a cinepaint: do not use top-level python packages 2016-09-25 22:56:40 +02:00
Frederik Rietdijk
7470f4d761 freecad: do not use top-level Python packages 2016-09-25 22:32:20 +02:00
Frederik Rietdijk
7ff1544981 inkscape: use python.withPackages instead of wrappers 2016-09-25 22:31:25 +02:00
2chilled
68a38d6c0f rawtherapee: 4.2 -> 4.2.1025 (#18368) 2016-09-25 08:01:27 +02:00
Franz Pletz
fa6c6dae76
imagemagick: 6.9.5-2 -> 6.9.5-10
Fixes lots of CVEs, including the recent:

  * CVE-2016-4562, CVE-2016-4563, CVE-2016-4564
  * CVE-2016-5687
  * CVE-2016-5010
  * CVE-2016-5688
  * CVE-2016-5689, CVE-2016-5690, CVE-2016-5691
  * CVE-2016-5841 and CVE-2016-5842
  * CVE-2016-6491
  * CVE-2016-6520

cc #18856
2016-09-24 16:57:00 +02:00
Lancelot SIX
9b4a56e312 Merge pull request #18830 from paperdigits/darktable-206
Updated darktable to version 2.0.6
2016-09-23 12:43:09 +02:00
Mica Semrick
9e661620ea darktable: 2.0.5 -> 2.0.6 2016-09-22 17:33:01 -07:00
Moritz Ulrich
b8a8575b1b rawtherapee-git; Init at 2016-09-21 2016-09-22 13:11:04 +02:00
Moritz Ulrich
a115cd5dbf digikam5: Add tools for panorama/stacking to PATH 2016-09-18 17:29:27 +02:00
Thomas Tuegel
8d3644d7b2 Merge pull request #18303 from the-kenny/digikam-51
Digikam 5.1
2016-09-18 09:28:38 -05:00
Nikolay Amiantov
4748709926 Merge commit 'refs/pull/18498/head' of git://github.com/NixOS/nixpkgs 2016-09-13 12:51:34 +03:00
lucas8
85f532bf41
imlibsetroot: init at 1.2 2016-09-13 10:49:57 +02:00
Franz Pletz
fb9117efa6 Merge pull request #18488 from chris-martin/md5-2
Miscellaneous packages: Use sha256 instead of md5 (part 2)
2016-09-13 07:11:43 +02:00
Kirill Boltaev
bccd75094f treewide: explicitly specify gtk and related package versions 2016-09-12 18:26:06 +03:00
Chris Martin
ce44f8df5c batik: md5->sha256 2016-09-10 13:46:06 -04:00
José Romildo Malaquias
8f6af86d5e feh: avoid using xlibsWrapper 2016-09-09 15:25:28 +02:00
José Romildo Malaquias
91e4e31847 feh: perlPackages needed only at build time 2016-09-09 15:25:28 +02:00
José Romildo Malaquias
82dba95079 feh: 2.16.1 -> 2.17.1 2016-09-09 15:25:28 +02:00
Moritz Ulrich
bbd82656bb digikam5: Init at 5.1.0 2016-09-09 11:39:59 +02:00
Franz Pletz
5929399527
graphicsmagick: 1.3.24 -> 1.3.25 (security)
Includes some security fixes, see

  http://www.graphicsmagick.org/NEWS.html#september-5-2016
2016-09-07 07:08:51 +02:00
Domen Kožar
cc614323d4 Merge pull request #18343 from chris-martin/sane-frontends-src
sane-frontends: fix source url, move from md5 to sha256
2016-09-06 09:30:52 +02:00
Chris Martin
d197498b8f sane-frontends: md5->sha256 2016-09-05 20:30:54 -04:00
Chris Martin
1dca12c21d sane-frontends: update source url 2016-09-05 20:30:06 -04:00
Chris Martin
23d605d4ce ktikz: md5->sha256 2016-09-05 20:20:38 -04:00
Chris Martin
e7477c6499 gqvieq: md5->sha256 2016-09-05 20:14:47 -04:00
Kranium Gikos Mendoza
ed1fcd1b02 k3d: 0.8.0.3 -> 0.8.0.5 2016-09-03 09:12:25 +03:00
Tuomas Tynkkynen
3364230d56 Disable bunch of non-compiling packages on Darwin
These ones have a "Last successful build" timestamp in the 2014s or
2015s. Presumably no one will notice if we now stop building them.

softether_4_18              2015-09-20  http://hydra.nixos.org/build/39418483
lensfun                     2014-09-30  http://hydra.nixos.org/build/39394104
net_snmp                    2015-09-20  http://hydra.nixos.org/build/39410553
djview                      2015-08-11  http://hydra.nixos.org/build/39413233
libmusicbrainz2             2015-09-20  http://hydra.nixos.org/build/39410106
fox_1_6                     2014-05-07  http://hydra.nixos.org/build/39410858
libofx                      2015-09-24  http://hydra.nixos.org/build/39423507
yacas                       2014-09-30  http://hydra.nixos.org/build/39393150
iomelt                      2014-09-30  http://hydra.nixos.org/build/39408486
softether                   2015-09-20  http://hydra.nixos.org/build/39425800
mp4v2                       2014-09-30  http://hydra.nixos.org/build/39421899
virtuoso7                   2014-09-21  http://hydra.nixos.org/build/39415206
man_db                      2015-04-23  http://hydra.nixos.org/build/39404236
libdiscid                   2014-09-30  http://hydra.nixos.org/build/39412202
zabbix22.agent              2014-09-21  http://hydra.nixos.org/build/39412149
vidalia                     2015-08-06  http://hydra.nixos.org/build/39411500
libmtp                      2015-09-20  http://hydra.nixos.org/build/39419199
wxGTK29                     2015-09-20  http://hydra.nixos.org/build/39415296
ncmpcpp                     2015-11-06  http://hydra.nixos.org/build/39404455
libtorrent                  2014-09-21  http://hydra.nixos.org/build/39394646
shishi                      2014-03-21  http://hydra.nixos.org/build/39418874
ocaml_3_12_1                2014-09-30  http://hydra.nixos.org/build/39392996
djview4                     2015-08-11  http://hydra.nixos.org/build/39427799
vimNox                      2014-05-23  http://hydra.nixos.org/build/39397012
ttfautohint                 2015-08-06  http://hydra.nixos.org/build/39398330
libraw                      2015-09-24  http://hydra.nixos.org/build/39402271
wxGTK30                     2015-09-20  http://hydra.nixos.org/build/39401871
sbcl_1_2_5                  2015-09-20  http://hydra.nixos.org/build/39426091
prover9                     2014-09-30  http://hydra.nixos.org/build/39406476
rcs                         2015-08-25  http://hydra.nixos.org/build/39392037
gpac                        2015-09-24  http://hydra.nixos.org/build/39399470
virtuoso6                   2014-09-30  http://hydra.nixos.org/build/39398651
xlslib                      2015-09-24  http://hydra.nixos.org/build/39410387
ucommon                     2015-03-27  http://hydra.nixos.org/build/39414040
commoncpp2                  2014-09-30  http://hydra.nixos.org/build/39420117
virtuoso                    2014-09-21  http://hydra.nixos.org/build/39399978
miniHttpd                   2014-09-30  http://hydra.nixos.org/build/39392925
mpack                       2014-09-26  http://hydra.nixos.org/build/39399535
nbd                         2014-09-26  http://hydra.nixos.org/build/39401367
newsbeuter-dev              2014-07-29  http://hydra.nixos.org/build/39406259
gimp_2_8                    2015-09-20  http://hydra.nixos.org/build/39436271
gimp                        2015-09-20  http://hydra.nixos.org/build/39435976
zabbix20.agent              2014-09-30  http://hydra.nixos.org/build/39393242
gst_all_1.gst-plugins-good  2015-09-20  http://hydra.nixos.org/build/39408506
ocaml_4_00_1                2014-09-30  http://hydra.nixos.org/build/39399526
inadyn                      2014-09-30  http://hydra.nixos.org/build/39426389
gst_all_1.gst-plugins-bad   2015-09-20  http://hydra.nixos.org/build/39392970
zabbix.agent                2014-09-30  http://hydra.nixos.org/build/39421412
cmake-2_8                   2015-09-24  http://hydra.nixos.org/build/39399443
liblastfm                   2015-08-06  http://hydra.nixos.org/build/39421812
newsbeuter                  2014-07-29  http://hydra.nixos.org/build/39396605
sdcv                        2014-09-26  http://hydra.nixos.org/build/39412928
2016-09-01 20:39:33 +03:00
Eelco Dolstra
41ec7095a7 openimageio: Use separate outputs 2016-09-01 18:57:43 +02:00
Eelco Dolstra
452afd1ed6 ilmbase: Use separate outputs 2016-09-01 18:57:43 +02:00
Tuomas Tynkkynen
75b5922391 openexr, libyaml-cpp: Fix output order to match others
This was changed in https://github.com/NixOS/nixpkgs/pull/14766

@edolstra
2016-09-01 16:34:11 +03:00
Tuomas Tynkkynen
a17216af4c treewide: Shuffle outputs
Make either 'bin' or 'out' the first output.
2016-08-29 14:49:51 +03:00
Robin Gloster
e17bc25943
Merge remote-tracking branch 'upstream/master' into staging 2016-08-29 00:24:47 +00:00
Jörg Thalheim
a141f15f46 gimp: fix python plugins (#18061) 2016-08-28 23:41:17 +00:00
obadz
3de6e5be50 Merge branch 'master' into staging
Conflicts:
      pkgs/applications/misc/navit/default.nix
      pkgs/applications/networking/mailreaders/alpine/default.nix
      pkgs/applications/networking/mailreaders/realpine/default.nix
      pkgs/development/compilers/ghc/head.nix
      pkgs/development/libraries/openssl/default.nix
      pkgs/games/liquidwar/default.nix
      pkgs/games/spring/springlobby.nix
      pkgs/os-specific/linux/kernel/perf.nix
      pkgs/servers/sip/freeswitch/default.nix
      pkgs/tools/archivers/cromfs/default.nix
      pkgs/tools/graphics/plotutils/default.nix
2016-08-27 23:54:54 +01:00
Robin Gloster
c0e42fe741
imv: add fontconfig dependency 2016-08-27 21:53:27 +00:00
rnhmjoj
f0daeb575a
imv: fix failing build 2016-08-27 06:42:44 +02:00
Robin Gloster
e0deed0110
ghc: add comment to relocation patch 2016-08-26 15:19:37 +00:00
Vincent Laporte
42701ee33e inkscape: fix on darwin 2016-08-25 15:39:53 +02:00
obadz
78b7529ee3 Merge branch 'master' into staging 2016-08-24 11:57:44 +01:00
Daniel Peebles
3f337a2b23 Merge pull request #17685 from matthewbauer/darwin-misc2
Darwin misc. fixes
2016-08-24 11:52:27 +02:00
obadz
0e8d2725dc Merge branch 'master' into staging 2016-08-23 18:50:06 +01:00
Tuomas Tynkkynen
8a06db38df treewide: Fix output references to libusb 2016-08-23 04:53:19 +03:00
Tuomas Tynkkynen
2eb09319eb treewide: Make explicit that 'dev' output of exiv2 is used 2016-08-23 03:52:05 +03:00
Tuomas Tynkkynen
298b479c22 sane: Reference correct output of libjpeg 2016-08-23 03:20:21 +03:00
Tuomas Tynkkynen
74a3a2cd7e treewide: Use makeBinPath 2016-08-23 01:18:10 +03:00
obadz
24a9183f90 Merge branch 'hardened-stdenv' into staging
Closes #12895

Amazing work by @globin & @fpletz getting hardened compiler flags by
enabled default on the whole package set
2016-08-22 01:19:35 +01:00
obadz
ba50fd7170 Merge branch 'master' into staging 2016-08-22 01:18:11 +01:00
Ram Kromberg
402e4882c1 simple-scan: vala -> vala_0_23 2016-08-21 20:02:07 +03:00
Ram Kromberg
22492ffa3e giv: vala -> vala_0_23 2016-08-21 20:02:07 +03:00
Ram Kromberg
2acfb62caa shotwell: vala -> vala_0_28 2016-08-21 20:02:04 +03:00
obadz
68936edfb3 Merge branch 'master' into staging 2016-08-21 12:03:41 +01:00
Michael Raskin
a28ca06298 ao: init at 0.0pre20160820 2016-08-21 00:55:49 +02:00
Nikolay Amiantov
edb9416228 Merge pull request #17819 from abbradar/printing-updates
Printing and PDF-related updates
2016-08-20 01:41:55 +04:00
Miguel Madrid
1b69ef935e shotwell: 0.23.4 -> 0.23.5 (#17827) 2016-08-19 13:33:06 +02:00
Miguel Madrid
20c0fe4900 gthumb: init at 3.4.3 (#17826) 2016-08-19 13:32:27 +02:00
Nikolay Amiantov
1bde33074e poppler_data: embed into poppler, make an option
Previously we relied on an environment variable POPPLER_DATADIR which
practically noone used and everyone was expected to set. This is a good
candidate for a feature option because noone really _noticed_ that this data is
not available. Disabled by default because of this and size of the data (22M).
2016-08-18 16:09:34 +03:00
Matthew Bauer
9610fc55ef gpicview: fix darwin build 2016-08-16 19:25:39 +00:00
Robin Gloster
33e1c78ae3 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-16 07:54:01 +00:00
Nikolay Amiantov
8f62339911 yed: 3.15.0.2 -> 3.16.1 2016-08-14 22:37:06 +03:00
Frederik Rietdijk
e4b47de694 Remove top-level pycrypto
See #11567.
2016-08-14 14:28:26 +02:00
Robin Gloster
b7787d932e Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-12 09:46:53 +00:00
Mica Semrick
852cdd0759 geeqie: 1.2.3 -> 1.3 2016-08-07 14:35:23 -07:00
Mica
f9dfe0d843 darktable 2.0.4 -> 2.0.5 (#17568) 2016-08-07 04:20:14 +02:00
Tuomas Tynkkynen
9deb6cfff1 xaos: Broken on i686
http://hydra.nixos.org/build/38238044
2016-08-06 17:06:45 +03:00
Robin Gloster
e2844fcfc3 fontmatrix: disable fortify hardening 2016-08-04 07:48:24 +00:00
Robin Gloster
1b979d8384 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-03 13:34:44 +00:00
Tuomas Tynkkynen
21f17d69f6 treewide: Add lots of meta.platforms
Build-tested on x86_64 Linux & Mac.
2016-08-02 21:42:43 +03:00
Tuomas Tynkkynen
2258b21e4b treewide: Add lots of platforms to packages with no meta
Build-tested on x86_64 Linux and on Darwin.
2016-08-02 21:17:44 +03:00
Robin Gloster
cbc8fc239a zgv: disable format hardening 2016-08-02 15:40:37 +00:00
Robin Gloster
f222d98746 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-25 12:47:13 +00:00
Miguel Madrid
8816df20f3 shotwell: 0.23.2 -> 0.23.4 (#17190) 2016-07-23 00:32:23 +02:00
Julien Dehos
d6ff1ce2a0 exrtools: init at 0.4 2016-07-21 17:09:27 +02:00
Robin Gloster
1f04b4a566 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-21 00:56:43 +00:00
Franz Pletz
ddf59093ee Merge pull request #16051 from hrdinka/add/osm-gps-map
darktable: readd map/geotagging feature
2016-07-19 13:03:16 +02:00
Robin Gloster
203846b9de Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-19 10:37:02 +00:00
Franz Pletz
b1ff7f83ef imagemagick: fix hashes
See #16958.
2016-07-18 06:19:52 +02:00
Ram Kromberg
9ff51cc3c4 imagemagick: 6.9.3-9 -> 6.9.5-2 (#16958) 2016-07-18 06:12:17 +02:00
Vladimír Čunát
540f4a8eab gimp: security 2.8.16 -> 2.8.18
Fixes CVE-2016-4994 and some bugs:
http://www.gimp.org/news/2016/07/14/gimp-2-8-18-released/
2016-07-17 21:53:47 +02:00
Luca Bruno
e04019d690 Merge pull request #16989 from mimadrid/update/shotwell-0.23.2
shotwell: 0.22.0 -> 0.23.2
2016-07-16 09:55:58 +01:00
Bjørn Forsman
5b6e3a3ed1 pencil: mark as broken
Currently pencil won't start, due to incompatible firefox version:

  $ pencil
  Error: Platform version '47.0.1' is not compatible with
  minVersion >= 36.0

See https://github.com/prikhi/pencil/issues/840.
2016-07-16 00:38:33 +02:00
mimadrid
8d4fc3c375
shotwell: 0.22.0 -> 0.23.2 2016-07-15 17:01:41 +02:00
Robin Gloster
5185bc1773 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-15 14:41:01 +00:00
Tim Steinbach
f7ab48a401 feh: 2.15.4 -> 2.16.1 2016-07-11 23:15:51 +00:00
Franz Pletz
22c1416192 graphicsmagick: 1.3.23 -> 1.3.24 (security)
Fixes CVE-2016-3716, CVE-2016-3717, CVE-2016-2317, CVE-2016-2318,
CVE-2016-5118, CVE-2016-3714, CVE-2016-3715, CVE-2016-3718.
2016-07-10 10:48:10 +02:00
Nikolay Amiantov
cb26996af3 Merge pull request #16814 from womfoo/fix-bump/antimony-0.9.2
antimony: fix build and 0.8.0b -> 0.9.2
2016-07-09 21:11:58 +04:00
Kranium Gikos Mendoza
a2a2b334d9 antimony: 0.8.0b -> 0.9.2 2016-07-10 00:40:29 +08:00
Rickard Nilsson
51c6c98529 freecad: 0.15 -> 0.16 2016-07-07 09:24:49 +02:00
Ram Kromberg
28159315b7 jpegrescan: init at 2016-06-01 2016-07-06 12:42:58 +02:00
Vladimír Čunát
07139b8c3f Merge #16488: rawtherapee: 4.0 -> 4.2 2016-07-05 15:30:22 +02:00
Joachim Fasting
e30580a44b Merge pull request #16602 from vrthra/zgv
zgv: init at 5.9
2016-07-04 01:11:16 +02:00
Rahul Gopinath
eef98f3e51 zgv: init at 5.9 2016-07-03 14:06:57 -07:00
Matthias Herrmann
392448b5d3 rawtherapee: 4.0 -> 4.2 2016-06-25 09:16:12 +02:00
Vladimír Čunát
6b27ceb006 Merge 'master' into staging and re-revert merge
... from staging to master, reverted temporarily in aa9a04883e.
2016-06-23 12:09:03 +02:00
Vladimír Čunát
aa9a04883e Revert "Merge branch 'staging'" due to glibc
The main output started to retain dependency on bootstrap-tools; see
https://github.com/NixOS/nixpkgs/pull/15867#issuecomment-227949096

This reverts commit c05d829598, reversing
changes made to f073df60d6.
2016-06-23 09:25:10 +02:00
Vladimír Čunát
c05d829598 Merge branch 'staging' 2016-06-22 10:49:56 +02:00
Bjørn Forsman
bd01fad0ed Captialize meta.description of all packages
In line with the Nixpkgs manual.

A mechanical change, done with this command:

  find pkgs -name "*.nix" | \
      while read f; do \
          sed -e 's/description\s*=\s*"\([a-z]\)/description = "\u\1/' -i "$f"; \
      done

I manually skipped some:

* Descriptions starting with an abbreviation, a user name or package name
* Frequently generated expressions (haskell-packages.nix)
2016-06-20 13:55:52 +02:00
Gabriel Ebner
112729b6ff viewnior: 1.5 -> 1.6 2016-06-19 18:47:14 +02:00
Vladimír Čunát
e757404555 Merge branch 'master' into staging
Hydra nixpkgs: ?compare=1279790
2016-06-19 12:33:04 +02:00
Vladimír Čunát
97c484a10f treewide: fix #include errors after gcc-5.4
They were mostly missing <cmath> or <math.h>.
2016-06-19 10:18:30 +02:00
Tobias Geerinckx-Rice
6558f0add3
sane-backends-git: fix corrupted hash 2016-06-12 00:28:55 +02:00
Tobias Geerinckx-Rice
6b2cdf8cd1
sane-backends-git: 2016-05-09 -> 2016-06-11
fujitsu backend v131:
- hide compression-arg option when jpeg disabled
- add Send/SC/GHS macros for recent scanners
- add initial support for fi-74x0
- add initial support for fi-7030
- set has_MS_lamp=0 for fi-71x0
- add I18N macros to all option titles and descriptions
- add usb ids for many newer scanners
2016-06-12 00:28:55 +02:00
Robin Gloster
8031cba2ab Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-06-10 09:27:04 +00:00
Nikolay Amiantov
69e97f8a45 Merge pull request #15891 from abbradar/krita
krita: init at 3.0
2016-06-09 23:34:07 +04:00
obadz
ab70ae2edf Merge pull request #15647 from layus/auctex
ktikz: init at 0.10
2016-06-08 17:17:50 +01:00
Christoph Hrdinka
dadd9a7150 darktable: add map feature
We lost darktables map (geo coordinates) feature in one of its pervious
updates. This readds it.
2016-06-07 20:07:16 +02:00
Damien Cassou
9afd1161e7 inkscape: fix due to glibmm update 2016-06-06 13:59:31 +02:00
Guillaume Maudoux
6035e80137 ktikz: init at 0.10 2016-06-05 18:46:42 +02:00
Tuomas Tynkkynen
bac26e08db Fix lots of fetchgit hashes (fallout from #15469) 2016-06-03 17:17:08 +03:00
Bjørn Forsman
2c62305228 shutter: fix runtime error (missing imagemagick)
Fixes this:

  $ shutter
  ERROR: imagemagick is missing --> aborting!

Due to 73f1f5eb39
("imagemagick: split dev output to fix #9604") which was committed in
the same period as shutter was added to nixpkgs.
2016-06-02 21:10:58 +02:00
Nikolay Amiantov
32ff5bbc30 krita: init at 3.0 2016-06-01 12:35:28 +03:00
vbgl
15c9a0054c Merge pull request #15859 from mbakke/feh-2.15.4
feh: 2.15.2 -> 2.15.4
2016-05-31 14:46:58 +02:00
Bjørn Forsman
27899df2f5 pinta: unbreak after multiple-outputs change
Missing ".out" on the gtk attribute.
2016-05-31 14:27:02 +02:00
Marius Bakke
b50dd8e85f feh: 2.15.2 -> 2.15.4 2016-05-31 12:48:40 +01:00
Robin Gloster
2d382f3d98 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-05-30 19:39:34 +00:00
Franz Pletz
769dce0e27 graphicsmagick: 1.3.21 -> 1.3.23, disable popen (security)
http://permalink.gmane.org/gmane.comp.security.oss.general/19669
2016-05-30 10:48:50 +02:00
Franz Pletz
57e4cd680a graphicsmagick137: remove, not referenced anymore 2016-05-30 10:48:42 +02:00
rnhmjoj
8c489cdd6e
imv: 2.0.0 -> 2.1.2 2016-05-28 15:00:32 +02:00
Vladimír Čunát
81039713fa Merge branch 'master' into staging
... to get the systemd update (rebuilding ~7k jobs).
2016-05-26 16:50:22 +02:00
Bjørn Forsman
0b3b45c5a7 shutter: init at 0.93.1
Screenshot and annotation tool.

The application may complain about missing GConf dbus service[1], but it
still works (and remembers its settings, AFAICT).

[1]: The error message is (line wrapped):
  GConf Error: Failed to contact configuration server; the most
  common cause is a missing or misconfigured D-Bus session bus daemon. See
  http://projects.gnome.org/gconf/ for information. (Details -  1: GetIOR
  failed: GDBus.Error:org.freedesktop.DBus.Error.ServiceUnknown: The name
  org.gnome.GConf was not provided by any .service files)
2016-05-26 10:31:27 +02:00
Bjørn Forsman
41fa133548 qscreenshot: init at 1.0
Create and edit screenshots.
2016-05-25 19:00:50 +02:00
Vladimír Čunát
0b192a0976 Merge branch 'master' into staging
That's to get mesa rebuild from master, as it's nontrivial.
2016-05-23 09:02:10 +02:00
Julien Dehos
1b76cf4b23 openexr-viewers: 1.0.1 -> 2.2.0 2016-05-22 22:55:47 +02:00
Vladimír Čunát
73f1f5eb39 imagemagick: split dev output to fix #9604
Also fixup references to imagemagick.
2016-05-22 13:41:15 +02:00
Vladimír Čunát
c4661e9643 Merge: make dev output references explicit
This is a rebase of most commits from #14766,
resolving conflicts and a few other evaluation problems.
2016-05-22 12:09:23 +02:00
Julien Dehos
294a776511 pbrt: init at 2016-05-19 2016-05-22 11:36:41 +02:00
Tuomas Tynkkynen
9d5ba6ba68 treewide: Make explicit that 'dev' output of libusb1 is used 2016-05-19 10:00:47 +02:00
Tuomas Tynkkynen
ad1a47061e treewide: Make explicit that 'dev' output of libtiff is used 2016-05-19 10:00:46 +02:00
Tuomas Tynkkynen
f81af4e6f0 treewide: Make explicit that 'dev' output of glib is used 2016-05-19 10:00:35 +02:00
Tuomas Tynkkynen
b51b458aed treewide: Make explicit that 'dev' output of fftwSinglePrec is used 2016-05-19 10:00:33 +02:00
Franz Pletz
f8d481754c
Merge remote-tracking branch 'origin/master' into hardened-stdenv 2016-05-18 17:10:02 +02:00
Joachim Fasting
f8177f71bd Merge pull request #15508 from jraygauthier/jrg/simple_scan_fix_missing_icon
simple-scan: improvements
2016-05-17 15:22:17 +02:00
Domen Kožar
b49bf121b8 rename iElectric to domenkozar to match GitHub 2016-05-17 13:00:47 +01:00
Raymond Gauthier
e7cc2de7dd simple-scan: improvements
Fix missing icon. It was looking for a "scanner" device
icon that can be only found as part of gnome3 default theme.

Copied this device icon and renamed it as *the* simple-scan
application icon.
2016-05-17 00:49:28 -04:00
Peter Simons
8e462995ba Bring my stdenv.lib.maintainers user name in line with my github nick. 2016-05-16 22:49:55 +02:00
taku0
9a6d8dd4f4 synfigstudio: fixed build error 2016-05-13 23:36:36 +09:00
Vladimír Čunát
6c2fbfbd77 Merge branch 'master' into staging 2016-05-12 04:53:38 +02:00
Vladimír Čunát
292fb98d96 imagemagick: fix evaluation on mingw
I made a mistake during conflict resolution in 7a005601d.
2016-05-10 18:22:34 +02:00
Tobias Geerinckx-Rice
0ee4238026
sane-backends-git -> 2016-05-09 2016-05-10 01:22:53 +02:00
Thomas Tuegel
3a62eab2c9 antimony: mark broken 2016-05-09 10:01:46 -05:00
Vladimír Čunát
65a9fa8cdc Merge branch 'master' into staging 2016-05-08 21:24:48 +02:00
Arseniy Seroka
25c1ff925f Merge pull request #15288 from hrdinka/update/hugin
hugin: 2015.0.0 -> 2016.0.0
2016-05-08 13:46:17 +03:00
Arseniy Seroka
e33e50ac60 Merge pull request #15285 from hrdinka/update/darktable
darktable: 2.0.2 -> 2.0.4
2016-05-08 13:45:50 +03:00
Tobias Geerinckx-Rice
3785515c4b
sane-backends-git -> 2016-05-07
Color scanning for Samsung models which support JPEG Lossy compression.
2016-05-08 00:45:10 +02:00
Christoph Hrdinka
72306b762d hugin: 2015.0.0 -> 2016.0.0
This updates hugin to its latest version and cleanes the derivation.

Release notes:

http://hugin.sourceforge.net/releases/2016.0.0/en.shtml
2016-05-07 16:50:06 +02:00
Christoph Hrdinka
f2ac136ec1 darktable: 2.0.2 -> 2.0.4
Release notes for 2.0.3 and 2.0.4 bugfix releases:

https://www.darktable.org/2016/03/darktable-2-0-3-released
https://www.darktable.org/2016/05/darktable-2-0-4-released
2016-05-07 12:59:24 +02:00
Vladimír Čunát
1dc36904d8 Merge #14920: windows improvements, mainly mingw 2016-05-05 08:30:19 +02:00
Vladimír Čunát
7a005601d4 Merge branch 'master' to resolve conflicts 2016-05-05 08:25:38 +02:00
Michael Raskin
942db2e9ac imagemagick: libwebp just has to be a propagated input 2016-05-04 17:55:09 +02:00
Robin Gloster
9820cb1bf2 use dontBuild instead of hacks
changes:
 * buildPhase = "true"
 * buildPhase = ":"
2016-05-04 10:11:04 +00:00
Franz Pletz
69c14985d0 imagemagick: Disable insecure coders (ImageTragick)
See:

  * https://imagetragick.com/
  * https://www.imagemagick.org/discourse-server/viewtopic.php?f=4&t=29588
2016-05-04 01:22:02 +02:00
Franz Pletz
05eae0242d imagemagick: 6.9.3-8 -> 6.9.3-9 2016-05-04 01:22:02 +02:00
Tuomas Tynkkynen
aadaa91379 Merge remote-tracking branch 'upstream/master' into staging
Conflicts:
	pkgs/applications/networking/browsers/vivaldi/default.nix
	pkgs/misc/emulators/wine/base.nix
2016-05-03 23:12:48 +03:00
Nikolay Amiantov
fe0bb1efd1 imagemagick: add webp support 2016-05-03 13:19:41 +03:00
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