diff options
Diffstat (limited to 'nixpkgs/pkgs/applications/graphics')
7 files changed, 28 insertions, 46 deletions
diff --git a/nixpkgs/pkgs/applications/graphics/PythonMagick/default.nix b/nixpkgs/pkgs/applications/graphics/PythonMagick/default.nix deleted file mode 100644 index 487648d07ca..00000000000 --- a/nixpkgs/pkgs/applications/graphics/PythonMagick/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -# This expression provides Python bindings to ImageMagick. Python libraries are supposed to be called via `python-packages.nix`. - -{ stdenv, fetchurl, python, pkgconfig, imagemagick, autoreconfHook }: - -stdenv.mkDerivation rec { - pname = "pythonmagick"; - version = "0.9.16"; - - src = fetchurl { - url = "mirror://imagemagick/python/releases/PythonMagick-${version}.tar.xz"; - sha256 = "137278mfb5079lns2mmw73x8dhpzgwha53dyl00mmhj2z25varpn"; - }; - - postPatch = '' - rm configure - ''; - - configureFlags = [ "--with-boost=${python.pkgs.boost}" ]; - - nativeBuildInputs = [ pkgconfig autoreconfHook ]; - buildInputs = [ python python.pkgs.boost imagemagick ]; - - meta = with stdenv.lib; { - homepage = "http://www.imagemagick.org/script/api.php"; - license = licenses.imagemagick; - description = "PythonMagick provides object oriented bindings for the ImageMagick Library."; - }; -} diff --git a/nixpkgs/pkgs/applications/graphics/displaycal/default.nix b/nixpkgs/pkgs/applications/graphics/displaycal/default.nix index 7a99361a03d..5b324a5974d 100644 --- a/nixpkgs/pkgs/applications/graphics/displaycal/default.nix +++ b/nixpkgs/pkgs/applications/graphics/displaycal/default.nix @@ -12,16 +12,16 @@ }: let - inherit (python2.pkgs) buildPythonApplication wxPython numpy; -in buildPythonApplication { + inherit (python2.pkgs) buildPythonApplication wxPython numpy dbus-python; +in buildPythonApplication rec { pname = "displaycal"; - version = "3.5.0.0"; + version = "3.8.9.3"; enableParallelBuilding = true; src = fetchurl { - url = "mirror://sourceforge/project/dispcalgui/release/3.5.0.0/DisplayCAL-3.5.0.0.tar.gz"; - sha256 = "1j496sv8pbhby5hkkbp07k6bs3f7mb1l3dijmn2iga3kmix0fn5q"; + url = "mirror://sourceforge/project/dispcalgui/release/${version}/DisplayCAL-${version}.tar.gz"; + sha256 = "1sivi4q7sqsrc95qg5gh37bsm2761md4mpl89hflzwk6kyyxyd3w"; }; propagatedBuildInputs = [ @@ -34,6 +34,7 @@ in buildPythonApplication { argyllcms wxPython numpy + dbus-python ]; nativeBuildInputs = [ @@ -42,7 +43,8 @@ in buildPythonApplication { preConfigure = '' mkdir dist - cp {misc,dist}/DisplayCAL.appdata.xml + cp {misc,dist}/net.displaycal.DisplayCAL.appdata.xml + touch dist/copyright mkdir -p $out ln -s $out/share/DisplayCAL $out/Resources ''; diff --git a/nixpkgs/pkgs/applications/graphics/freecad/default.nix b/nixpkgs/pkgs/applications/graphics/freecad/default.nix index eb087c42ce0..657caeca8b3 100644 --- a/nixpkgs/pkgs/applications/graphics/freecad/default.nix +++ b/nixpkgs/pkgs/applications/graphics/freecad/default.nix @@ -1,7 +1,7 @@ -{ stdenv, mkDerivation, fetchFromGitHub, fetchpatch, cmake, ninja, coin3d, xercesc, ode -, eigen, qtbase, qttools, qtwebkit, opencascade-occt, gts, hdf5, vtk, medfile -, zlib, python3Packages, swig, gfortran, libXmu, soqt, libf2c, libGLU -, makeWrapper, pkgconfig, mpi ? null }: +{ stdenv, mkDerivation, fetchFromGitHub, fetchpatch, cmake, ninja, coin3d, +xercesc, ode, eigen, qtbase, qttools, qtwebkit, wrapQtAppsHook, +opencascade-occt, gts, hdf5, vtk, medfile, zlib, python3Packages, swig, +gfortran, libXmu, soqt, libf2c, libGLU, makeWrapper, pkgconfig, mpi ? null }: assert mpi != null; @@ -18,8 +18,16 @@ in mkDerivation rec { sha256 = "1phs9a0px5fnzpyx930cz39p5dis0f0yajxzii3c3sazgkzrd55s"; }; - nativeBuildInputs = [ cmake ninja pkgconfig pythonPackages.pyside2-tools ]; - buildInputs = [ cmake coin3d xercesc ode eigen opencascade-occt gts + nativeBuildInputs = [ + cmake + ninja + pkgconfig + pythonPackages.pyside2-tools + wrapQtAppsHook + ]; + + buildInputs = [ + cmake coin3d xercesc ode eigen opencascade-occt gts zlib swig gfortran soqt libf2c makeWrapper mpi vtk hdf5 medfile libGLU libXmu qtbase qttools qtwebkit ] ++ (with pythonPackages; [ diff --git a/nixpkgs/pkgs/applications/graphics/gimp/default.nix b/nixpkgs/pkgs/applications/graphics/gimp/default.nix index b5df3d768d2..56135c4bd3d 100644 --- a/nixpkgs/pkgs/applications/graphics/gimp/default.nix +++ b/nixpkgs/pkgs/applications/graphics/gimp/default.nix @@ -56,7 +56,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "http://download.gimp.org/pub/gimp/v${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "Zb/hEejuv/093jAWzLUH+ZSNJmPZSXy0ONm7YJ4R1xY="; + sha256 = "05np26g61fyr72s7qjfrcck8v57r0yswq5ihvqyzvgzfx08y3gv5"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/graphics/inkscape/default.nix b/nixpkgs/pkgs/applications/graphics/inkscape/default.nix index 86fb6e03491..e2f27e9a495 100644 --- a/nixpkgs/pkgs/applications/graphics/inkscape/default.nix +++ b/nixpkgs/pkgs/applications/graphics/inkscape/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://media.inkscape.org/dl/resources/file/${pname}-${version}.tar.bz2"; - sha256 = "ge5/aeK9ZKlzQ9g5Wkp6eQWyG4YVZu1eXZF5F41Rmgs="; + sha256 = "02wsa66ifycibmgfsrhmhqdv41brg955lffq8drsjr5xw9lpzvl1"; }; # Inkscape hits the ARGMAX when linking on macOS. It appears to be diff --git a/nixpkgs/pkgs/applications/graphics/sane/backends/airscan/default.nix b/nixpkgs/pkgs/applications/graphics/sane/backends/airscan/default.nix index 75f4a466b27..0615b00f135 100644 --- a/nixpkgs/pkgs/applications/graphics/sane/backends/airscan/default.nix +++ b/nixpkgs/pkgs/applications/graphics/sane/backends/airscan/default.nix @@ -2,7 +2,7 @@ , sane-backends, meson, ninja }: stdenv.mkDerivation rec { pname = "sane-airscan"; - version = "0.99.0"; + version = "0.99.3"; nativeBuildInputs = [ meson ninja pkg-config ]; buildInputs = [ avahi libsoup libjpeg libpng sane-backends ]; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "alexpevzner"; repo = pname; rev = version; - sha256 = "0bbw3s95v5fmkpmmd26v9cf1c40dm85bgxlhs06ski5my803ck0a"; + sha256 = "1sxp207vzjzi0ad5202n46acbha4dfmzcijl2v0b9j9lj4k42a8k"; }; meta = with lib; { diff --git a/nixpkgs/pkgs/applications/graphics/tev/default.nix b/nixpkgs/pkgs/applications/graphics/tev/default.nix index f6ad16d7f90..2f47ebab66e 100644 --- a/nixpkgs/pkgs/applications/graphics/tev/default.nix +++ b/nixpkgs/pkgs/applications/graphics/tev/default.nix @@ -5,14 +5,14 @@ stdenv.mkDerivation rec { pname = "tev"; - version = "1.15"; + version = "1.16"; src = fetchFromGitHub { owner = "Tom94"; repo = pname; rev = "v${version}"; fetchSubmodules = true; - sha256 = "173nxvj30xmbdj8fc3rbw0mlicxy6zbhxv01i7z5nmcdvpamkdx6"; + sha256 = "0fn5j9klzrjvz3bq8p9yp9nqikn2fr7bp98c1sxwpwwaadkqy9xf"; }; nativeBuildInputs = [ cmake wrapGAppsHook ]; |