Merge pull request #97690 from jtojnar/inkscape-1.0.1

2020-09-12 16:30:53 +02:00 · 2020-09-12 16:30:53 +02:00 · 607509ac8f
parent b036f006c0 35deaa45a1
commit 607509ac8f
21 changed files with 43 additions and 180 deletions
--- a/pkgs/applications/graphics/inkscape/0.x.nix
+++ b/pkgs/applications/graphics/inkscape/0.x.nix
@ -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.
-    '';
-  };
-}
--- a/pkgs/applications/graphics/inkscape/default.nix
+++ b/pkgs/applications/graphics/inkscape/default.nix
@ -50,11 +50,11 @@ let
 in
 stdenv.mkDerivation rec {
  pname = "inkscape";
-  version = "1.0";
+  version = "1.0.1";

  src = fetchurl {
    url = "https://media.inkscape.org/dl/resources/file/${pname}-${version}.tar.xz";
-    sha256 = "1fwl7yjkykqb86555k4fm24inhc40mrvxqwgl2v2vi9alv8j7hc9";
+    sha256 = "1hjp5nnyx2m3miji6q4lcb6zgbi498v641dc7apkqqvayknrb4ng";
  };

  # Inkscape hits the ARGMAX when linking on macOS. It appears to be
--- 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;

--- 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" ];
--- 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
  ];
--- 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
  ];
--- 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
  ];

--- 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
  ];
--- 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 .
--- 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
--- 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
  ];

--- 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

--- 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
  '';

--- 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
  ]
--- 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
--- 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
  ];

--- 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
  ];

--- 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 = [
--- 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
--- 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' \
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@ -21225,10 +21225,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 {