Commit graph

47 commits

Author SHA1 Message Date
Tuomas Tynkkynen
0ed9de2546 gnuplot: Use quoting syntax that's compatible with old and new Nix versions
There is probably a way to have it work with substituteInPlace, but
using sed is a cheap solution to not having to figure out how to escape
"'$'" in Nix that works in both versions.

Issue #31179.
Fixes #33833.
2018-01-15 00:03:38 +02:00
Orivej Desh
bf132e6464 gnuplot_qt: Qt 4 -> Qt 5 2017-12-10 19:30:57 +00:00
Orivej Desh
051cbf7cbe gnuplot: build with libcerf 2017-12-10 19:30:57 +00:00
Will Dietz
7b27b24690 gnuplot: 5.2.1 -> 5.2.2 2017-12-08 16:58:28 -06:00
Will Dietz
7390087b78 gnuplot: 5.2.0 -> 5.2.1 2017-11-08 01:48:40 -06:00
mimadrid
a6c5031197
gnuplot: 5.0.6 -> 5.2.0 2017-09-23 00:34:41 +02:00
mimadrid
2a00ff4a1c
gnuplot: 5.0.3 -> 5.0.6 2017-08-01 20:58:48 +02:00
Tuomas Tynkkynen
eda2dd3d2f treewide: Fix more 'lib.optional' misuses 2016-10-02 00:44:10 +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
Micxjo Funkcio
390abc547b
gnuplot: 5.0.0 -> 5.0.3 2016-04-21 20:31:58 -07:00
Vladimír Čunát
716aac2519 Merge branch 'staging' into closure-size 2016-01-19 09:55:31 +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
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
Thomas Tuegel
269ae2e29d gnuplot: use texlive-new 2015-12-12 10:47:03 -06: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
Thomas Tuegel
255c0903a1 gnuplot: requires Qt 4 2015-05-25 21:04:01 -05:00
Thomas Tuegel
5d1f6ad57c qt5: make qt-5.4.1 default 2015-03-24 17:14:56 -05:00
Eduard Bachmakov
5915d9c417 gnuplot: bump to 5.0.0, allow choosing qt version
default to qt5
2015-01-10 19:51:54 -05:00
Mateusz Kowalczyk
13af1ea08f gnuplot_qt: update from 4.6.5 to 4.6.6, potentially fixes CVE-2012-5624, CVE-2012-6093, CVE-2013-0254, CVE-2014-0190
cc @lovek323
2014-09-30 11:10:30 +01:00
Eelco Dolstra
9f08904c8d gnuplot: Use default compiler on Darwin 2014-08-09 19:53:09 +02:00
Eelco Dolstra
6c5186cf9b gnuplot: Reduce dependency bloat a bit 2014-08-09 19:30:48 +02:00
Thomas Tuegel
ac01b79c73 gnuplot: add optional Qt terminal 2014-07-23 18:01:31 -05:00
Thomas Tuegel
760cad296d gnuplot: version bump 4.6.3 -> 4.6.5 2014-07-23 18:01:17 -05:00
Vladimír Čunát
2b24f1349a Merge master into x-updates 2013-12-21 10:20:55 +01:00
Peter Simons
5d0f009718 gnuplot: there is point in having Hydra try to build this package on BSD Unix 2013-12-21 00:08:53 +01:00
Vladimír Čunát
3941c15b59 gnuplot: pass aquaterm request explicitely (see #1197) 2013-12-10 12:43:20 +01:00
Eric Kow
9f7510113e gnuplot darwin: optional gnuplot_aquaterm variant
This variant uses the more Mac-friendly aqua driver, but it requires
that you separately install the AquaTerm package.

Note that AquaTerm is open source and could perhaps be later included
as a nix derivation. If that happens, it would be nice to remove the
gnuplot_aquaterm top-level attribute and just make it the default.
2013-11-10 13:43:43 +00:00
Vladimír Čunát
98f3716650 clean some include flags that weren't really needed
Tested the builds still work (x86_64-linux).
2013-08-03 10:45:13 +02:00
Jason "Don" O'Conal
4c9cff322a gnuplot: fix build on darwin
* add readline to build inputs
* don't use wxGTK
2013-07-04 08:51:25 +10:00
Peter Simons
d5dac74d94 gnuplot: update to version 4.6.3 2013-06-17 15:25:03 +02:00
David Guibert
c887f9e932 update gnuplot to 4.6.0 2013-05-14 15:42:14 +02:00
Peter Simons
f2bff3d088 gnuplot: configure GDFONTPATH using 'fontconfig'
This patch adds a wrapper script around gnuplot that uses fontconfig's
fc-list(1) utility to determine the set of available fonts and makes that list
available to Gnuplot in the $GDFONTPATH variable.
2013-02-18 00:00:48 +01:00
Peter Simons
7e539f9636 gnuplot: cosmetic, no functional change 2013-02-17 22:48:20 +01:00
Lluís Batlle i Rossell
e91a225a37 Updating gnuplot
svn path=/nixpkgs/trunk/; revision=31027
2011-12-21 22:48:33 +00:00
Yury G. Kudryashov
c0a1d527d7 gnuplot-4.4.2, metadata
svn path=/nixpkgs/trunk/; revision=23972
2010-09-27 18:15:49 +00:00
Eelco Dolstra
749b8607ca * More cleanup.
svn path=/nixpkgs/trunk/; revision=22795
2010-07-28 15:35:01 +00:00
Peter Simons
aa600ed8f7 pkgs/top-level/all-packages.nix: prefer makeOverridable over getPkgConfig to customize GNU plot
Changed 'gnuplot' expression to allow for argument overriding instead of
relying on getPkgConfig. While I was at it, I also simplified the actual build
expression a bit.

svn path=/nixpkgs/trunk/; revision=21864
2010-05-19 12:25:51 +00:00
Peter Simons
f96b77a4ce gnuplot: updated to version 4.4.0
svn path=/nixpkgs/trunk/; revision=21648
2010-05-07 14:01:57 +00:00
Lluís Batlle i Rossell
43e167641f Updating octave and gnuplot.
svn path=/nixpkgs/trunk/; revision=20007
2010-02-15 10:54:50 +00:00
Peter Simons
c5179a098c Updated Gnuplot to version 4.2.5.
* Merged 'gnuplot' and 'gnuplotX' attributes into one that uses (getPkgConfig
   "gnuplot" "x11" false) to determine whether X11 support is desired or not.

 * Added Emacs as a build-time dependency to ensure that Gnuplot's lisp code is
   installed, too.

 * Added optional support for the wxt terminal by means of (getPkgConfig
   "gnuplot" "wxGtk" false).

 * Removed the '-nix' suffix to the package name. The Gnuplot license requires
   a vendor-specific version suffix only in case of modified binary
   distributions. That is not the case here.

svn path=/nixpkgs/trunk/; revision=16992
2009-09-09 09:36:03 +00:00
Rob Vermaas
8393b93136 pass readline to gnuplot
svn path=/nixpkgs/trunk/; revision=16455
2009-07-24 14:18:25 +00:00
Eelco Dolstra
ebacd32b71 * Added libgd.
* gnuplot 4.2.2.

svn path=/nixpkgs/trunk/; revision=9354
2007-09-21 20:43:43 +00:00
Eelco Dolstra
607b0d3e80 * Rewrite all the SourceForge URLs to mirror://sourceforge/.
find . -name "*.nix" | while read fn; do sed 's^http://[a-z]*.dl.sourceforge.net/sourceforge/^mirror://sourceforge/^g' < $fn > $fn.new; mv $fn.new $fn; done

svn path=/nixpkgs/trunk/; revision=9198
2007-08-27 13:01:33 +00:00
Eelco Dolstra
a0159dee8e * Reverted r6713, r6711, r4623, r3660, r2237. There rewrote fetchurl
URLs to http://nix.cs.uu.nl/dist/tarballs.  With content-addressable
  mirror support (r9190, NIXPKGS-70) this is no longer necessary:
  fetchurl will try to download from that location automatically.  So
  we can keep the original URLs.

svn path=/nixpkgs/trunk/; revision=9192
2007-08-24 12:32:36 +00:00
Michael Raskin
99d499f0c8 Added X11 option for gnuplot.
svn path=/nixpkgs/trunk/; revision=9046
2007-08-04 15:11:48 +00:00
Eelco Dolstra
3389f4bc36 * Copy lots of files to nix.cs.uu.nl.
svn path=/nixpkgs/trunk/; revision=4623
2006-01-30 16:04:03 +00:00
Eelco Dolstra
8774874b89 * Gnuplot 4.0 (without X support).
svn path=/nixpkgs/trunk/; revision=2993
2005-05-06 08:54:01 +00:00