Merge commit 'a2e06fc3423c4be53181b15c28dfbe0bcf67dd73'

2 files changed, 49 insertions, 16 deletions

diff --git a/nixpkgs/pkgs/development/libraries/mypaint-brushes/1.0.nix b/nixpkgs/pkgs/development/libraries/mypaint-brushes/1.0.nix
new file mode 100644
index 000000000000..c66329fa633a
--- /dev/null
+++ b/nixpkgs/pkgs/development/libraries/mypaint-brushes/1.0.nix
@@ -0,0 +1,34 @@
+{ stdenv
+, autoconf
+, automake
+, fetchFromGitHub
+, pkgconfig
+}:
+
+stdenv.mkDerivation rec {
+  pname = "mypaint-brushes";
+  version = "1.3.1";
+
+  src = fetchFromGitHub {
+    owner = "mypaint";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "1c95l1vfz7sbrdlzrbz7h1p6s1k113kyjfd9wfnxlm0p6562cz3j";
+  };
+
+  nativeBuildInputs = [
+    autoconf
+    automake
+    pkgconfig
+  ];
+
+  preConfigure = "./autogen.sh";
+
+  meta = with stdenv.lib; {
+    homepage = "http://mypaint.org/";
+    description = "Brushes used by MyPaint and other software using libmypaint.";
+    license = licenses.cc0;
+    maintainers = with maintainers; [ jtojnar ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/nixpkgs/pkgs/development/libraries/mypaint-brushes/default.nix b/nixpkgs/pkgs/development/libraries/mypaint-brushes/default.nix
index 3dac7c93e84b..20caf6e57752 100644
--- a/nixpkgs/pkgs/development/libraries/mypaint-brushes/default.nix
+++ b/nixpkgs/pkgs/development/libraries/mypaint-brushes/default.nix
@@ -1,32 +1,31 @@
-{stdenv, fetchpatch, autoconf, automake, fetchFromGitHub, pkgconfig}:
+{ stdenv
+, autoconf
+, automake
+, fetchFromGitHub
+, pkgconfig
+}:
 
-let
+stdenv.mkDerivation rec {
   pname = "mypaint-brushes";
-  version = "1.3.0";
-in stdenv.mkDerivation {
-  name = "${pname}-${version}";
+  version = "2.0.2";
 
   src = fetchFromGitHub {
-    owner = "Jehan";
+    owner = "mypaint";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1iz89z6v2mp8j1lrf942k561s8311i3s34ap36wh4rybb2lq15m0";
+    sha256 = "0kcqz13vzpy24dhmrx9hbs6s7hqb8y305vciznm15h277sabpmw9";
   };
 
-  nativeBuildInputs = [ autoconf automake pkgconfig ];
-
-  patches = [
-    # build with automake 1.16
-    (fetchpatch {
-      url = https://github.com/Jehan/mypaint-brushes/commit/1e9109dde3bffd416ed351c3f30ecd6ffd0ca2cd.patch;
-      sha256 = "0mi8rwbirl0ib22f2hz7kdlgi4hw8s3ab29b003dsshdyzn5iha9";
-    })
+  nativeBuildInputs = [
+    autoconf
+    automake
+    pkgconfig
   ];
 
   preConfigure = "./autogen.sh";
 
   meta = with stdenv.lib; {
-    homepage = http://mypaint.org/;
+    homepage = "http://mypaint.org/";
     description = "Brushes used by MyPaint and other software using libmypaint.";
     license = licenses.cc0;
     maintainers = with maintainers; [ jtojnar ];