Commit graph

690 commits

Author SHA1 Message Date
Franz Pletz 7f49fbb0ef Merge pull request #16574 from womfoo/update/nip2
vips: 8.2.2 -> 8.3.1 and dependency nip2: 8.0 -> 8.3.0
2016-07-19 11:12:02 +02:00
Robin Gloster 5185bc1773 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-15 14:41:01 +00:00
Ram Kromberg 781cd33f3b glmark2: 2014.03 -> 2015-06-11 (#16812) 2016-07-09 14:50:24 +02:00
Tuomas Tynkkynen 3d5a41fc75 Merge pull request #16732 from RamKromberg/fix/icoutils-issue-15894
icoutils: perl dependencies added #15894
2016-07-06 13:17:20 +03:00
Ram Kromberg 3d316da103 icoutils: perl dependencies added #15894 2016-07-06 06:48:51 +03:00
Tuomas Tynkkynen e12f789cef sng: 1.0.6 -> 1.1.0 2016-07-06 01:18:46 +03:00
Kranium Gikos Mendoza 59ee0c747a nip2: 8.0 -> 8.3.0 2016-06-28 19:46:40 +08:00
Kranium Gikos Mendoza db2fc7a503 vips: 8.2.2 -> 8.3.1 2016-06-28 19:46:30 +08: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
Maarten Hoogendoorn 4601254c73 scanbd: add missing jpeg dependency 2016-06-17 23:56:47 +02:00
Benno Fünfstück 96066935f2 fix build of pngcheck 2016-06-13 01:21:14 +02:00
Robin Gloster 8031cba2ab Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-06-10 09:27:04 +00:00
Matthew Bauer 2b7b6047a5 exif: use libintl on darwin
fixes #16034
2016-06-08 20:11:03 -05:00
Tuomas Tynkkynen bac26e08db Fix lots of fetchgit hashes (fallout from #15469) 2016-06-03 17:17:08 +03:00
Joachim Fasting c82b6c6116
pstoedit: 3.62 -> 3.70
Note that kde4.calligra, the only reverse dependency, fails to build,
but I have confirmed that it fails also with the previous pstoedit
version so the failure appears unrelated (nor does the error really
indicate that pstoedit is at fault ...).

Also
- Change meta.homepage; the original domain didn't work properly for me
- Split dev output; may want to split out bin/lib as well, for some
  decent saving
- Build with imagemagick for a slight size increase
2016-06-02 00:22:07 +02:00
mingchuan f2b5694abc
pstoedit: depend on libwebp to fix linker failure
This fixes the linker failure saying "cannot find -lwebp"

Closes #15888
2016-06-02 00:21:16 +02:00
Bjørn Forsman 65ccda5b96 zbar: fix camera support (enables 'zbarcam' tool)
Add Debian patches (with fetchpatch) to make things work. Among other
things, the patches port the application from V4L to V4L2.

This increases the closure size from 729 MiB to 730 MiB.
2016-05-31 09:31:41 +02:00
Robin Gloster 2d382f3d98 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-05-30 19:39:34 +00:00
Michael Raskin f345d01974 graphviz_2_0: dependency reasons now make libwebp needed 2016-05-30 12:13:34 +02:00
Bjørn Forsman 972c438c03 mscgen: add 'libwebp' to unbreak build
Fixes broken build since commit 7d580b8339
("gd: 2.1.1 -> 2.2.1"):

  $ nix-build -A mscgen
  [...]
  gcc  -g -O2   -o mscgen mscgen-adraw.o mscgen-cmdparse.o mscgen-main.o
  mscgen-svg_out.o mscgen-language.o mscgen-msc.o mscgen-ps_out.o
  mscgen-utf8.o mscgen-gd_out.o mscgen-safe.o mscgen-lexer.o
  mscgen-null_out.o mscgen-usage.o -lm -lgd -lm
  -L/nix/store/HASH-zlib-1.2.8/lib -lz
  -L/nix/store/HASH-libpng-apng-1.6.21/lib
  -lpng16 -L/nix/store/HASH-freetype-2.6.2/lib
  -lfreetype
  -L/nix/store/HASH-fontconfig-2.11.1-lib/lib
  -L/nix/store/HASH-freetype-2.6.2/lib
  -lfontconfig -lfreetype -ljpeg -lwebp -lgd -lm
  /nix/store/HASH-binutils-2.26/bin/ld: cannot find -lwebp
  collect2: error: ld returned 1 exit status
2016-05-30 10:10:21 +02:00
Matt McHenry 7fe0c342a3 bins: init at 1.1.29 2016-05-29 21:48:28 +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
Robert Helgesson f820c78f37 unpaper: add platforms field 2016-05-22 14:34:33 +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 309b2644ac treewide: Make explicit that 'dev' output of libpng is used 2016-05-19 10:00:44 +02:00
Tuomas Tynkkynen be00816cab treewide: Make explicit that 'dev' output of libjpeg is used 2016-05-19 10:00:42 +02:00
Tuomas Tynkkynen 8bbc3fe801 treewide: Make explicit that 'dev' output of expat is used 2016-05-19 10:00:30 +02:00
Tuomas Tynkkynen 825bd69b38 treewide: Make explicit that 'dev' output of boehmgc is used 2016-05-19 10:00:27 +02:00
Franz Pletz f8d481754c
Merge remote-tracking branch 'origin/master' into hardened-stdenv 2016-05-18 17:10:02 +02:00
William Casarin cac460f6c4 wkhtmltopdf: fix openssl bug (#15443) 2016-05-17 01:35:15 +02: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
Michael Raskin 29acc7e0df asymptote: 2.37 -> 2.38 2016-05-15 23:49:44 +02:00
Joachim Fasting 94286527ac
mscgen: add libjpeg to build inputs
Possibly jpeg used to be propagated from gd but is no longer after
f8bdd7969d.
2016-05-14 07:42:58 +02:00
Joachim Fasting a371094f1f
pstoedit: explicit dependency on jpeg
Possibly jpeg used to be propagated from gd but is no longer after
f8bdd7969d.
2016-05-14 07:41:42 +02:00
Thomas Tuegel 6def68f548 kst: mark broken 2016-05-09 10:01:09 -05:00
Franz Pletz d5dd5e05f1 glxinfo: 8.1.0 -> 8.3.0 2016-05-03 16:15:20 +02:00
Robin Gloster c92bca56f8 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-05-02 22:58:02 +00:00
Nikolay Amiantov b63edea44c imgurbash2: 1.0 -> 2.1 2016-04-30 03:12:34 +03:00
Marius Bakke e74289decc maim: 3.4.46 -> 3.4.47 2016-04-24 18:11:37 +01:00
Peter Simons 33d9233921 Merge pull request #14884 from micxjo/update-gnuplot
gnuplot: 5.0.0 -> 5.0.3
2016-04-22 17:07:03 +02:00
Micxjo Funkcio 390abc547b
gnuplot: 5.0.0 -> 5.0.3 2016-04-21 20:31:58 -07:00
Nikolay Amiantov 5a4cccd7e7 nifskope: move to qmake4Hook 2016-04-20 18:55:55 +03:00
Robin Gloster d020caa5b2 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-04-18 13:49:22 +00: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
Robin Gloster 3e68106afd Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-04-07 21:52:26 +00: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
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
Robin Gloster acb408646e remove local pic flags, now set by hardened stdenv 2016-01-30 16:36:57 +00:00
Robin Gloster c10ca363c6 graphviz: no fortify hardening 2016-01-30 16:36:57 +00:00
Robin Gloster f6d3b7a2ae switch hardening flags 2016-01-30 16:36:57 +00:00
Franz Pletz 954e9903ad Use a hardened stdenv by default 2016-01-30 16:36:57 +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
Andreas Herrmann 79e145a970 gnuplot: Improve startup performance
Before executing the gnuplot executable the environment variable `GDFONTPATH`
is populated with a list of font directories, which is obtained from `fc-list`.
In that process we iterated over each line and called `dirname` on it, which
introduces a performance hit for loading and executing the external executable
`dirname` every time.

The new version avoids the loop.

The author of this patch measured a 42 fold performance improvement:

old version:

    $ time ./gnuplot_old/bin/gnuplot -e ''
    real    0m3.828s
    user    0m0.392s
    sys     0m0.465s

new version:

    $ time ./gnuplot_new2/bin/gnuplot -e ''
    real    0m0.091s
    user    0m0.112s
    sys     0m0.014s

The correctness of the value of `GDFONTPATH` was confirmed with the following
command and comparing its output between versions:

    $ gnuplot -e 'print system("echo $GDFONTPATH")'
2016-01-11 15:37:07 +01:00
zimbatm 93ddfbacd4 pngcrush: fixes compilation on darwin 2016-01-11 00:52:24 +00:00
zimbatm e1873ade38 pngcrush: 1.7.85 -> 1.7.92
also fixes a compilation issue on OSX
2016-01-09 16:38:06 +00:00
Robert Helgesson f54ed09096 jhead: add libjpeg as dependency
The `jpegtran` tool from libjpeg is required for the `-autorot` command.
2016-01-06 20:38:20 +01:00
Tobias Geerinckx-Rice eed2fa3de4 qrdecode: remove dead package
Never maintained, no updates since 2010, and broken since 2013. Bye.
2016-01-06 03:10:56 +01:00
Vladimír Čunát f9f6f41bff Merge branch 'master' into closure-size
TODO: there was more significant refactoring of qtbase and plasma 5.5
on master, and I'm deferring pointing to correct outputs to later.
2015-12-31 09:53:02 +01:00
Robert Helgesson 3af583d976 pdf2svg: add autoreconf hook (close #11888)
This fixes builds that may fail due to all files in the archive having
the same timestamp.
2015-12-23 07:36:25 +01:00
Thomas Tuegel 97f7eb1e64 kst: Qt 5 infrastructure update 2015-12-20 07:56:50 -06:00
Arseniy Seroka 05d08e400c Merge pull request #11823 from rycee/bump/jhead
jhead: 2.87 -> 3.00
2015-12-19 19:05:51 +03:00
Robert Helgesson 1b3930ca04 pdf2svg: 0.2.2 -> 0.2.3
Also minor style changes and upstream source is now on GitHub.
2015-12-19 00:50:46 +01:00
Robert Helgesson 8296346207 jhead: 2.87 -> 3.00
Also clean up the package quite a bit and add myself as maintainer.
2015-12-19 00:29:32 +01:00
Eric Sagnes f22aefbba0 vips: 8.0.2 -> 8.1.1 2015-12-15 03:46:35 +09:00
Thomas Tuegel 269ae2e29d gnuplot: use texlive-new 2015-12-12 10:47:03 -06:00
Luca Bruno 5b0352a6a4 Merge branch 'master' into closure-size 2015-12-11 18:31:00 +01:00
Frederik Rietdijk 4bcfa14480 pdfread: use pillow instead of pil 2015-12-08 15:15:40 +01:00
Frederik Rietdijk 47dc242b9d pdfread: broken, not found 2015-12-08 15:14:45 +01:00
Luca Bruno 920b1d3591 Merge branch 'master' into closure-size 2015-11-29 16:50:26 +01:00
Pascal Wittmann 6d25c0f1b3 Remove unneeded 'with's from meta.platforms 2015-11-25 23:06:09 +01:00
Luca Bruno a412927924 Merge remote-tracking branch 'origin/master' into closure-size 2015-11-25 21:37:30 +01:00
Joachim Fasting 8aa63b34da qrdecode: reimplement using mkDerivation
Also mark as broken; I have verified that the build fails with
the original build recipe.
2015-11-24 14:45:15 +01:00
Joachim Fasting 34fda4cbe2 cfdg: reimplement using mkDerivation 2015-11-24 14:45:15 +01:00
Joachim Fasting b0e5edae35 zbar: reimplement using mkDerivation 2015-11-24 14:45:15 +01:00
Joachim Fasting 2889b153c5 barcode: reimplement using mkDerivation 2015-11-24 14:45:15 +01:00
Vladimír Čunát 333d69a5f0 Merge staging into closure-size
The most complex problems were from dealing with switches reverted in
the meantime (gcc5, gmp6, ncurses6).
It's likely that darwin is (still) broken nontrivially.
2015-11-20 14:32:58 +01:00
zimbatm 2273bd5b30 gifsicle: 1.87 -> 1.88
+ fix for gifview flag
+ tests
2015-11-15 11:50:20 +01:00
William A. Kennington III 6602f49495 Revert "Revert "Merge pull request #9543 from NixOS/staging.post-15.06""
This reverts commit 741bf840da.

This reverts the fallout from reverting the major changes.
2015-11-14 12:32:51 -08:00
William A. Kennington III 9579c9ec7f Merge commit 'cb21b77' into master.upstream
This is a partial merge of staging for builds which are working
2015-11-13 15:53:10 -08:00
Pascal Wittmann f5d1642a22 Merge pull request #10659 from jb55/wkhtmltopdf-bump
wkhtmltopdf: 0.12.1 -> 0.12.2.4
2015-11-09 13:32:32 +01:00
William A. Kennington III a26c8e9b83 Merge branch 'master.upstream' into staging.upstream 2015-11-07 15:51:51 -08:00
Sergey Sofeychuk 998934bf89 imgur-screenshot: init at 1.5.4 2015-11-06 23:48:32 +03:00
William A. Kennington III dd2de66d61 Merge branch 'master.upstream' into staging.upstream 2015-10-30 17:16:07 -07:00
Jude Taylor 4318329714 link graphviz with libc++ instead of nothing on darwin 2015-10-28 16:09:51 -07:00
John Wiegley ef8c8a3b7c Merge pull request #10568 from datakurre/datakurre-graphviz
darwin: graphviz: remove -lstdc++ on darwin
2015-10-28 15:46:47 -07:00
Vladimír Čunát f9e9c7242a djvulibre: split dev and bin outputs 2015-10-28 19:36:40 +01:00
Vladimír Čunát 74d4fc7959 graphviz: simplify and add a missing X library 2015-10-28 10:15:52 +01:00
William Casarin feb1e8f046 wkhtmltopdf: add myself as maintainer 2015-10-27 17:20:26 -07:00
William Casarin 9838265ab3 wkhtmltopdf: 0.12.1 -> 0.12.2.4 2015-10-27 17:15:40 -07:00
Pascal Wittmann 2c190bedd2 logstalgia: 1.0.6 -> 1.0.7 2015-10-26 14:45:13 +01:00
Cillian de Róiste 1ee8280543 dcraw: update from 9.22 to 9.26.0 2015-10-25 19:06:58 +01:00
Tuomas Tynkkynen ebb060c351 sng: init at 1.0.6 2015-10-25 16:17:44 +02:00
Asko Soukka d8cb19b22e darwin: graphviz: remove -lstdc++ on darwin 2015-10-24 03:40:37 +03:00
Vladimír Čunát 4917a4f8b3 Merge master into staging 2015-10-23 01:57:14 +02:00
Brian McKenna d0de36ba7a leela: init at 12.fe7a35a 2015-10-16 21:59:49 +11:00
Vladimír Čunát 9da12a6713 SDL: split the dev output and fix referrers 2015-10-13 20:18:56 +02:00
Vladimír Čunát cba6641623 cairo, pango: fix some string references 2015-10-13 20:18:51 +02:00
Eelco Dolstra 741bf840da Revert "Merge pull request #9543 from NixOS/staging.post-15.06"
This reverts commit f61176c539, reversing
changes made to a27ca029ee.

Conflicts:
	pkgs/development/libraries/ncurses/default.nix
2015-10-06 15:24:20 +02:00
Vladimír Čunát f8c211fd2b fontconfig: split into multiple outputs
Fixed all 'fontconfig}' references as well, hopefully, ugh!
2015-10-05 12:23:56 +02:00
Vladimír Čunát f361938b21 Merge staging into closure-size
This makes gcc5 the default builder, etc.
2015-10-03 15:23:13 +02:00
Vladimír Čunát 5227fb1dd5 Merge commit staging+systemd into closure-size
Many non-conflict problems weren't (fully) resolved in this commit yet.
2015-10-03 13:33:37 +02:00
Tobias Geerinckx-Rice 8c45057764 enblend-enfuse: 4.1.3 -> 4.1.4 2015-10-02 05:34:33 +02:00
Vladimír Čunát 76ef7a93e3 Merge: xlibs and x11 attribute cleanup
Frequently using multiple *almost* identical attributes is bad.
2015-09-23 10:42:34 +02:00
Matthias Beyer 8bb71e992c maim: 3.3.41 -> 3.4.46 2015-09-22 01:57:58 +02:00
William A. Kennington III fc2b0e9d10 argyllcms: gcc5 compat 2015-09-16 21:58:53 -07:00
William A. Kennington III 773b4deb7c Merge commit 'a6f6c0e' into master.upstream
This is a partial merge of staging where we have up to date binaries for
all packages.
2015-09-15 12:16:49 -07:00
Vladimír Čunát 88c9f8b574 xlibs: replace occurrences by xorg
This seems to have been confusing people, using both xlibs and xorg, etc.
- Avoided renaming local (and different) xlibs binding in gcc*.
- Fixed cases where both xorg and xlibs were used.
Hopefully everything still works as before.
2015-09-15 12:54:34 +02:00
Vladimír Čunát 21e3ff658a x11: replace its usage by xlibsWrapper directly
Scilab note: the parameters already had pointed to nonexistent dirs
before this set of refactoring. But that config wasn't even used by
default.
2015-09-15 12:08:24 +02:00
Vladimír Čunát 0c74f18e4c xlibs.xlibs: remove
It was really ugly that `xlibs.xlibs` meant something else than `xlibs`,
especially when using `with xlibs`, such as in wine.
Also, now `xlibs` is the same as `xorg`.
2015-09-15 11:59:33 +02:00
Mathnerd314 eb7404d97a all-packages: Use callPackage where possible 2015-09-14 22:27:19 -06:00
Samuel Rivas 7cc66a1c95 Update to 1.8.2 and make curl look like mozilla
This commit is supposed to be squashed, keeping it just for traceability during
the pull request.
2015-09-13 22:08:40 +02:00
Samuel Rivas 6ef885defb argyllcms 1.4.0 -> 1.8.1 2015-09-07 11:41:39 +02:00
Vladimír Čunát 8f33b8cc93 mass rewrite of find parameters to cross-platform style
Fixes #9044, close #9667. Thanks to @taku0 for suggesting this solution.
Now we have no modes starting with `/` or `+`.

Rewrite the `-perm` parameters of find:
 - completely safe: rewrite `/0100` and `+100` to `-0100`,
 - slightly semantics-changing: rewrite `+111` to `-0100`.
I cross-verified the `find` manual pages for Linux, Darwin, FreeBSD.
2015-09-06 10:26:30 +02:00
Luca Bruno 4f320818e2 dmtx-utils: depend on imagemagick (ZHF) 2015-07-28 17:57:11 +02:00
Nikolay Amiantov 3a2275dd84 imgurbash: add package 2015-07-28 12:33:29 +03:00
goibhniu a076e4bee6 Merge pull request #8864 from rycee/package/gmic
gmic: init at 1.6.5.0
2015-07-16 22:50:16 +02:00
Robert Helgesson 6a1519c631 gmic: init at 1.6.5.0 2015-07-16 22:02:21 +02:00
Bjørn Forsman 9ad01e41de eplot: init at 2.07
Create plots quickly with gnuplot.

http://liris.cnrs.fr/christian.wolf/software/eplot/
2015-07-15 23:37:33 +02:00
Bjørn Forsman 2926f3aa2c fgallery: init at 1.7
fgallery is a static photo gallery generator.

http://www.thregr.org/~wavexx/software/fgallery/
2015-07-15 16:02:37 +02:00
Tuomas Tynkkynen 167cf5c0da asymptote: Fix source URL
The particular mirror (softlayer-ams.dfl.sourceforge.net) seems to be
down (no DNS entry).
2015-07-05 14:31:46 +03:00
Mateusz Kowalczyk fc26e89159 Merge pull request #8394 from mbakke/maim
Add maim and slop
2015-06-19 15:22:20 +01:00
Marius Bakke 3d68e0b0e2 new package: maim 2015-06-18 22:13:06 +01:00
Michael Raskin de7c3eef17 Update Asymptote 2015-06-14 11:22:32 +03:00
Pascal Wittmann 62d62b6588 Fixed some licenses 2015-06-10 13:00:42 +02:00
Kovacsics Robert (NixOS-SSD2) f4dce11c19 Major update to vips and nip2 to 8.0.2, changes:
- Much better conversion to greyscale
- More efficient use of file descriptors
- Rewritten TIFF pyramid creator
- Removed old stuff

See http://libvips.blogspot.co.uk/2015/05/whats-new-in-80.html
and https://github.com/jcupitt/libvips/blob/master/ChangeLog
2015-06-08 10:56:00 +01:00
Nixpkgs Monitor 2a74e84992 pngcrush: update from 1.7.83 to 1.7.85 2015-06-07 15:43:53 +02:00
Thomas Tuegel 255c0903a1 gnuplot: requires Qt 4 2015-05-25 21:04:01 -05:00
Tobias Geerinckx-Rice 5d5044b2ec Use mirror:// URIs for ftp.debian.org
Provide a more robust experience for users with horrible network
hardware (me).
2015-05-22 10:39:27 +02:00
Pascal Wittmann 65f1e8e048 ploticus: update from 2.41 to 2.42 2015-05-19 22:06:32 +02:00
William A. Kennington III c9395e1e92 Merge branch 'master' into staging 2015-05-08 05:59:50 -07:00
Vladimír Čunát 3b9ef2c71b fix "libc}/lib" and similar references
Done mostly without any verification.
I didn't bother with libc}/include, as the path is still correct.
2015-05-05 11:52:08 +02:00
Raymond Gauthier 6119355c9c Simplify standalone diagrams-builder expression. 2015-04-29 21:46:39 -04:00
Raymond Gauthier 76a8089d96 Added standalone diagram-builder haskell package.
Simple wrapper over `haskellng`'s `diagram-builder`
package that allows for simpler install.
2015-04-27 23:02:37 -04:00
Vladimír Čunát 30f31c9afc Merge 'master' into staging
(relatively simple conflicts)
2015-04-26 22:52:08 +02:00