Commit graph

472 commits

Author SHA1 Message Date
Nikolay Amiantov
5a4cccd7e7 nifskope: move to qmake4Hook 2016-04-20 18:55:55 +03:00
Nikolay Amiantov
3f9cfba02c Merge commit 'refs/pull/14677/head' of git://github.com/NixOS/nixpkgs 2016-04-14 05:14:58 +03:00
Sergey Sofeychuk
9a11aafb91 imgur-screenshot: 1.5.4 -> 1.7.1
Updated imgur-screenshot i guess

Wrong hash in previous commit, it's fixed now.
2016-04-14 05:12:56 +03:00
Nikolay Amiantov
8b7ebaffeb replace makeSearchPath tree-wise to take care of possible multiple outputs 2016-04-13 22:09:41 +03:00
Michael Raskin
530fdc5362 asymptote: 2.36 -> 2.37 2016-04-13 14:47:04 +02:00
Vladimír Čunát
39ebb01d6e Merge branch 'staging', containing closure-size #7701 2016-04-13 09:25:28 +02:00
Micxjo Funkcio
f299e112bc
pngcrush: 1.7.92 -> 1.8.1 2016-04-11 20:18:38 -07:00
Nikolay Amiantov
59bed14119 imgurbash2: init at 1.0; also drop imgurbash 2016-04-12 04:07:36 +03: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
Micxjo Funkcio
eda65083e8
optipng: 0.7.5 -> 0.7.6 (CVE-2016-2191) 2016-04-07 23:47:53 -07:00
Anthony Cowley
9b0890cfa5 graphviz: build with pango even without xorg
The pango dependency enables outputting PDF files, and is somewhat
independent of the larger xorg dependencies.
2016-04-07 18:19:01 -04:00
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
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
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
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
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
Allan Espinosa
2dd51275eb dpic: init at 2016.01.12 2016-02-22 07:42:53 -06: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
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
Tobias Geerinckx-Rice
626c09bb46 scanbd: init at 1.4.4 2016-01-25 03:43:19 +01:00
Tuomas Tynkkynen
ed7dbb46a8 treewide: Mass replace 'zlib}/lib' to refer the 'out' output 2016-01-24 10:03:39 +02:00
Tuomas Tynkkynen
3916cf476b treewide: Mass replace 'libtiff}/lib' to refer the 'out' output 2016-01-24 10:03:36 +02:00
Tuomas Tynkkynen
377e942f71 treewide: Mass replace 'libpng}/lib' to refer the 'out' output 2016-01-24 10:03:35 +02:00
Tuomas Tynkkynen
493349f82a treewide: Mass replace 'libjpeg}/lib' to refer the 'out' output 2016-01-24 10:03:35 +02:00
Tuomas Tynkkynen
f9bf203837 treewide: Mass replace 'expat}/lib' to refer the 'out' output 2016-01-24 10:03:34 +02:00
Rodney Lorrimar
a8aecdcc20 xcftools: init at 1.0.7 2016-01-22 19:45:48 +00:00
Vladimír Čunát
716aac2519 Merge branch 'staging' into closure-size 2016-01-19 09:55:31 +01:00
Svein Ove Aas
0dc1bc4aee fgallery: 1.7 -> 1.8 2016-01-17 11:28:50 +01:00
lethalman
b1d3c8b64f Merge pull request #12266 from zimbatm/pngcrush-1.7.92
Pngcrush updates
2016-01-13 14:48:36 +01:00