public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #57200 from dtzWill/update/ipe-7.2.11

Browse Source 
ipe: 7.2.10 -> 7.2.11, touchup
This commit is contained in:
Will Dietz 2019-03-11 05:19:27 -05:00 committed by GitHub
commit 22b3b54749
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/applications/graphics/ipe/default.nix
View File

@ -1,13 +1,13 @@
{ stdenv, fetchurl, makeWrapper, pkgconfig, zlib, freetype, cairo, lua5, texlive, ghostscript { stdenv, fetchurl, makeWrapper, pkgconfig, zlib, freetype, cairo, lua5, texlive, ghostscript
, libjpeg, qtbase , libjpeg, libpng, qtbase
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "ipe-7.2.10"; name = "ipe-7.2.11";
src = fetchurl { src = fetchurl {
url = "https://dl.bintray.com/otfried/generic/ipe/7.2/${name}-src.tar.gz"; url = "https://dl.bintray.com/otfried/generic/ipe/7.2/${name}-src.tar.gz";
sha256 = "0gw45d0albrsa0pbc5g4w3fmmjfxrdbpzyc7723ncbhncdyda01h"; sha256 = "09d71fdpiz359mcnb57460w2mcfizvlnidd6g1k4c3v6rglwlbd2";
}; };
sourceRoot = "${name}/src"; sourceRoot = "${name}/src";
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
LUA_PACKAGE = "lua"; LUA_PACKAGE = "lua";
buildInputs = [ buildInputs = [
libjpeg zlib qtbase freetype cairo lua5 texlive ghostscript libjpeg libpng zlib qtbase freetype cairo lua5 texlive ghostscript
]; ];
nativeBuildInputs = [ makeWrapper pkgconfig ]; nativeBuildInputs = [ makeWrapper pkgconfig ];

1
pkgs/top-level/all-packages.nix
View File

@ -17865,6 +17865,7 @@ in
ipe = libsForQt5.callPackage ../applications/graphics/ipe { ipe = libsForQt5.callPackage ../applications/graphics/ipe {
ghostscript = ghostscriptX; ghostscript = ghostscriptX;
texlive = texlive.combine { inherit (texlive) scheme-small; }; texlive = texlive.combine { inherit (texlive) scheme-small; };
lua5 = lua5_3;
}; };
iptraf = callPackage ../applications/networking/iptraf { }; iptraf = callPackage ../applications/networking/iptraf { };