From c40dae086334306dccdf4303e09e1335520305ef Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 14 Aug 2015 22:28:23 -0500 Subject: [PATCH 1/6] ipe: fix homepage --- pkgs/applications/graphics/ipe/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/ipe/default.nix b/pkgs/applications/graphics/ipe/default.nix index 53df14f8704..1c4b80c1f29 100644 --- a/pkgs/applications/graphics/ipe/default.nix +++ b/pkgs/applications/graphics/ipe/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = { description = "An editor for drawing figures"; - homepage = http://ipe7.sourceforge.net; + homepage = http://ipe.otfried.org; license = stdenv.lib.licenses.gpl3Plus; longDescription = '' Ipe is an extensible drawing editor for creating figures in PDF and Postscript format. From 48a2034308f29c10073058b3ea3064ec71968cb2 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 14 Aug 2015 22:28:42 -0500 Subject: [PATCH 2/6] ipe: add ttuegel to maintainers --- pkgs/applications/graphics/ipe/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/graphics/ipe/default.nix b/pkgs/applications/graphics/ipe/default.nix index 1c4b80c1f29..001412df4ad 100644 --- a/pkgs/applications/graphics/ipe/default.nix +++ b/pkgs/applications/graphics/ipe/default.nix @@ -43,5 +43,6 @@ stdenv.mkDerivation rec { It supports making small figures for inclusion into LaTeX-documents as well as presentations in PDF. ''; + maintainers = [ stdenv.lib.maintainers.ttuegel ]; }; } From df5f0cfb7c84fb9c8e18ac08c7e486850384df41 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 14 Aug 2015 22:28:51 -0500 Subject: [PATCH 3/6] ipe: set platforms = linux --- pkgs/applications/graphics/ipe/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/graphics/ipe/default.nix b/pkgs/applications/graphics/ipe/default.nix index 001412df4ad..f6bc4277d67 100644 --- a/pkgs/applications/graphics/ipe/default.nix +++ b/pkgs/applications/graphics/ipe/default.nix @@ -44,5 +44,6 @@ stdenv.mkDerivation rec { as well as presentations in PDF. ''; maintainers = [ stdenv.lib.maintainers.ttuegel ]; + platforms = stdenv.lib.platforms.linux; }; } From cce9a0f4d8638d8ec1006f1fd20495aba370e91a Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 14 Aug 2015 22:29:58 -0500 Subject: [PATCH 4/6] ipe: version 7.1.8 --- pkgs/applications/graphics/ipe/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/ipe/default.nix b/pkgs/applications/graphics/ipe/default.nix index f6bc4277d67..8afa8e4389c 100644 --- a/pkgs/applications/graphics/ipe/default.nix +++ b/pkgs/applications/graphics/ipe/default.nix @@ -2,11 +2,11 @@ , makeWrapper }: let ghostscript = ghostscriptX; in stdenv.mkDerivation rec { - name = "ipe-7.1.2"; + name = "ipe-7.1.8"; src = fetchurl { - url = "mirror://sourceforge/ipe7/ipe/7.1.0/${name}-src.tar.gz"; - sha256 = "04fs5slci3bmpgz8d038h3hnzzdw57xykcpsmisdxci2xrkxx41k"; + url = "http://github.com/otfried/ipe/raw/master/releases/7.1/${name}-src.tar.gz"; + sha256 = "1zx6dyr1rb6m6rvawagg9f8bc2li9nbighv2dglzjbh11bxqsyva"; }; # changes taken from Gentoo portage From 7203497ce4904a31ce84b1220e2d1fa5d3d87f3e Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 14 Aug 2015 22:30:21 -0500 Subject: [PATCH 5/6] ipe: set LUA_PACKAGE name for make --- pkgs/applications/graphics/ipe/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/graphics/ipe/default.nix b/pkgs/applications/graphics/ipe/default.nix index 8afa8e4389c..f2ba7c9bef3 100644 --- a/pkgs/applications/graphics/ipe/default.nix +++ b/pkgs/applications/graphics/ipe/default.nix @@ -21,6 +21,7 @@ stdenv.mkDerivation rec { IPEPREFIX="$$out"; URWFONTDIR="${texLive}/texmf-dist/fonts/type1/urw/"; + LUA_PACKAGE = "lua"; buildInputs = [ pkgconfig zlib qt4 freetype cairo lua5 texLive ghostscript makeWrapper From f0a11cd1eb428df09cd3080241d7ae56092927bd Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 14 Aug 2015 22:30:48 -0500 Subject: [PATCH 6/6] ipe: add missing libjpeg dependency --- pkgs/applications/graphics/ipe/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/ipe/default.nix b/pkgs/applications/graphics/ipe/default.nix index f2ba7c9bef3..ede0dc07afb 100644 --- a/pkgs/applications/graphics/ipe/default.nix +++ b/pkgs/applications/graphics/ipe/default.nix @@ -1,4 +1,5 @@ { stdenv, fetchurl, pkgconfig, zlib, qt4, freetype, cairo, lua5, texLive, ghostscriptX +, libjpeg , makeWrapper }: let ghostscript = ghostscriptX; in stdenv.mkDerivation rec { @@ -24,7 +25,7 @@ stdenv.mkDerivation rec { LUA_PACKAGE = "lua"; buildInputs = [ - pkgconfig zlib qt4 freetype cairo lua5 texLive ghostscript makeWrapper + libjpeg pkgconfig zlib qt4 freetype cairo lua5 texLive ghostscript makeWrapper ]; postInstall = ''