From e4ae3ed9233f1eb96aad86b3f61e95024b7d9f96 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sun, 13 Jan 2019 16:34:51 -0600 Subject: [PATCH 1/2] ipe: 7.2.7 -> 7.2.8 https://mailman.science.uu.nl/pipermail/ipe-announce/2019-January/000075.html --- pkgs/applications/graphics/ipe/default.nix | 6 ++---- pkgs/applications/graphics/ipe/xlocale.patch | 10 ---------- 2 files changed, 2 insertions(+), 14 deletions(-) delete mode 100644 pkgs/applications/graphics/ipe/xlocale.patch diff --git a/pkgs/applications/graphics/ipe/default.nix b/pkgs/applications/graphics/ipe/default.nix index dbd209a57a2f..fe555c978a52 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.7"; + name = "ipe-7.2.8"; src = fetchurl { url = "https://dl.bintray.com/otfried/generic/ipe/7.2/${name}-src.tar.gz"; - sha256 = "08lzqhagvr8l69hxghyw9akf5dixbily7hj2gxhzzrp334k3yvfn"; + sha256 = "1mrk3gxrgfdv9cj1831kwlmnj179l57i2ncg6vc36wf98bdjf2gy"; }; # changes taken from Gentoo portage @@ -38,8 +38,6 @@ stdenv.mkDerivation rec { done ''; - patches = [ ./xlocale.patch ]; - #TODO: make .desktop entry meta = { diff --git a/pkgs/applications/graphics/ipe/xlocale.patch b/pkgs/applications/graphics/ipe/xlocale.patch deleted file mode 100644 index b440831d81b4..000000000000 --- a/pkgs/applications/graphics/ipe/xlocale.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- ipe-7.2.7/src/ipelib/ipeplatform.cpp 2016-12-09 15:09:04.000000000 +0100 -+++ ipe-7.2.7/src/ipelib/ipeplatform.cpp 2017-11-23 17:13:11.152395834 +0100 -@@ -38,7 +38,6 @@ - #include - #else - #include --#include - #include - #endif - #ifdef __APPLE__ From b5deb430a450a1ab84d44c0c54cbb728373404f0 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 16 Jan 2019 08:12:23 -0600 Subject: [PATCH 2/2] ipe: 7.2.8 -> 7.2.9 https://mailman.science.uu.nl/pipermail/ipe-announce/2019-January/000076.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 fe555c978a52..ee5c348eb6be 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.8"; + name = "ipe-7.2.9"; src = fetchurl { url = "https://dl.bintray.com/otfried/generic/ipe/7.2/${name}-src.tar.gz"; - sha256 = "1mrk3gxrgfdv9cj1831kwlmnj179l57i2ncg6vc36wf98bdjf2gy"; + sha256 = "1i0h0q32xvbb0d3y2ff76jxnaw05hjf2z5gzww886z8arxwar1xn"; }; # changes taken from Gentoo portage