1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-21 13:44:50 +00:00
Commit graph

97 commits

Author SHA1 Message Date
Profpatsch 4a7f99d55d treewide: with stdenv.lib; in meta -> with lib;
Part of: https://github.com/NixOS/nixpkgs/issues/108938

meta = with stdenv.lib;

is a widely used pattern. We want to slowly remove
the `stdenv.lib` indirection and encourage people
to use `lib` directly. Thus let’s start with the meta
field.

This used a rewriting script to mostly automatically
replace all occurances of this pattern, and add the
`lib` argument to the package header if it doesn’t
exist yet.

The script in its current form is available at
https://cs.tvl.fyi/depot@2f807d7f141068d2d60676a89213eaa5353ca6e0/-/blob/users/Profpatsch/nixpkgs-rewriter/default.nix
2021-01-11 10:38:22 +01:00
Arnout Engelen 297d1d6b83
inkscape: add inkcut extension 2020-11-24 19:35:15 +01:00
Jan Tojnar 35deaa45a1
inkscape_0: drop
Inkscape 1.0.1 re-added the old CLI flags:
3ca6a4ed08
2020-09-10 20:46:55 +02:00
Jan Tojnar a45e68be36
inkscape: 1.0 → 1.0.1
https://inkscape.org/news/2020/09/06/inkscape-version-101-patches-crashes-bugs/
https://inkscape.org/release/inkscape-1.0.1/
2020-09-10 20:35:33 +02:00
Arnout Engelen 2e0a15fce1
inkscape-extensions.hexmap: init at 2020-06-06 2020-09-10 20:21:52 +02:00
Arnout Engelen 67b4880faa
inkscape: introduce a way to add external extensions
Co-Authored-By: Stefan Siegl <stesie@brokenpipe.de>
2020-09-10 09:17:49 +02:00
Pavol Rusnak 5107b24c83
inkscape: 0.92.5 -> 1.0 2020-07-19 13:10:16 +02:00
Pavol Rusnak 7eb4a0ae27
inkscape -> inkscape_0
We can't update inkscape to 1.0 without keeping 0.x in tree,
because the CLI interface has been changed and lots of packages
use this interface for SVG conversion.
2020-07-19 13:10:16 +02:00
Daiderd Jordan 7b3a2963d1
treewide: replace base64 encoded hashes 2020-06-03 18:35:19 +02:00
Jan Tojnar a725962ae9
inkscape: drop redundant enableParallelBuilding
With CMake it is on by default.
2020-04-14 11:32:41 +02:00
Jan Tojnar a926e7358f
inkscape: add jtojnar as maintainer 2020-04-14 02:05:49 +02:00
Jan Tojnar a48d86e851
inkscape: 0.92.4 → 0.92.5
https://gitlab.com/inkscape/inkscape/-/tags/INKSCAPE_0_92_5
2020-04-14 02:05:49 +02:00
Jan Tojnar eff936e8b9
inkscape: format with nixpkgs-fmt
Also order the build inputs alphabetically and switch to pname+version.
2020-04-14 02:05:33 +02:00
Jan Tojnar 38e316d398
inkscape: clean up
The unpackPhase override was only needed when the download server mangled the file extension:

https://github.com/NixOS/nixpkgs/pull/23652
2020-04-14 02:05:12 +02:00
Michael Reilly 84cf00f980
treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
Jan Tojnar 65952e7d27
inkscape: fix build with Poppler 0.83.0 2019-12-03 14:50:49 +01:00
Dmitry Kalinkin 81f6fbdb0a
inkscape: add compatibility with poppler 0.76.0+ 2019-11-06 15:43:54 -05:00
Daiderd Jordan 9b773fd98a
inkscape: fix darwin build
Cairo is also a dependency now.

    /tmp/nix-build-inkscape-0.92.4.drv-0/inkscape-0.92.4/src/display/drawing-context.h:20:10: fatal error: 'cairo.h' file not found
    #include <cairo.h>
             ^~~~~~~~~
    1 error generated.
2019-11-04 16:03:18 +01:00
Yury G. Kudryashov ba0a68c45b inkscape: use latest poppler, use gtkspell2, drop -fpermissive
It seems that `inkscape-0.9.4` builds with the latest poppler and
without the `-fpermissive` workaround.
2019-11-02 17:47:15 -04:00
worldofpeace b0c2aea20b
treewide: drop adding hicolor-icon-theme where possible
This was either for the setup-hook to remove caches or added
even though the respective icon theme propagated it.
2019-09-18 22:47:26 +02:00
Riley Inman cd04b610ba inkscape: add wrapGAppsHook for icons (fixed for strictDeps)
Resolves #68185.
The icons in Inkscape depend on gdk-pixbuf loaders, but because
strictDeps is set to true to fix some macOS issues it doesn't work
(see #56943). Adding librsvg to buildInputs explicitly fixes the issue.
2019-09-08 14:51:12 -04:00
Will Dietz c01c16f09a inkscape: 0.92.3 -> 0.92.4
https://inkscape.org/news/2019/01/17/inkscape-launches-version-0924/
2019-01-31 18:18:56 -06:00
Frederik Rietdijk e343a85cfb Merge master into staging-next 2018-11-19 09:55:32 +01:00
Matthew Bauer e2817a270b inkscape: make python & perl runtime deps
These two interpreters are needed for some runtime scripts.

Fixes #50570
2018-11-18 18:47:02 -06:00
Ben Backhouse fca9a06c2e inkscape: add scour as dependency 2018-11-18 13:40:54 +01:00
volth c0fed1ba77 perlXMLParser -> perlPackages.XMLParser 2018-10-12 22:56:15 +00:00
Frederik Rietdijk 3209775495 Merge master into staging 2018-07-22 11:14:41 +02:00
volth 983abe10e2 "rm $out/share/icons/hicolor/icon-theme.cache" -> hicolor-icon-theme setup-hook 2018-07-21 21:47:26 +00: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