From f00335fea736f9157c690c5e13fc3ac10fe7c9f3 Mon Sep 17 00:00:00 2001
From: CrazedProgrammer <crazedprogrammer@gmail.com>
Date: Sat, 2 Feb 2019 11:50:14 +0100
Subject: astah-community: remove

Astah Community has been discontinued since september 26th, 2018.
Source: http://astah.net/editions/community

The downloads are not available anymore since recently, and as such,
this derivation does not build.
---
 .../graphics/astah-community/default.nix           | 63 ----------------------
 1 file changed, 63 deletions(-)
 delete mode 100644 pkgs/applications/graphics/astah-community/default.nix

(limited to 'pkgs/applications/graphics')

diff --git a/pkgs/applications/graphics/astah-community/default.nix b/pkgs/applications/graphics/astah-community/default.nix
deleted file mode 100644
index 72d367d8fea2..000000000000
--- a/pkgs/applications/graphics/astah-community/default.nix
+++ /dev/null
@@ -1,63 +0,0 @@
-{ stdenv, fetchurl, makeWrapper, makeDesktopItem, unzip, jre }:
-
-let
-
-  name = "astah-community";
-  version = "7.2.0";
-  postfix = "1ff236";
-  desktopIcon = fetchurl {
-    name = "${name}.png";
-    url = "https://aur.archlinux.org/cgit/aur.git/plain/astah_community.png?h=astah-community&id=94710b5a6aadcaf489022b0f0e61f8832ae6fa87";
-    sha256 = "0knlknwfqqnhg63sxxpia5ykn397id31gzr956wnn6yjj58k3ckm";
-  };
-  mimeXml = fetchurl {
-    name = "${name}.xml";
-    url = "https://aur.archlinux.org/cgit/aur.git/plain/astah_community.xml?h=astah-community&id=94710b5a6aadcaf489022b0f0e61f8832ae6fa87";
-    sha256 = "096n2r14ddm97r32i4sbp7v4qdmwn9sxy7lwphcx1nydppb0m97b";
-  };
-  desktopItem = makeDesktopItem {
-    name = name;
-    exec = "astah %U";
-    icon = "${desktopIcon}";
-    comment = "Lightweight, easy-to-use, and free UML2.x modeler";
-    desktopName = "Astah* Community";
-    genericName = "Astah* Community";
-    mimeType = "application/x-astah";
-    categories = "Application;Development;";
-    extraEntries = "NoDisplay=false";
-  };
-
-in
-
-stdenv.mkDerivation {
-  name = "${name}-${version}";
-
-  src = fetchurl {
-    url = "http://cdn.change-vision.com/files/${name}-${stdenv.lib.replaceStrings ["."] ["_"] version}-${postfix}.zip";
-    sha256 = "1lkl30jdjiarvh2ap9rjabvrq9qhrlmfrasv3vvkag22y9w4l499";
-  };
-
-  nativeBuildInputs = [ unzip makeWrapper ];
-
-  installPhase = ''
-    runHook preInstall
-
-    mkdir -p $out/{bin,share}
-    cp -r . $out/share/astah
-    cp -r ${desktopItem}/share/applications $out/share/applications
-
-    install -D ${desktopIcon} $out/share/pixmaps/${name}.png
-    install -D ${mimeXml} $out/share/mime/packages/${name}.xml
-
-    makeWrapper ${jre}/bin/java $out/bin/astah \
-      --add-flags "-jar $out/share/astah/astah-community.jar"
-
-    runHook postInstall
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Lightweight, easy-to-use, and free UML2.x modeler";
-    homepage = http://astah.net/editions/community;
-    license = licenses.unfree;
-  };
-}
-- 
cgit 1.4.1


From 87d8ba0ae62a4c121df4b1abd8590856b23c76fd Mon Sep 17 00:00:00 2001
From: pacien <pacien.trangirard@pacien.net>
Date: Fri, 25 Jan 2019 22:43:58 +0100
Subject: imagemagick: add djvu support

---
 pkgs/applications/graphics/ImageMagick/7.0.nix     | 4 ++--
 pkgs/applications/graphics/ImageMagick/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix                    | 2 ++
 3 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'pkgs/applications/graphics')

diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix
index 669c7c8f9612..efbf5864faa8 100644
--- a/pkgs/applications/graphics/ImageMagick/7.0.nix
+++ b/pkgs/applications/graphics/ImageMagick/7.0.nix
@@ -1,5 +1,5 @@
 { lib, stdenv, fetchFromGitHub, pkgconfig, libtool
-, bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg
+, bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg, djvulibre
 , lcms2, openexr, libpng, librsvg, libtiff, libxml2, openjpeg, libwebp, libheif
 , ApplicationServices
 }:
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
 
   buildInputs =
     [ zlib fontconfig freetype ghostscript
-      libpng libtiff libxml2 libheif
+      libpng libtiff libxml2 libheif djvulibre
     ]
     ++ lib.optionals (!stdenv.hostPlatform.isMinGW)
       [ openexr librsvg openjpeg ]
diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix
index 79149dc83cf8..b3a1b64cae96 100644
--- a/pkgs/applications/graphics/ImageMagick/default.nix
+++ b/pkgs/applications/graphics/ImageMagick/default.nix
@@ -1,5 +1,5 @@
 { lib, stdenv, fetchFromGitHub, fetchpatch, pkgconfig, libtool
-, bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg
+, bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg, djvulibre
 , lcms2, openexr, libpng, librsvg, libtiff, libxml2, openjpeg, libwebp, fftw, libheif, libde265
 , ApplicationServices
 }:
@@ -65,7 +65,7 @@ stdenv.mkDerivation rec {
 
   buildInputs =
     [ zlib fontconfig freetype ghostscript
-      libpng libtiff libxml2 libheif libde265
+      libpng libtiff libxml2 libheif libde265 djvulibre
     ]
     ++ lib.optionals (!stdenv.hostPlatform.isMinGW)
       [ openexr librsvg openjpeg ]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7b61ad101db0..ea6131d99d73 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17703,6 +17703,7 @@ in
     freetype = null;
     ghostscript = null;
     libjpeg = null;
+    djvulibre = null;
     lcms2 = null;
     openexr = null;
     libpng = null;
@@ -17732,6 +17733,7 @@ in
     freetype = null;
     ghostscript = null;
     libjpeg = null;
+    djvulibre = null;
     lcms2 = null;
     openexr = null;
     libpng = null;
-- 
cgit 1.4.1