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
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