From 0838eeb0edf0f2e842c3a006de32b27c1bc3dca9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Krzysztof=20Feiler?= <m@mikf.pl>
Date: Sun, 29 Sep 2019 13:56:54 +0200
Subject: [PATCH] cwm: 5.6 -> 6.3-80-g4154b9b

also declared maintainer "mkf"
and added maintainer "mkf" to cwm maintainers

(cherry picked from commit 5de195fc681a6d663769c35091ba21962180583d)
---
 maintainers/maintainer-list.nix                   |  9 +++++++++
 pkgs/applications/window-managers/cwm/default.nix | 12 ++++++------
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 6cb9d07fe93b3..bf693ad96ceeb 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -4217,6 +4217,15 @@
     githubId = 5698461;
     name = "Maciej Kazulak";
   };
+  mkf = {
+    email = "m@mikf.pl";
+    github = "mkf";
+    name = "Michał Krzysztof Feiler";
+    keys = [{
+      longkeyid = "rsa4096/0xE35C2D7C2C6AC724";
+      fingerprint = "1E36 9940 CC7E 01C4 CFE8  F20A E35C 2D7C 2C6A C724";
+    }];
+  };
   mkg = {
     email = "mkg@vt.edu";
     github = "mkgvt";
diff --git a/pkgs/applications/window-managers/cwm/default.nix b/pkgs/applications/window-managers/cwm/default.nix
index 1354171dcfacd..ae5e67d0983d7 100644
--- a/pkgs/applications/window-managers/cwm/default.nix
+++ b/pkgs/applications/window-managers/cwm/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchFromGitHub, libX11, libXinerama, libXrandr, libXft, yacc, pkgconfig }:
 
 stdenv.mkDerivation {
-  name = "cwm-5.6";
+  name = "cwm-6.3-80-g4154b9b";
 
   src = fetchFromGitHub {
-      owner = "chneukirchen";
+      owner = "leahneukirchen";
       repo = "cwm";
-      rev = "b7a8c11750d11721a897fdb8442d52f15e7a24a0";
-      sha256 = "0a0x8rgqif4kxy7hj70hck7jma6c8jy4428ybl8fz9qxgxh014ml";
+      rev = "4154b9b194845814dfc836d80a94f34bcbf25d3e";
+      sha256 = "1qw14v54r6d0prs1mg9dsn551mfd404n5v19qjimwl1h3ji71s9n";
   };
 
   nativeBuildInputs = [ pkgconfig ];
@@ -17,8 +17,8 @@ stdenv.mkDerivation {
 
   meta = with stdenv.lib; {
     description = "A lightweight and efficient window manager for X11";
-    homepage = https://github.com/chneukirchen/cwm;
-    maintainers = [];
+    homepage = https://github.com/leahneukirchen/cwm;
+    maintainers = with maintainers; [ mkf ];
     license     = licenses.isc;
     platforms   = platforms.linux;
   };