From 8839a613d7ebe04fc62766ac59ed45248a7f65ef Mon Sep 17 00:00:00 2001 From: ft Date: Tue, 19 Feb 2019 01:48:58 -0800 Subject: paraview: 5.5.2 -> 5.6.0 --- pkgs/applications/graphics/paraview/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/applications/graphics') diff --git a/pkgs/applications/graphics/paraview/default.nix b/pkgs/applications/graphics/paraview/default.nix index 9839bb740778..cf13c6fb05e9 100644 --- a/pkgs/applications/graphics/paraview/default.nix +++ b/pkgs/applications/graphics/paraview/default.nix @@ -6,7 +6,7 @@ stdenv, fetchFromGitHub, cmake, makeWrapper stdenv.mkDerivation rec { name = "paraview-${version}"; - version = "5.5.2"; + version = "5.6.0"; # fetching from GitHub instead of taking an "official" source # tarball because of missing submodules there @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { owner = "Kitware"; repo = "ParaView"; rev = "v${version}"; - sha256 = "1jivph7lppnflmjsiirhgv0mnh8mxx41i1vzkk78ynn00rzacx3j"; + sha256 = "1j13yfdgcv4yzfr449i4c8r4rs1c9zr6qd3igr4vv3ani8zixkzi"; fetchSubmodules = true; }; -- cgit 1.4.1 From 28d983fe25bcf853dfd38663f333d4c522f613cc Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Wed, 20 Feb 2019 07:50:42 +0100 Subject: openscad: enableParallelBuilding = false; Discussion: https://github.com/NixOS/nixpkgs/commit/c68dc2212e22 --- pkgs/applications/graphics/openscad/default.nix | 3 +++ 1 file changed, 3 insertions(+) (limited to 'pkgs/applications/graphics') diff --git a/pkgs/applications/graphics/openscad/default.nix b/pkgs/applications/graphics/openscad/default.nix index 44855d5c8b49..bce2e8826983 100644 --- a/pkgs/applications/graphics/openscad/default.nix +++ b/pkgs/applications/graphics/openscad/default.nix @@ -28,6 +28,9 @@ stdenv.mkDerivation rec { qmakeFlags = [ "VERSION=${version}" ]; + # src/lexer.l:36:10: fatal error: parser.hxx: No such file or directory + enableParallelBuilding = false; # true by default due to qmake + doCheck = false; meta = { -- cgit 1.4.1 From 36a0ec673b6125582333fb37325cd6be38ad437f Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 3 Feb 2019 15:33:33 +0000 Subject: ahoviewer: move defaults to package file --- pkgs/applications/graphics/ahoviewer/default.nix | 8 ++++---- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 5 insertions(+), 7 deletions(-) (limited to 'pkgs/applications/graphics') diff --git a/pkgs/applications/graphics/ahoviewer/default.nix b/pkgs/applications/graphics/ahoviewer/default.nix index 596570092a94..5210af4df7ad 100644 --- a/pkgs/applications/graphics/ahoviewer/default.nix +++ b/pkgs/applications/graphics/ahoviewer/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchFromGitHub, pkgconfig, libconfig, - gtkmm2, glibmm, libxml2, libsecret, curl, libzip, - librsvg, gst_all_1, autoreconfHook, makeWrapper, - useUnrar ? false, unrar +{ config, stdenv, fetchFromGitHub, pkgconfig, libconfig +, gtkmm2, glibmm, libxml2, libsecret, curl, libzip +, librsvg, gst_all_1, autoreconfHook, makeWrapper +, useUnrar ? config.ahoviewer.useUnrar or false, unrar }: assert useUnrar -> unrar != null; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cc3e5416d853..c2209574c419 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16030,9 +16030,7 @@ in agedu = callPackage ../tools/misc/agedu { }; - ahoviewer = callPackage ../applications/graphics/ahoviewer { - useUnrar = config.ahoviewer.useUnrar or false; - }; + ahoviewer = callPackage ../applications/graphics/ahoviewer { }; airwave = callPackage ../applications/audio/airwave { }; -- cgit 1.4.1 From b73c416470438d75d30f3ab697531dce8d7848cb Mon Sep 17 00:00:00 2001 From: pacien Date: Tue, 22 Jan 2019 01:45:53 +0100 Subject: gscan2pdf: init at 2.3.0 based on github issue #34744 closes #34744 --- pkgs/applications/graphics/gscan2pdf/default.nix | 103 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + pkgs/top-level/perl-packages.nix | 94 +++++++++++++++++++++ 3 files changed, 199 insertions(+) create mode 100644 pkgs/applications/graphics/gscan2pdf/default.nix (limited to 'pkgs/applications/graphics') diff --git a/pkgs/applications/graphics/gscan2pdf/default.nix b/pkgs/applications/graphics/gscan2pdf/default.nix new file mode 100644 index 000000000000..9ec82ea2a94b --- /dev/null +++ b/pkgs/applications/graphics/gscan2pdf/default.nix @@ -0,0 +1,103 @@ +{ stdenv, fetchurl, perlPackages, makeWrapper, wrapGAppsHook, + librsvg, sane-backends, sane-frontends, + imagemagick, libtiff, djvulibre, poppler_utils, ghostscript, unpaper, + xvfb_run, hicolor-icon-theme, liberation_ttf, file, pdftk }: + +with stdenv.lib; + +perlPackages.buildPerlPackage rec { + name = "gscan2pdf-${version}"; + version = "2.3.0"; + + src = fetchurl { + url = "mirror://sourceforge/gscan2pdf/${version}/${name}.tar.xz"; + sha256 = "0mcsmly0j9pmyzh6py8r6sfa30hc6gv300hqq3dxj4hv653vhkk9"; + }; + + nativeBuildInputs = [ wrapGAppsHook ]; + + buildInputs = + [ librsvg sane-backends sane-frontends ] ++ + (with perlPackages; [ + Gtk3 + Gtk3SimpleList + Cairo + CairoGObject + Glib + GlibObjectIntrospection + GooCanvas2 + LocaleGettext + PDFAPI2 + ImageSane + SetIntSpan + PerlMagick + ConfigGeneral + ListMoreUtils + HTMLParser + ProcProcessTable + Log4Perl + TryTiny + DataUUID + DateCalc + IOString + FilesysDf + SubOverride + ]); + + postPatch = let + fontSubstitute = "${liberation_ttf}/share/fonts/truetype/LiberationSans-Regular.ttf"; + in '' + # Required for the program to properly load its SVG assets + substituteInPlace bin/gscan2pdf \ + --replace "/usr/share" "$out/share" + + # Substitute the non-free Helvetica font in the tests + sed -i 's|-pointsize|-font ${fontSubstitute} -pointsize|g' t/*.t + ''; + + postInstall = '' + # Remove impurity + find $out -type f -name "*.pod" -delete + + # Add runtime dependencies + wrapProgram "$out/bin/gscan2pdf" \ + --prefix PATH : "${imagemagick}/bin" \ + --prefix PATH : "${libtiff}/bin" \ + --prefix PATH : "${djvulibre}/bin" \ + --prefix PATH : "${poppler_utils}/bin" \ + --prefix PATH : "${ghostscript}/bin" \ + --prefix PATH : "${unpaper}/bin" + ''; + + enableParallelBuilding = true; + + installTargets = [ "install" ]; + + outputs = [ "out" "man" ]; + + checkInputs = [ + xvfb_run + hicolor-icon-theme + imagemagick + libtiff + djvulibre + poppler_utils + ghostscript + file + pdftk + unpaper + ]; + + checkPhase = '' + xvfb-run -s '-screen 0 800x600x24' \ + make test + ''; + + meta = { + description = "A GUI to produce PDFs or DjVus from scanned documents"; + homepage = http://gscan2pdf.sourceforge.net/; + license = licenses.gpl3; + maintainers = [ maintainers.pacien ]; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8fafe7e9e092..e5582f28862c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1446,6 +1446,8 @@ in grobi = callPackage ../tools/X11/grobi { }; + gscan2pdf = callPackage ../applications/graphics/gscan2pdf { }; + gti = callPackage ../tools/misc/gti { }; hdate = callPackage ../applications/misc/hdate { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 24ff673b8fa1..bb482e53ae43 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1023,6 +1023,19 @@ let propagatedBuildInputs = [ ExtUtilsDepends ExtUtilsPkgConfig ]; }; + CairoGObject = buildPerlPackage rec { + name = "Cairo-GObject-1.004"; + src = fetchurl { + url = "mirror://cpan/authors/id/X/XA/XAOC/${name}.tar.gz"; + sha256 = "1m896j0xdfhldsx8abf10cc16ll1fm9wbav42dpzal9fh07d9f9v"; + }; + buildInputs = [ pkgs.cairo Cairo Glib ExtUtilsDepends ExtUtilsPkgConfig ]; + meta = { + description = "Integrate Cairo into the Glib type system"; + license = stdenv.lib.licenses.lgpl21Plus; + }; + }; + cam_pdf = buildPerlModule rec { name = "CAM-PDF-1.60"; src = fetchurl { @@ -5897,6 +5910,18 @@ let }; }; + FilesysDf = buildPerlPackage rec { + name = "Filesys-Df-0.92"; + src = fetchurl { + url = "mirror://cpan/authors/id/I/IG/IGUTHRIE/${name}.tar.gz"; + sha256 = "fe89cbb427e0e05f1cd97c2dd6d3866ac6b21bc7a85734ede159bdc35479552a"; + }; + meta = { + description = "Perl extension for filesystem disk space information."; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + FilesysNotifySimple = buildPerlPackage { name = "Filesys-Notify-Simple-0.13"; src = fetchurl { @@ -6302,6 +6327,20 @@ let propagatedBuildInputs = [ ExtUtilsDepends ExtUtilsPkgConfig ]; }; + GlibObjectIntrospection = buildPerlPackage rec { + name = "Glib-Object-Introspection-0.046"; + src = fetchurl { + url = "mirror://cpan/authors/id/X/XA/XAOC/${name}.tar.gz"; + sha256 = "1d3gl943p27gd42kxc1i9sp5z55gpgcslz1jvx7cxd6mflhdlck6"; + }; + buildInputs = [ Glib ExtUtilsDepends ExtUtilsPkgConfig ]; + propagatedBuildInputs = [ pkgs.gobject-introspection ]; + meta = { + description = "Dynamically create Perl language bindings"; + license = stdenv.lib.licenses.lgpl2Plus; + }; + }; + Gnome2 = buildPerlPackage rec { name = "Gnome2-1.047"; src = fetchurl { @@ -6407,6 +6446,20 @@ let }; }; + GooCanvas2 = buildPerlPackage rec { + name = "GooCanvas2-0.06"; + src = fetchurl { + url = "mirror://cpan/authors/id/P/PE/PERLMAX/${name}.tar.gz"; + sha256 = "0l1vsvyv9hjxhsxrahq4h64axh7qmk50kiz2spa3s1hr7s3qfk72"; + }; + buildInputs = [ pkgs.gtk3 GlibObjectIntrospection Glib ]; + propagatedBuildInputs = [ pkgs.goocanvas2 ]; + meta = { + description = "Perl binding for GooCanvas2 widget using Glib::Object::Introspection"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + GoogleProtocolBuffers = buildPerlPackage rec { name = "Google-ProtocolBuffers-0.12"; src = fetchurl { @@ -6575,6 +6628,33 @@ let }; }; + Gtk3 = buildPerlPackage rec { + name = "Gtk3-0.034"; + src = fetchurl { + url = "mirror://cpan/authors/id/X/XA/XAOC/${name}.tar.gz"; + sha256 = "0baxyhlzdf7avka40h1niiir8vz4nilqkiwh876i0hv0f8xj3nqa"; + }; + buildInputs = [ Cairo CairoGObject Glib GlibObjectIntrospection ]; + propagatedBuildInputs = [ pkgs.gtk3 ]; + meta = { + description = "Perl interface to the 3.x series of the gtk+ toolkit"; + license = stdenv.lib.licenses.lgpl21Plus; + }; + }; + + Gtk3SimpleList = buildPerlPackage rec { + name = "Gtk3-SimpleList-0.18"; + src = fetchurl { + url = "mirror://cpan/authors/id/T/TV/TVIGNAUD/${name}.tar.gz"; + sha256 = "09azmc7miyvw7q21rz8cxw16zbd5i1j5hpakxy376f5vmhqqjyhp"; + }; + buildInputs = [ Gtk3 Glib GlibObjectIntrospection Cairo CairoGObject ]; + meta = { + description = "A simple interface to Gtk3's complex MVC list widget"; + license = stdenv.lib.licenses.lgpl21Plus; + }; + }; + Guard = buildPerlPackage rec { name = "Guard-1.023"; src = fetchurl { @@ -7319,6 +7399,20 @@ let }; }; + ImageSane = buildPerlPackage rec { + name = "Image-Sane-0.14"; + src = fetchurl { + url = "mirror://cpan/authors/id/R/RA/RATCLIFFE/${name}.tar.gz"; + sha256 = "a4b027c9b7650291f1acb0eb93861a7fc45aef4e08f6726843f174fa113c8ba5"; + }; + buildInputs = [ pkgs.sane-backends ExtUtilsDepends ExtUtilsPkgConfig TestRequires TryTiny ]; + propagatedBuildInputs = [ ExceptionClass Readonly ]; + meta = { + description = "Perl extension for the SANE (Scanner Access Now Easy) Project"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + ImageScale = buildPerlPackage rec { name = "Image-Scale-0.14"; src = fetchurl { -- cgit 1.4.1 From dfa850f8065ced1361f7ef036328a043938b37b0 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 11 Feb 2019 19:43:25 -0600 Subject: feh: 3.1.1 -> 3.1.2 minor touchups while visiting. --- pkgs/applications/graphics/feh/default.nix | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) (limited to 'pkgs/applications/graphics') diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix index 02e6a10295e9..9ef70dff7663 100644 --- a/pkgs/applications/graphics/feh/default.nix +++ b/pkgs/applications/graphics/feh/default.nix @@ -6,11 +6,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "feh-${version}"; - version = "3.1.1"; + version = "3.1.2"; src = fetchurl { url = "https://feh.finalrewind.org/${name}.tar.bz2"; - sha256 = "1sy8z6rv5sy1bhk3846hgfdy96wdi874yr2fnxfprks46qp29l31"; + sha256 = "0qjhlrgr606gc9h96w9piyd13mx63jqfbxxnan41nrh76m8d0dka"; }; outputs = [ "out" "man" "doc" ]; @@ -20,25 +20,22 @@ stdenv.mkDerivation rec { buildInputs = [ xorg.libX11 xorg.libXinerama imlib2 libjpeg libpng curl libexif ]; makeFlags = [ - "PREFIX=$(out)" "exif=1" + "PREFIX=${placeholder "out"}" "exif=1" ] ++ optional stdenv.isDarwin "verscmp=0"; - postBuild = '' - pushd man - make - popd - ''; - + installTargets = [ "install" ]; postInstall = '' wrapProgram "$out/bin/feh" --prefix PATH : "${libjpeg.bin}/bin" \ --add-flags '--theme=feh' - install -D -m 644 man/*.1 $out/share/man/man1 ''; checkInputs = [ perlPackages.perl perlPackages.TestCommand ]; preCheck = '' export PERL5LIB="${perlPackages.TestCommand}/${perlPackages.perl.libPrefix}" ''; + postCheck = '' + unset PERL5LIB + ''; doCheck = true; -- cgit 1.4.1 From 89c832dc46f2407782296cffed391b80e2cdbf25 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 15 Feb 2019 08:14:23 -0800 Subject: gnome3.shotwell: 0.30.1 -> 0.30.2 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/shotwell/versions --- pkgs/applications/graphics/shotwell/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/applications/graphics') diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix index 2f06451438d9..03cac9114afe 100644 --- a/pkgs/applications/graphics/shotwell/default.nix +++ b/pkgs/applications/graphics/shotwell/default.nix @@ -7,13 +7,13 @@ let pname = "shotwell"; - version = "0.30.1"; + version = "0.30.2"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "01hsmig06hjv34yf9y60hv2gml593xfkza4ilq4b22gr8l4v2qip"; + sha256 = "0pam0si110vkc65kh59lrmgkv91f9zxmf1gpfm99ixjgw25rfi8r"; }; nativeBuildInputs = [ -- cgit 1.4.1 From c1c4620f839b4a25ccc871ca4ae1877d033bb025 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 16 Feb 2019 06:21:35 -0800 Subject: digikam: 5.9.0 -> 6.0.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/digikam/versions --- pkgs/applications/graphics/digikam/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/applications/graphics') diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix index e7621414b06f..7fcdb46e32e9 100644 --- a/pkgs/applications/graphics/digikam/default.nix +++ b/pkgs/applications/graphics/digikam/default.nix @@ -50,13 +50,13 @@ mkDerivation rec { name = "digikam-${version}"; - version = "5.9.0"; + version = "6.0.0"; src = fetchFromGitHub { owner = "KDE"; repo = "digikam"; rev = "v${version}"; - sha256 = "09diw273h9i7rss89ba82yrfy6jb2njv3k0dknrrg7bb998vrw2d"; + sha256 = "1ifvrn0bm7fp07d059rl4dy146qzdxafl36ipxg1fg00dkv95hh4"; }; nativeBuildInputs = [ cmake doxygen extra-cmake-modules kdoctools wrapGAppsHook ]; -- cgit 1.4.1