Wout Mertens
c3f181f2c9
Merge pull request #14520 from jb55/bump/wkhtmltopdf
...
wkhtmltopdf: 0.12.2.4 -> 0.12.3.2
2016-04-07 21:40:53 +02:00
William Casarin
2968a8ce0a
wkhtmltopdf: 0.12.2.4 -> 0.12.3.2
2016-04-07 10:24:07 -07:00
Vladimír Čunát
d1df28f8e5
Merge 'staging' into closure-size
...
This is mainly to get the update of bootstrap tools.
Otherwise there were mysterious segfaults:
https://github.com/NixOS/nixpkgs/pull/7701#issuecomment-203389817
2016-04-07 14:40:51 +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
Franz Pletz
2e08d8234e
Merge remote-tracking branch 'origin/master'
2016-03-31 10:06:30 +02:00
Tobias Geerinckx-Rice
caa395a560
enblend-enfuse: 4.1.5 -> 4.2; maintain
...
Removed dependency on libxmi (unneeded since 4.1.5).
Added new (since 4.2) dependency on tetex (for `pdflatex`).
Changes: http://hg.code.sf.net/p/enblend/code/file/a7a247e1e64b/NEWS
2016-03-30 14:56:04 +02:00
Robin Gloster
b8e0cb3fe7
jbig2enc: fix merge
2016-03-28 23:09:19 +00: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
Tobias Geerinckx-Rice
9dc6db5cc5
enblend-enfuse: 4.1.4 -> 4.1.5
2016-03-25 03:31:04 +01:00
Pascal Wittmann
73967e0eca
jbig2enc: fix build
2016-03-24 20:21:40 +01:00
Eelco Dolstra
da390a48db
pngquant: 2.0.1 -> 2.6.0
...
Also remove meta.broken.
2016-03-18 22:13:57 +01:00
Robin Gloster
3f45f0948d
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-03-15 01:44:24 +00:00
Nikolay Amiantov
e81c487ba2
argyllcms: 1.8.2 -> 1.8.3
2016-03-11 01:26:56 +03: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
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
3b4765c9e5
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-02-28 16:32:57 +00:00
Eelco Dolstra
abd3c246a4
netpbm: Disable parallel building
...
Looks like the "partlist" file is constructed in an unsound way.
http://hydra.nixos.org/build/32430147
2016-02-28 12:59:17 +01:00
zimbatm
17348dc094
Remove all dots at end of descriptions
...
Specially crafted for @JagaJaga
find pkgs -name "*.nix" -exec \
sed -e 's|\(description.*\)\.";|\1";|g' -i {} \;
2016-02-27 17:30:29 +00:00
Robin Gloster
3477e662e6
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-02-27 00:08:08 +00:00
Robin Gloster
4447e42f02
zbar: disable fortify hardening
2016-02-24 15:17:41 +00:00
Robin Gloster
4bf29b83f8
graphviz_2_0: disable format/fortify hardening
2016-02-23 15:03:14 +00:00
Allan Espinosa
2dd51275eb
dpic: init at 2016.01.12
2016-02-22 07:42:53 -06:00
Robin Gloster
00903f4820
jbig2enc: add upstream patch to fix build
2016-02-21 23:56:49 +00:00
Franz Pletz
41698c9efa
Merge branch 'master' into hardened-stdenv
2016-02-15 20:05:29 +01:00
Rok Garbas
6b1a91e04f
scrot: adding garbas as maintainer
2016-02-15 15:46:51 +01:00
Nathan Zadoks
2d3940bd66
scrot: 0.8 -> 0.8-17 (Debian patches), fixes #12954
2016-02-15 15:34:04 +01:00
Michael Raskin
4f1822bfb5
asymptote: 2.35 -> 2.36
2016-02-14 21:17:07 +01:00
Vladimír Čunát
d039c87984
Merge branch 'master' into closure-size
2016-02-14 08:33:51 +01:00
Robin Gloster
969ed1610a
qrcode: turn off fortify hardening
2016-02-12 15:22:56 +00:00
Robin Gloster
200dedf2cd
nifskope: turn off format hardening
2016-02-12 13:27:00 +00:00
Robin Gloster
72a9d9a4a7
plotutils: turn off format hardening
2016-02-12 02:48:09 +00:00
Robin Gloster
071bdd4639
graphviz: turn off fortify hardening
2016-02-12 01:25:17 +00:00
Robin Gloster
83e069908e
ggobi: turn off format hardening
2016-02-11 00:44:25 +00:00
Robin Gloster
e339a9a20e
barcode: turn off format hardening
2016-02-10 23:27:37 +00:00
Robin Gloster
3e8a2e73a6
editres: turn off format hardening
2016-02-09 01:55:15 +00:00
Robin Gloster
7eb16a4eb8
pngcheck: turn off format hardening
2016-02-08 00:41:02 +00:00
Robin Gloster
9229e9c656
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-02-07 11:17:57 +00:00
Vladimír Čunát
b8d488ab93
asymptote: fix tarball by asserting isLinux
...
We have no osmesa on darwin, which caused an evaluation error.
2016-02-05 19:22:22 +01:00
Peter Simons
770ba80479
Merge pull request #12767 from abbradar/asymptote-fixes
...
Asymptote fixes
2016-02-04 22:16:40 +01:00
Vladimír Čunát
54299b60c4
Merge #12779 : Mass replace pkg}/bin-style strings
...
... to refer to correct outputs
2016-02-03 17:25:22 +01: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
Nikolay Amiantov
3ab8f97201
asymptote: enforce no bundled libraries, install tex files, offscreen rendering support
2016-02-02 17:34:57 +03:00
Nikolay Amiantov
4222b8c20c
asymptote: enable parallel building
2016-02-02 17:27:26 +03:00
Domen Kožar
0b3becb269
Merge pull request #12701 from mayflower/builder-def-cleanup
...
builderDefsPackage cleanup
2016-02-01 21:09:34 +00:00
Tuomas Tynkkynen
0eb84e882b
treewide: Mass replace 'libjpeg}/bin' to refer the 'bin' output
2016-02-01 20:46:10 +02:00
Luca Bruno
3101275527
vips: 8.1.1 -> 8.2.2
...
cc @kovirobi
2016-01-31 17:44:46 +01:00
Robin Gloster
5e189bd207
welkin: use mkDerivation and fix build
2016-01-30 20:31:05 +00:00
Robin Gloster
c48824ba38
cuneiform: use mkDerivation
2016-01-30 20:31:03 +00:00
Robin Gloster
8f7ffe9ba3
netpbm: 10.66.00 -> 10.70.00
2016-01-30 16:36:57 +00:00