From a41932865f54a6d8db33e5d50cab04e1ca6a331d Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 2 Sep 2019 11:07:45 +0200
Subject: [PATCH 1/2] libmypaint: format with nixpkgs-fmt

---
 .../libraries/libmypaint/default.nix          | 35 ++++++++++++++-----
 1 file changed, 27 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/libmypaint/default.nix b/pkgs/development/libraries/libmypaint/default.nix
index cde4251e2c6..a3361997774 100644
--- a/pkgs/development/libraries/libmypaint/default.nix
+++ b/pkgs/development/libraries/libmypaint/default.nix
@@ -1,10 +1,18 @@
-{stdenv, autoconf, automake, fetchFromGitHub, fetchpatch, glib, intltool, json_c, libtool, pkgconfig}:
+{ stdenv
+, autoconf
+, automake
+, fetchFromGitHub
+, fetchpatch
+, glib
+, intltool
+, json_c
+, libtool
+, pkgconfig
+}:
 
-let
-  version = "1.3.0";
-in stdenv.mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "libmypaint";
-  inherit version;
+  version = "1.3.0";
 
   src = fetchFromGitHub {
     owner = "mypaint";
@@ -21,11 +29,22 @@ in stdenv.mkDerivation rec {
     })
   ];
 
-  nativeBuildInputs = [ autoconf automake intltool libtool pkgconfig ];
+  nativeBuildInputs = [
+    autoconf
+    automake
+    intltool
+    libtool
+    pkgconfig
+  ];
 
-  buildInputs = [ glib ];
+  buildInputs = [
+    glib
+  ];
 
-  propagatedBuildInputs = [ json_c ]; # for libmypaint.pc
+  # for libmypaint.pc
+  propagatedBuildInputs = [
+    json_c
+  ];
 
   doCheck = true;
 

From 30853a61f58b0459d7dab02a51465fff5baa60a9 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 2 Sep 2019 11:59:27 +0200
Subject: [PATCH 2/2] =?UTF-8?q?libmypaint:=201.3.0=20=E2=86=92=201.4.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

http://mypaint.org/blog/2019/09/01/libmypaint-1.4.0-release/
---
 .../libraries/libmypaint/default.nix            | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/libraries/libmypaint/default.nix b/pkgs/development/libraries/libmypaint/default.nix
index a3361997774..91e0b5ef072 100644
--- a/pkgs/development/libraries/libmypaint/default.nix
+++ b/pkgs/development/libraries/libmypaint/default.nix
@@ -2,39 +2,34 @@
 , autoconf
 , automake
 , fetchFromGitHub
-, fetchpatch
 , glib
 , intltool
 , json_c
 , libtool
 , pkgconfig
+, python2
 }:
 
 stdenv.mkDerivation rec {
   pname = "libmypaint";
-  version = "1.3.0";
+  version = "1.4.0";
+
+  outputs = [ "out" "dev" ];
 
   src = fetchFromGitHub {
     owner = "mypaint";
     repo = "libmypaint";
     rev = "v${version}";
-    sha256 = "0b7aynr6ggigwhjkfzi8x3dwz15blj4grkg9hysbgjh6lvzpy9jc";
+    sha256 = "1ynm2g2wdb9zsymncndlgs6gpcbsa122n52d11161jrj5nrdliaq";
   };
 
-  patches = [
-    # build with automake 1.16
-    (fetchpatch {
-      url = https://github.com/mypaint/libmypaint/commit/40d9077a80be13942476f164bddfabe842ab2a45.patch;
-      sha256 = "1dclh7apgvr2bvzy9z3rgas3hk9pf2hpf5h52q94kmx8s4a47qpi";
-    })
-  ];
-
   nativeBuildInputs = [
     autoconf
     automake
     intltool
     libtool
     pkgconfig
+    python2
   ];
 
   buildInputs = [