From 35deaa45a182d18858ae56c300ab786bdb6cb621 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 10 Sep 2020 20:38:25 +0200 Subject: [PATCH] inkscape_0: drop Inkscape 1.0.1 re-added the old CLI flags: https://gitlab.com/inkscape/inkscape/-/commit/3ca6a4ed08405f2a530a9ed3065f77443f9f7ebe --- pkgs/applications/graphics/inkscape/0.x.nix | 133 ------------------ pkgs/data/fonts/emojione/default.nix | 4 +- .../data/fonts/twemoji-color-font/default.nix | 4 +- pkgs/data/icons/bibata-cursors/default.nix | 4 +- pkgs/data/icons/bibata-cursors/extra.nix | 4 +- .../data/icons/bibata-cursors/translucent.nix | 6 +- pkgs/data/icons/capitaine-cursors/default.nix | 4 +- .../data/icons/numix-cursor-theme/default.nix | 4 +- pkgs/data/themes/adapta/default.nix | 4 +- pkgs/data/themes/arc/default.nix | 4 +- pkgs/data/themes/mojave/default.nix | 6 +- pkgs/data/themes/numix-solarized/default.nix | 6 +- pkgs/data/themes/plata/default.nix | 4 +- pkgs/data/themes/pop-gtk/default.nix | 6 +- .../gnome-3/apps/gnome-documents/default.nix | 4 +- pkgs/desktops/mate/mate-utils/default.nix | 4 +- pkgs/games/arx-libertatis/default.nix | 4 +- pkgs/tools/graphics/fim/default.nix | 4 +- .../tools/typesetting/tex/dblatex/default.nix | 6 +- pkgs/top-level/all-packages.nix | 4 - 20 files changed, 41 insertions(+), 178 deletions(-) delete mode 100644 pkgs/applications/graphics/inkscape/0.x.nix diff --git a/pkgs/applications/graphics/inkscape/0.x.nix b/pkgs/applications/graphics/inkscape/0.x.nix deleted file mode 100644 index 880ecfb9f0b..00000000000 --- a/pkgs/applications/graphics/inkscape/0.x.nix +++ /dev/null @@ -1,133 +0,0 @@ -{ stdenv -, boehmgc -, boost -, cairo -, cmake -, fetchpatch -, fetchurl -, gettext -, glib -, glibmm -, gsl -, gtkmm2 -, gtkspell2 -, imagemagick -, lcms -, libcdr -, libexif -, libpng -, librevenge -, librsvg -, libsigcxx -, libvisio -, libwpg -, libXft -, libxml2 -, libxslt -, makeWrapper -, perlPackages -, pkg-config -, poppler -, popt -, potrace -, python3 -, wrapGAppsHook -, zlib -}: -let - python3Env = python3.withPackages - (ps: with ps; [ - numpy - lxml - scour - ]); -in -stdenv.mkDerivation rec { - pname = "inkscape_0"; - version = "0.92.5"; - - src = fetchurl { - url = "https://media.inkscape.org/dl/resources/file/inkscape-${version}.tar.bz2"; - sha256 = "ge5/aeK9ZKlzQ9g5Wkp6eQWyG4YVZu1eXZF5F41Rmgs="; - }; - - # Inkscape hits the ARGMAX when linking on macOS. It appears to be - # CMake’s ARGMAX check doesn’t offer enough padding for NIX_LDFLAGS. - # Setting strictDeps it avoids duplicating some dependencies so it - # will leave us under ARGMAX. - strictDeps = true; - - postPatch = '' - patchShebangs share/extensions - patchShebangs fix-roff-punct - - # Python is used at run-time to execute scripts, e.g., those from - # the "Effects" menu. - substituteInPlace src/extension/implementation/script.cpp \ - --replace '"python-interpreter", "python"' '"python-interpreter", "${python3Env}/bin/python"' - ''; - - nativeBuildInputs = [ - pkg-config - cmake - makeWrapper - python3Env - wrapGAppsHook - ] ++ (with perlPackages; [ - perl - XMLParser - ]); - - buildInputs = [ - boehmgc - boost - gettext - glib - glibmm - gsl - gtkmm2 - imagemagick - lcms - libcdr - libexif - libpng - librevenge - librsvg # for loading icons - libsigcxx - libvisio - libwpg - libXft - libxml2 - libxslt - perlPackages.perl - poppler - popt - potrace - python3Env - zlib - ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ - gtkspell2 - ] ++ stdenv.lib.optionals stdenv.isDarwin [ - cairo - ]; - - # Make sure PyXML modules can be found at run-time. - postInstall = stdenv.lib.optionalString stdenv.isDarwin '' - install_name_tool -change $out/lib/libinkscape_base.dylib $out/lib/inkscape/libinkscape_base.dylib $out/bin/inkscape - install_name_tool -change $out/lib/libinkscape_base.dylib $out/lib/inkscape/libinkscape_base.dylib $out/bin/inkview - ''; - - meta = with stdenv.lib; { - description = "Legacy version of vector graphics editor"; - homepage = "https://www.inkscape.org"; - license = licenses.gpl3Plus; - maintainers = [ maintainers.jtojnar ]; - platforms = platforms.all; - longDescription = '' - Inkscape is a feature-rich vector graphics editor that edits - files in the W3C SVG (Scalable Vector Graphics) file format. - - If you want to import .eps files install ps2edit. - ''; - }; -} diff --git a/pkgs/data/fonts/emojione/default.nix b/pkgs/data/fonts/emojione/default.nix index 71bd2216da2..6f5168e90d5 100644 --- a/pkgs/data/fonts/emojione/default.nix +++ b/pkgs/data/fonts/emojione/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, inkscape_0, imagemagick, potrace, svgo, scfbuild }: +{ stdenv, fetchFromGitHub, inkscape, imagemagick, potrace, svgo, scfbuild }: stdenv.mkDerivation rec { pname = "emojione"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { export HOME="$NIX_BUILD_ROOT" ''; - nativeBuildInputs = [ inkscape_0 imagemagick potrace svgo scfbuild ]; + nativeBuildInputs = [ inkscape imagemagick potrace svgo scfbuild ]; enableParallelBuilding = true; diff --git a/pkgs/data/fonts/twemoji-color-font/default.nix b/pkgs/data/fonts/twemoji-color-font/default.nix index ed04aa78ae1..a9bf3720c07 100644 --- a/pkgs/data/fonts/twemoji-color-font/default.nix +++ b/pkgs/data/fonts/twemoji-color-font/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, inkscape_0, imagemagick, potrace, svgo, scfbuild }: +{ stdenv, fetchFromGitHub, inkscape, imagemagick, potrace, svgo, scfbuild }: stdenv.mkDerivation rec { pname = "twemoji-color-font"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "00pbgqpkq21wl8fs0q1xp49xb10m48b9sz8cdc58flkd2vqfssw2"; }; - nativeBuildInputs = [ inkscape_0 imagemagick potrace svgo scfbuild ]; + nativeBuildInputs = [ inkscape imagemagick potrace svgo scfbuild ]; # silence inkscape errors about non-writable home preBuild = "export HOME=\"$NIX_BUILD_ROOT\""; makeFlags = [ "SCFBUILD=${scfbuild}/bin/scfbuild" ]; diff --git a/pkgs/data/icons/bibata-cursors/default.nix b/pkgs/data/icons/bibata-cursors/default.nix index 670746d5d1a..66ed71f1f9e 100644 --- a/pkgs/data/icons/bibata-cursors/default.nix +++ b/pkgs/data/icons/bibata-cursors/default.nix @@ -1,4 +1,4 @@ -{ stdenvNoCC, fetchFromGitHub, gnome-themes-extra, inkscape_0, xcursorgen, python3 }: +{ stdenvNoCC, fetchFromGitHub, gnome-themes-extra, inkscape, xcursorgen, python3 }: let py = python3.withPackages(ps: [ ps.pillow ]); @@ -25,7 +25,7 @@ in stdenvNoCC.mkDerivation rec { nativeBuildInputs = [ gnome-themes-extra - inkscape_0 + inkscape xcursorgen py ]; diff --git a/pkgs/data/icons/bibata-cursors/extra.nix b/pkgs/data/icons/bibata-cursors/extra.nix index c353a049f07..7977566cb61 100644 --- a/pkgs/data/icons/bibata-cursors/extra.nix +++ b/pkgs/data/icons/bibata-cursors/extra.nix @@ -1,4 +1,4 @@ -{ stdenvNoCC, fetchFromGitHub, gnome-themes-extra, inkscape_0, xcursorgen, python3 }: +{ stdenvNoCC, fetchFromGitHub, gnome-themes-extra, inkscape, xcursorgen, python3 }: let py = python3.withPackages(ps: [ ps.pillow ]); @@ -25,7 +25,7 @@ in stdenvNoCC.mkDerivation rec { nativeBuildInputs = [ gnome-themes-extra - inkscape_0 + inkscape xcursorgen py ]; diff --git a/pkgs/data/icons/bibata-cursors/translucent.nix b/pkgs/data/icons/bibata-cursors/translucent.nix index 4b215d071ab..afdd92600fa 100644 --- a/pkgs/data/icons/bibata-cursors/translucent.nix +++ b/pkgs/data/icons/bibata-cursors/translucent.nix @@ -1,9 +1,9 @@ -{ stdenvNoCC, fetchFromGitHub, gnome-themes-extra, inkscape_0, xcursorgen }: +{ stdenvNoCC, fetchFromGitHub, gnome-themes-extra, inkscape, xcursorgen }: stdenvNoCC.mkDerivation rec { pname = "bibata-cursors-translucent"; version = "unstable-2019-09-13"; - + src = fetchFromGitHub { owner = "Silicasandwhich"; repo = "Bibata_Cursor_Translucent"; @@ -18,7 +18,7 @@ stdenvNoCC.mkDerivation rec { nativeBuildInputs = [ gnome-themes-extra - inkscape_0 + inkscape xcursorgen ]; diff --git a/pkgs/data/icons/capitaine-cursors/default.nix b/pkgs/data/icons/capitaine-cursors/default.nix index 73ae4fe915f..09491b904ef 100644 --- a/pkgs/data/icons/capitaine-cursors/default.nix +++ b/pkgs/data/icons/capitaine-cursors/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub -, inkscape_0, xcursorgen, bc }: +, inkscape, xcursorgen, bc }: stdenv.mkDerivation rec { pname = "capitaine-cursors"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ''; buildInputs =[ - inkscape_0 + inkscape xcursorgen bc ]; diff --git a/pkgs/data/icons/numix-cursor-theme/default.nix b/pkgs/data/icons/numix-cursor-theme/default.nix index 6445628e9bb..d0411a8c569 100644 --- a/pkgs/data/icons/numix-cursor-theme/default.nix +++ b/pkgs/data/icons/numix-cursor-theme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, inkscape_0, xcursorgen }: +{ stdenv, fetchFromGitHub, inkscape, xcursorgen }: stdenv.mkDerivation rec { version = "1.1"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0p8h48wsy3z5dz9vdnp01fpn6q8ky0h74l5qgixlip557bsa1spi"; }; - nativeBuildInputs = [ inkscape_0 xcursorgen ]; + nativeBuildInputs = [ inkscape xcursorgen ]; buildPhase = '' patchShebangs . diff --git a/pkgs/data/themes/adapta/default.nix b/pkgs/data/themes/adapta/default.nix index a9a80143fc9..ca8e908009f 100644 --- a/pkgs/data/themes/adapta/default.nix +++ b/pkgs/data/themes/adapta/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, parallel, sassc, inkscape_0, libxml2, glib, gdk-pixbuf, librsvg, gtk-engine-murrine, gnome3 }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, parallel, sassc, inkscape, libxml2, glib, gdk-pixbuf, librsvg, gtk-engine-murrine, gnome3 }: stdenv.mkDerivation rec { pname = "adapta-gtk-theme"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { pkgconfig parallel sassc - inkscape_0 + inkscape libxml2 glib.dev gnome3.gnome-shell diff --git a/pkgs/data/themes/arc/default.nix b/pkgs/data/themes/arc/default.nix index 46664eaaf58..66be070bdf4 100644 --- a/pkgs/data/themes/arc/default.nix +++ b/pkgs/data/themes/arc/default.nix @@ -7,7 +7,7 @@ , gnome3 , gtk-engine-murrine , optipng -, inkscape_0 +, inkscape , cinnamon }: @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { pkgconfig sassc optipng - inkscape_0 + inkscape gtk3 ]; diff --git a/pkgs/data/themes/mojave/default.nix b/pkgs/data/themes/mojave/default.nix index a98218b6392..751dd690d11 100644 --- a/pkgs/data/themes/mojave/default.nix +++ b/pkgs/data/themes/mojave/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchurl, glib, gtk-engine-murrine, gtk_engines, inkscape_0, optipng, sassc, which }: +{ stdenv, fetchFromGitHub, fetchurl, glib, gtk-engine-murrine, gtk_engines, inkscape, optipng, sassc, which }: stdenv.mkDerivation rec { pname = "mojave-gtk-theme"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { sourceRoot = "source"; - nativeBuildInputs = [ glib inkscape_0 optipng sassc which ]; + nativeBuildInputs = [ glib inkscape optipng sassc which ]; buildInputs = [ gtk_engines ]; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { src/assets/xfwm4/render-assets.sh do substituteInPlace $f \ - --replace /usr/bin/inkscape ${inkscape_0}/bin/inkscape \ + --replace /usr/bin/inkscape ${inkscape}/bin/inkscape \ --replace /usr/bin/optipng ${optipng}/bin/optipng done diff --git a/pkgs/data/themes/numix-solarized/default.nix b/pkgs/data/themes/numix-solarized/default.nix index a3da60e243e..ae8a1d7145e 100644 --- a/pkgs/data/themes/numix-solarized/default.nix +++ b/pkgs/data/themes/numix-solarized/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, python3, sass, glib, gdk-pixbuf, libxml2, - inkscape_0, optipng, gtk-engine-murrine + inkscape, optipng, gtk-engine-murrine }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "1kda0lyqi3cxh163fbj8yyi6jj6pf0y980k4s0cmyi3hkh4cqyd5"; }; - nativeBuildInputs = [ python3 sass glib gdk-pixbuf libxml2 inkscape_0 optipng ]; + nativeBuildInputs = [ python3 sass glib gdk-pixbuf libxml2 inkscape optipng ]; propagatedUserEnvPkgs = [ gtk-engine-murrine ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { patchShebangs . substituteInPlace Makefile --replace '$(DESTDIR)'/usr $out substituteInPlace scripts/render-assets.sh \ - --replace /usr/bin/inkscape ${inkscape_0}/bin/inkscape \ + --replace /usr/bin/inkscape ${inkscape}/bin/inkscape \ --replace /usr/bin/optipng ${optipng}/bin/optipng ''; diff --git a/pkgs/data/themes/plata/default.nix b/pkgs/data/themes/plata/default.nix index 2e23e9a5bbe..6437bb1543d 100644 --- a/pkgs/data/themes/plata/default.nix +++ b/pkgs/data/themes/plata/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitLab, autoreconfHook, pkgconfig, parallel -, sassc, inkscape_0, libxml2, glib, gdk-pixbuf, librsvg, gtk-engine-murrine +, sassc, inkscape, libxml2, glib, gdk-pixbuf, librsvg, gtk-engine-murrine , cinnamonSupport ? true , gnomeFlashbackSupport ? true , gnomeShellSupport ? true @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { pkgconfig parallel sassc - inkscape_0 + inkscape libxml2 glib.dev ] diff --git a/pkgs/data/themes/pop-gtk/default.nix b/pkgs/data/themes/pop-gtk/default.nix index feb2ddebb39..317d0ba8601 100644 --- a/pkgs/data/themes/pop-gtk/default.nix +++ b/pkgs/data/themes/pop-gtk/default.nix @@ -4,7 +4,7 @@ , ninja , sassc , gtk3 -, inkscape_0 +, inkscape , optipng , gtk-engine-murrine , gdk-pixbuf @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ninja sassc gtk3 - inkscape_0 + inkscape optipng python3 ]; @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { for file in $(find -name render-\*.sh); do substituteInPlace "$file" \ --replace 'INKSCAPE="/usr/bin/inkscape"' \ - 'INKSCAPE="${inkscape_0}/bin/inkscape"' \ + 'INKSCAPE="${inkscape}/bin/inkscape"' \ --replace 'OPTIPNG="/usr/bin/optipng"' \ 'OPTIPNG="${optipng}/bin/optipng"' done diff --git a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix index 8d1208d4c68..8d5501537a0 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix @@ -23,7 +23,7 @@ , docbook_xsl , docbook_xml_dtd_42 , gobject-introspection -, inkscape_0 +, inkscape , poppler_utils , desktop-file-utils , wrapGAppsHook @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { python3 # building getting started - inkscape_0 + inkscape poppler_utils ]; diff --git a/pkgs/desktops/mate/mate-utils/default.nix b/pkgs/desktops/mate/mate-utils/default.nix index 35ff2635bbd..e36ff69a6fa 100644 --- a/pkgs/desktops/mate/mate-utils/default.nix +++ b/pkgs/desktops/mate/mate-utils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gettext, itstool, glib, gtk3, libxml2, libgtop, libcanberra-gtk3, inkscape_0, udisks2, mate, hicolor-icon-theme, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, gettext, itstool, glib, gtk3, libxml2, libgtop, libcanberra-gtk3, inkscape, udisks2, mate, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "mate-utils"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { pkgconfig gettext itstool - inkscape_0 + inkscape wrapGAppsHook ]; diff --git a/pkgs/games/arx-libertatis/default.nix b/pkgs/games/arx-libertatis/default.nix index 2e60f81f4d3..8b2cf83e509 100644 --- a/pkgs/games/arx-libertatis/default.nix +++ b/pkgs/games/arx-libertatis/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, cmake, zlib, boost , openal, glm, freetype, libGLU, SDL2, epoxy -, dejavu_fonts, inkscape_0, optipng, imagemagick +, dejavu_fonts, inkscape, optipng, imagemagick , withCrashReporter ? !stdenv.isDarwin , qtbase ? null , wrapQtAppsHook ? null @@ -22,7 +22,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ - cmake inkscape_0 imagemagick optipng + cmake inkscape imagemagick optipng ] ++ optionals withCrashReporter [ wrapQtAppsHook ]; buildInputs = [ diff --git a/pkgs/tools/graphics/fim/default.nix b/pkgs/tools/graphics/fim/default.nix index dd2dcc1f5bf..6a3d9a29db3 100644 --- a/pkgs/tools/graphics/fim/default.nix +++ b/pkgs/tools/graphics/fim/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, autoconf, automake, pkgconfig , perl, flex, bison, readline, libexif , x11Support ? true, SDL -, svgSupport ? true, inkscape_0 +, svgSupport ? true, inkscape , asciiArtSupport ? true, aalib , gifSupport ? true, giflib , tiffSupport ? true, libtiff @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { buildInputs = with stdenv.lib; [ perl flex bison readline libexif ] ++ optional x11Support SDL - ++ optional svgSupport inkscape_0 + ++ optional svgSupport inkscape ++ optional asciiArtSupport aalib ++ optional gifSupport giflib ++ optional tiffSupport libtiff diff --git a/pkgs/tools/typesetting/tex/dblatex/default.nix b/pkgs/tools/typesetting/tex/dblatex/default.nix index 5fde58251e0..1f6939e1b11 100644 --- a/pkgs/tools/typesetting/tex/dblatex/default.nix +++ b/pkgs/tools/typesetting/tex/dblatex/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, python2, libxslt, texlive -, enableAllFeatures ? false, imagemagick ? null, transfig ? null, inkscape_0 ? null, fontconfig ? null, ghostscript ? null +, enableAllFeatures ? false, imagemagick ? null, transfig ? null, inkscape ? null, fontconfig ? null, ghostscript ? null , tex ? texlive.combine { # satisfy all packages that ./configure mentions inherit (texlive) scheme-basic epstopdf anysize appendix changebar @@ -16,7 +16,7 @@ assert enableAllFeatures -> imagemagick != null && transfig != null && - inkscape_0 != null && + inkscape != null && fontconfig != null && ghostscript != null; @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { -e 's|Popen("pdflatex|Popen("${tex}/bin/pdflatex|g' \ -e 's|"fc-match"|"${fontconfig.bin}/bin/fc-match"|g' \ -e 's|"fc-list"|"${fontconfig.bin}/bin/fc-list"|g' \ - -e 's|cmd = "inkscape|cmd = "${inkscape_0}/bin/inkscape|g' \ + -e 's|cmd = "inkscape|cmd = "${inkscape}/bin/inkscape|g' \ -e 's|cmd = "fig2dev|cmd = "${transfig}/bin/fig2dev|g' \ -e 's|cmd = \["ps2pdf|cmd = ["${ghostscript}/bin/ps2pdf|g' \ -e 's|cmd = "convert|cmd = "${imagemagick.out}/bin/convert|g' \ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f10a4490282..816e1f7903b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21206,10 +21206,6 @@ in inkscape-extensions = recurseIntoAttrs (callPackages ../applications/graphics/inkscape/extensions.nix {}); - inkscape_0 = callPackage ../applications/graphics/inkscape/0.x.nix { - lcms = lcms2; - }; - inspectrum = libsForQt514.callPackage ../applications/radio/inspectrum { }; ion3 = callPackage ../applications/window-managers/ion-3 {