Commit Graph

802 Commits

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