From 39a85789319e2971d3f0a1910d8d95136c3509c8 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 9 Mar 2019 19:16:42 -0600 Subject: [PATCH 1/2] ipe: 7.2.10 -> 7.2.11 https://mailman.science.uu.nl/pipermail/ipe-announce/2019-March/000082.html --- pkgs/applications/graphics/ipe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/ipe/default.nix b/pkgs/applications/graphics/ipe/default.nix index d30f8c209c5..cfe51de3cc5 100644 --- a/pkgs/applications/graphics/ipe/default.nix +++ b/pkgs/applications/graphics/ipe/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "ipe-7.2.10"; + name = "ipe-7.2.11"; src = fetchurl { url = "https://dl.bintray.com/otfried/generic/ipe/7.2/${name}-src.tar.gz"; - sha256 = "0gw45d0albrsa0pbc5g4w3fmmjfxrdbpzyc7723ncbhncdyda01h"; + sha256 = "09d71fdpiz359mcnb57460w2mcfizvlnidd6g1k4c3v6rglwlbd2"; }; sourceRoot = "${name}/src"; From 812a99cdd32fbe686bbff5ecb7cfda22f45c4022 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 9 Mar 2019 19:23:34 -0600 Subject: [PATCH 2/2] ipe: be explicit about libpng, use lua 5.3 per readme --- pkgs/applications/graphics/ipe/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/ipe/default.nix b/pkgs/applications/graphics/ipe/default.nix index cfe51de3cc5..0673eec8c86 100644 --- a/pkgs/applications/graphics/ipe/default.nix +++ b/pkgs/applications/graphics/ipe/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, makeWrapper, pkgconfig, zlib, freetype, cairo, lua5, texlive, ghostscript -, libjpeg, qtbase +, libjpeg, libpng, qtbase }: stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { LUA_PACKAGE = "lua"; buildInputs = [ - libjpeg zlib qtbase freetype cairo lua5 texlive ghostscript + libjpeg libpng zlib qtbase freetype cairo lua5 texlive ghostscript ]; nativeBuildInputs = [ makeWrapper pkgconfig ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 97777d8a1a4..04ab789fba9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17860,6 +17860,7 @@ in ipe = libsForQt5.callPackage ../applications/graphics/ipe { ghostscript = ghostscriptX; texlive = texlive.combine { inherit (texlive) scheme-small; }; + lua5 = lua5_3; }; iptraf = callPackage ../applications/networking/iptraf { };