Commit Graph

70 Commits

Author SHA1 Message Date
Frederik Rietdijk
099c13da1b Merge staging-next into master (#44009)
* substitute(): --subst-var was silently coercing to "" if the variable does not exist.

* libffi: simplify using `checkInputs`

* pythonPackges.hypothesis, pythonPackages.pytest: simpify dependency cycle fix

* utillinux: 2.32 -> 2.32.1

https://lkml.org/lkml/2018/7/16/532

* busybox: 1.29.0 -> 1.29.1

* bind: 9.12.1-P2 -> 9.12.2

https://ftp.isc.org/isc/bind9/9.12.2/RELEASE-NOTES-bind-9.12.2.html

* curl: 7.60.0 -> 7.61.0

* gvfs: make tests run, but disable

* ilmbase: disable tests on i686. Spooky!

* mdds: fix tests

* git: disable checks as tests are run in installcheck

* ruby: disable tests

* libcommuni: disable checks as tests are run in installcheck

* librdf: make tests run, but disable

* neon, neon_0_29: make tests run, but disable

* pciutils: 3.6.0 -> 3.6.1

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/pciutils/versions.

* mesa: more include fixes

mostly from void-linux (thanks!)

* npth: 1.5 -> 1.6

minor bump

* boost167: Add lockfree next_prior patch

* stdenv: cleanup darwin bootstrapping

Also gets rid of the full python and some of it's dependencies in the
stdenv build closure.

* Revert "pciutils: use standardized equivalent for canonicalize_file_name"

This reverts commit f8db20fb3a.
Patching should no longer be needed with 3.6.1.

* binutils-wrapper: Try to avoid adding unnecessary -L flags

(cherry picked from commit f3758258b8895508475caf83e92bfb236a27ceb9)
Signed-off-by: Domen Kožar <domen@dev.si>

* libffi: don't check on darwin

libffi usages in stdenv broken darwin. We need to disable doCheck for that case.

* "rm $out/share/icons/hicolor/icon-theme.cache" -> hicolor-icon-theme setup-hook

* python.pkgs.pytest: setupHook to prevent creation of .pytest-cache folder, fixes #40273

When `py.test` was run with a folder as argument, it would not only
search for tests in that folder, but also create a .pytest-cache folder.
Not only is this state we don't want, but it was also causing
collisions.

* parity-ui: fix after merge

* python.pkgs.pytest-flake8: disable test, fix build

* Revert "meson: 0.46.1 -> 0.47.0"

With meson 0.47.0 (or 0.47.1, or git)
things are very wrong re:rpath handling
resulting in at best missing libs but
even corrupt binaries :(.

When we run patchelf it masks the problem
by removing obviously busted paths.
Which is probably why this wasn't noticed immediately.

Unfortunately the binary already
has a long series of paths scribbled
in a space intended for a much smaller string;
in my testing it was something like
lengths were 67 with 300+ written to it.

I think we've reported the relevant issues upstream,
but unfortunately it appears our patches
are what introduces the overwrite/corruption
(by no longer being correct in what they assume)

This doesn't look so bad to fix but it's
not something I can spend more time on
at the moment.

--

Interestingly the overwritten string data
(because it is scribbled past the bounds)
remains in the binary and is why we're suddenly
seeing unexpected references in various builds
-- notably this is is the reason we're
seeing the "extra-utils" breakage
that entirely crippled NixOS on master
(and probably on staging before?).

Fixes #43650.

This reverts commit 305ac4dade.

(cherry picked from commit 273d68eff8f7b6cd4ebed3718e5078a0f43cb55d)
Signed-off-by: Domen Kožar <domen@dev.si>
2018-07-24 15:04:48 +01:00
volth
52f53c69ce pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00:00
Matthew Justin Bauer
912e60f929
inkscape: add perl to nativeBuildInputs
This should fix the issue in Linux sandbox.
2018-06-19 15:43:36 -04:00
Matthew Bauer
1f8f89d309 inkscape: work around ARGMAX limit
This uses strictDeps to get our args passed to the linker low enough
to enable building inkscape. With strictDeps we need to correctly use
nativeBuildInputs to avoid an issue.
2018-06-18 18:42:21 -04:00
Matthew Bauer
95f9171531 Revert "inkscape: fix on Darwin"
This reverts commit a276d5160c.
2018-05-31 12:34:15 -04:00
Matthew Bauer
012a3a3f9b Revert "inkscape: typo"
This reverts commit 0a8c91a931.
2018-05-31 12:34:15 -04:00
Matthew Bauer
9e04546809 Revert "inkscape: Fix build on NixOS"
This reverts commit 6c748ae749.
2018-05-31 12:34:15 -04:00
Matthew Bauer
4a58ed6059 Revert "inkscape: don't patch share/filters"
This reverts commit 38364c0b07.
2018-05-31 12:34:15 -04:00
Matthew Bauer
63c0885502 Revert "inkscape: fix on darwin again"
This reverts commit 047c9372ab.
2018-05-31 12:34:15 -04:00
Matthew Bauer
e8b7d73653 Revert "inkscape: disable parallelBuilding"
This reverts commit 05a6e94f34.
2018-05-31 12:34:15 -04:00
Michael Raskin
11bf5db639 inkscape: fix build 2018-05-29 15:44:06 +02:00
Tor Hedin Brønner
05a6e94f34 inkscape: disable parallelBuilding
Try to avoid non-deterministic build failure.
2018-05-18 12:32:11 +02:00
Matthew Justin Bauer
047c9372ab
inkscape: fix on darwin again
I have no idea why but this broke Darwin. So added a conditional for the shebang patching.

https://hydra.nixos.org/build/73283875
2018-04-26 20:47:16 -05:00
Matthew Justin Bauer
38364c0b07
inkscape: don't patch share/filters
This should not be needed because they are using `#!/usr/bin/env python` as the shebang and in fact it will break inkscape.x86_64-darwin.

https://hydra.nixos.org/build/73283875/
2018-04-26 10:36:57 -05:00
aszlig
6c748ae749
inkscape: Fix build on NixOS
The first problem that was introduced in a276d5160c
was a linking error:

ld: cannot find -licui18n
ld: cannot find -licuuc
ld: cannot find -licudata

So I added icu to the buildInputs.

The second problem was that the interpreter wasn't patched in
share/filters, apparently this is only needed when building with
autotools:

make[3]: Entering directory '/build/inkscape-0.92.3/share/filters'
./i18n.py ./filters.svg > ./filters.svg.h
./i18n.py: /usr/bin/env: bad interpreter: No such file or directory

A similar error also occurs for share/palettes, share/patterns,
share/symbols and share/templates, so I added patching the interpreter
there as well.

Switching to autotools in Inkscape is a very bad idea, because upstream
currently still has their own autotools files in the 0.92.x tree but
master already has them removed, see this commit:

e471a664f9

However for the sake of trying to not break Inkscape on Darwin again,
I tried to keep the fixes minimal and not went back to CMake.

I did however mark the stuff that's unneeded for CMake, so that we can
avoid forgetting to remove that crap once we get back to CMake.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @matthewbauer
2018-04-25 17:09:04 +02:00
Matthew Bauer
0a8c91a931 inkscape: typo 2018-04-25 00:17:21 -05:00
Matthew Bauer
a276d5160c inkscape: fix on Darwin
Fixes #39175
2018-04-24 22:54:33 -05:00
Ryan Mulligan
1317428ca0
inkscape: 0.92.2 -> 0.92.3
Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/5khy2kbfjwvkj42lr6z0cvnd17xkfrfg-inkscape-0.92.3/bin/inkscape -h` got 0 exit code
- ran `/nix/store/5khy2kbfjwvkj42lr6z0cvnd17xkfrfg-inkscape-0.92.3/bin/inkscape --help` got 0 exit code
- ran `/nix/store/5khy2kbfjwvkj42lr6z0cvnd17xkfrfg-inkscape-0.92.3/bin/inkscape -V` and found version 0.92.3
- ran `/nix/store/5khy2kbfjwvkj42lr6z0cvnd17xkfrfg-inkscape-0.92.3/bin/inkscape --version` and found version 0.92.3
- found 0.92.3 with grep in /nix/store/5khy2kbfjwvkj42lr6z0cvnd17xkfrfg-inkscape-0.92.3
2018-03-16 20:18:43 +01:00
John Ericson
ed14223f8c treewide: Manual fix more pkg-config build-inputs 2017-09-21 15:49:54 -04:00
WilliButz
95a4c03c7d inkscape: 0.92.1 -> 0.92.2 2017-08-29 16:45:20 +02:00
Robin Gloster
473b58f20e
inkscape: remove unused automake114x, intltool 2017-08-12 20:08:28 +02:00
Profpatsch
bd4c6b456e inkscape: patch python interpreter for extension code 2017-06-01 06:55:38 +02:00
Linus Heckemann
457bc9bdc4 inkscape: add potrace
This allows vectorising bitmap images in inkscape.
2017-04-17 22:10:05 +01:00
Matthew Bauer
ba78c50069
inkscape: fix missing library error 2017-04-08 23:20:10 -05:00
Bart Brouns
2ab778cc9c inkscape: 0.92.0 -> 0.92.1 (#23652) 2017-03-09 01:26:26 +01:00
taku0
67573c942e inkscape: 0.91 -> 0.92 2017-01-09 18:25:53 +09:00
Frederik Rietdijk
8ec17dab32 inkscape: use python2
because of syntax error. And don't depend on pyxml
because that shouldn't be necessary anymore
https://bugs.archlinux.org/task/26774
2016-10-18 23:16:09 +02:00
Frederik Rietdijk
7ff1544981 inkscape: use python.withPackages instead of wrappers 2016-09-25 22:31:25 +02:00
Kirill Boltaev
bccd75094f treewide: explicitly specify gtk and related package versions 2016-09-12 18:26:06 +03:00
Vincent Laporte
42701ee33e inkscape: fix on darwin 2016-08-25 15:39:53 +02:00
Damien Cassou
9afd1161e7 inkscape: fix due to glibmm update 2016-06-06 13:59:31 +02:00
Herwig Hochleitner
fbc147494c inkscape: add numpy to runtime path
This is nessecary for some plugins
2016-02-17 01:19:17 +01:00
Tobias Geerinckx-Rice
32d40f0f98 Remove no longer (or never) referenced patches
55 files changed, 6041 deletions. Tested with `nix-build -A tarball`.
2016-01-24 02:02:21 +01:00
Joachim Schiele
582ecf4771 inkscape with boxmaker plugin 2015-05-23 12:47:15 +02:00
Eric Seidel
662a6b1ca6 remove all references to stdenv.cc.cc.is{GNU,Clang}
use the new `stdenv.cc.is{GNU,Clang}` instead, which will always be
defined.
2015-05-11 14:44:50 -07:00
Spencer Whitt
22dfdbd2cf inkscape: patch to build with clang (Darwin) 2015-04-08 01:05:51 -04:00
aszlig
7cd6dd9ada
inkscape: Clean up and update to version 0.91.
This now also includes support vor visio and cdr and also adds the
missing dependency on libexif.

Forcing -lX11 in NIX_LDFLAGS is no longer needed in 0.91, so we drop
that as well as the patch and the --with-python configure flag, which is
now no longer even valid.

Tests now seem to run fine without -j1 as well.

I also tested it against the DXF test file mentioned in #3449, to be
sure we don't regress here.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-02-22 08:14:53 +01:00
Cillian de Róiste
d597651949 inkscape: add python to the PATH, fixes #3449 2014-08-09 17:02:36 +02:00
Vladimír Čunát
df99ec18dc inkscape: enableParallelBuilding, doCheck, add meta 2014-07-18 11:56:47 +02:00
Vladimír Čunát
7e9a0b8ec2 inkscape: maintenance update
Needed to fix build with poppler-0.26.
2014-07-18 11:56:44 +02:00
Mathijs Kwik
1772bcebc1 inkscape: fix typo in upstream sources.
fixes stdenv-updates
2013-10-11 01:09:47 +02:00
Mathijs Kwik
296e2857f7 inkscape: remove unused patch 2013-10-11 01:09:39 +02:00
Vladimír Čunát
e976bcffca inkscape: bugfix update 2013-02-14 14:34:20 +01:00
Eelco Dolstra
54aea93a84 inkscape: Update to 0.48.3.1
http://hydra.nixos.org/build/3151653
2012-10-09 12:10:45 -04:00
Yury G. Kudryashov
aaad871c35 inkscape: a couple of upstream patches to fix FTBFS with libpng-1.5
svn path=/nixpkgs/trunk/; revision=32391
2012-02-19 09:22:24 +00:00
Cillian de Roiste
d91165c368 Updating Inkscape to 0.48.2
svn path=/nixpkgs/trunk/; revision=29971
2011-10-22 00:01:26 +00:00
Eelco Dolstra
b8b0c4e8f7 * Inkscape updated to 0.48.1.
svn path=/nixpkgs/trunk/; revision=27555
2011-06-28 13:51:55 +00:00
Russell O'Connor
83e25f83c8 Patch Inkscape to support PDF importing.
svn path=/nixpkgs/trunk/; revision=25151
2010-12-15 15:56:04 +00:00
Lluís Batlle i Rossell
01b6395203 Making inkscape not install any icon cache
svn path=/nixpkgs/trunk/; revision=24650
2010-11-10 18:13:00 +00:00
Lluís Batlle i Rossell
8ed1a21f2c Updating inkscape
svn path=/nixpkgs/trunk/; revision=24646
2010-11-10 16:48:13 +00:00