Commit graph

71 commits

Author SHA1 Message Date
Robin Gloster 1b979d8384 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-03 13:34:44 +00:00
Tuomas Tynkkynen 21f17d69f6 treewide: Add lots of meta.platforms
Build-tested on x86_64 Linux & Mac.
2016-08-02 21:42:43 +03:00
Tuomas Tynkkynen 1bf5ded193 treewide: Lots of meta.hydraPlatforms -> meta.platforms
In all of these files, there is no meta.platforms but only
meta.hydraPlatforms, which doesn't seem to have any purpose except being
inconsistent.
2016-08-02 21:17:44 +03: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
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
Franz Pletz f8d481754c
Merge remote-tracking branch 'origin/master' into hardened-stdenv 2016-05-18 17:10:02 +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
Robin Gloster d020caa5b2 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-04-18 13:49:22 +00: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
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
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 4bf29b83f8 graphviz_2_0: disable format/fortify hardening 2016-02-23 15:03:14 +00:00
Robin Gloster 071bdd4639 graphviz: turn off fortify hardening 2016-02-12 01:25:17 +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
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
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
Jude Taylor 4318329714 link graphviz with libc++ instead of nothing on darwin 2015-10-28 16:09:51 -07:00
Vladimír Čunát 74d4fc7959 graphviz: simplify and add a missing X library 2015-10-28 10:15:52 +01:00
Asko Soukka d8cb19b22e darwin: graphviz: remove -lstdc++ on darwin 2015-10-24 03:40:37 +03:00
Vladimír Čunát cba6641623 cairo, pango: fix some string references 2015-10-13 20:18:51 +02: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
James Cook 91fa9b27d5 graphviz: Patch to fix CVE-2014-9157 (close #6640) 2015-03-03 11:38:02 +01:00
William A. Kennington III 47f9a276c3 graphviz: Add a no x dependency version 2015-02-18 18:15:51 -08:00
Bjørn Forsman e90d316f19 graphviz: patch vimdot to lookup 'vim' in $PATH
Without this it tries to run /usr/bin/vim. Patch is already accepted
upstream.
2015-01-09 07:11:48 +01:00
Michael Raskin 9d73fbd4b9 Set branch for old graphviz versions 2014-10-07 16:23:28 +04:00
Michael Raskin 08131bd5d5 Update guitone 2014-09-01 00:38:07 +04:00
Michael Raskin 60d4216d01 Update Graphviz 2014-09-01 00:38:07 +04:00
James Cook 11be16cac4 graphviz: Remove obsolete patch. 2014-01-15 10:57:39 +01:00
James Cook f9aa8a86a6 graphviz: update to version 2.36.0. 2014-01-15 10:57:39 +01:00
Peter Simons 900786ab37 Fix more evaluation errors on Hydra. 2013-12-11 12:08:19 +01:00
Eelco Dolstra da426c7df5 Fix some meta.platforms attributes to build more stuff on Darwin 2013-11-05 10:46:59 +01:00
Sander van der Burg 37b25a712e Fix graphviz building on darwin 2013-06-18 12:24:40 +02:00
Bjørn Forsman 05bb66ce20 Add myself as maintainer for several packages
And set missing meta.platforms for the packages I've added earlier.
2013-05-20 20:28:15 +02:00
Bjørn Forsman 74d6315024 graphviz: fix vimdot program
vimdot doesn't work at the moment because one of its dependencies,
'which', is missing; vimdot fails to find gvim or vim and aborts.
Instead of adding a dependency on 'which', replace it with the POSIX
command 'command -v'.
2013-03-09 21:45:20 +01:00
Sander van der Burg a0d45d6f9b graphviz: Fix compilation on darwin 2013-01-11 18:20:44 +01:00
Peter Simons 3d4068b11a graphviz: patch broken cdt.h header file
The cdt.h header duplicates the signatures of standard library functions
memcmp() and strcpy(), but those signatures don't match the real thing when
building with a C++ compiler, because they lack the no-throw declaration glibc
has. Simply dropping those redundant prototypes remedies the issue.
2012-11-11 20:16:21 +01:00
Peter Simons e623ca0e28 graphviz: fixed typos
Thanks, Eelco.

svn path=/nixpkgs/trunk/; revision=33549
2012-04-02 21:54:14 +00:00
Peter Simons 1eeaeaf3ac graphviz: enabled support for the gts library (used by sfdp renderer)
svn path=/nixpkgs/trunk/; revision=33548
2012-04-02 21:20:38 +00:00
Shea Levy 3b48b8ffc4 graphviz: Hard-code lefty's path in dotty
svn path=/nixpkgs/trunk/; revision=33317
2012-03-20 23:27:12 +00:00
Eelco Dolstra ea82288eec * Remove the unused graphviz/2.24.nix file. Also remove the unused
attribute graphviz_2_24 (which was actually referring to Graphviz
  2.0).

svn path=/nixpkgs/trunk/; revision=32406
2012-02-19 17:54:37 +00:00
Michael Raskin b2ec2c245a Fix wrong attribute reference addition
svn path=/nixpkgs/trunk/; revision=27574
2011-07-01 13:39:02 +00:00