From 24246f2d891d3cb208477b129884ce09ad1697a0 Mon Sep 17 00:00:00 2001
From: Patrick Hilhorst <philhorst@science.ru.nl>
Date: Tue, 6 Mar 2018 00:29:14 +0100
Subject: [PATCH 1/3] i3-wk-switch: init at 2017-08-21

---
 lib/maintainers-list.nix                      |  5 +++
 .../window-managers/i3/wk-switch.nix          | 35 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 ++-
 3 files changed, 43 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/applications/window-managers/i3/wk-switch.nix

diff --git a/lib/maintainers-list.nix b/lib/maintainers-list.nix
index 608c36e91d2a..23afd6b9a7cc 100644
--- a/lib/maintainers-list.nix
+++ b/lib/maintainers-list.nix
@@ -3363,6 +3363,11 @@
     github = "symphorien";
     name = "Guillaume Girol";
   };
+  synthetica = {
+    email = "nix@hilhorst.be";
+    github = "Synthetica9";
+    name = "Patrick Hilhorst";
+  };
   szczyp = {
     email = "qb@szczyp.com";
     github = "szczyp";
diff --git a/pkgs/applications/window-managers/i3/wk-switch.nix b/pkgs/applications/window-managers/i3/wk-switch.nix
new file mode 100644
index 000000000000..04c99d500a1d
--- /dev/null
+++ b/pkgs/applications/window-managers/i3/wk-switch.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchFromGitHub, python2Packages }:
+
+let
+  pkgName = "i3-wk-switch";
+in
+python2Packages.buildPythonApplication rec {
+  name = "${pkgName}-${version}";
+  version = "2017-08-21";
+
+  # https://github.com/tmfink/i3-wk-switch/commit/484f840bc4c28ddc60fa3be81e2098f7689e78fb
+  src = fetchFromGitHub {
+    owner = "tmfink";
+    repo = pkgName;
+    rev = "484f840";
+    sha256 = "0nrc13ld5bx07wrgnpzgpbaixb4rpi93xiapvyb8srd49fj9pcmb";
+  };
+
+  propagatedBuildInputs = with python2Packages; [ i3-py ];
+
+  dontBuild = true;
+  doCheck = false;
+
+  installPhase = ''
+    mkdir -p "$out/bin"
+    cp i3-wk-switch.py "$out/bin/i3-wk-switch"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "XMonad-like workspace switching for i3";
+    maintainers = with maintainers; [ synthetica ];
+    platforms = platforms.linux;
+    license = licenses.gpl3Plus;
+    homepage = https://travisf.net/i3-wk-switcher;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 42e0e6daba6b..ace01666eb4f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10433,7 +10433,7 @@ with pkgs;
   ## libGL/libGLU/Mesa stuff
 
   # Default libGL implementation, should provide headers and libGL.so/libEGL.so/... to link agains them
-  # Default implementation is `mesa`, but can be eventually replaced with `libglvnd`, 
+  # Default implementation is `mesa`, but can be eventually replaced with `libglvnd`,
   # or other runtime dispatcher
   libGL = mesa_noglu;
 
@@ -15968,6 +15968,8 @@ with pkgs;
 
   i3status-rust = callPackage ../applications/window-managers/i3/status-rust.nix { };
 
+  i3-wk-switch = callPackage ../applications/window-managers/i3/wk-switch.nix { };
+
   i810switch = callPackage ../os-specific/linux/i810switch { };
 
   icewm = callPackage ../applications/window-managers/icewm {};

From f3c5939ac90c551cecc768d091417a8adbc7ccb8 Mon Sep 17 00:00:00 2001
From: Patrick Hilhorst <philhorst@science.ru.nl>
Date: Tue, 6 Mar 2018 01:00:44 +0100
Subject: [PATCH 2/3] fix license

---
 pkgs/applications/window-managers/i3/wk-switch.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/window-managers/i3/wk-switch.nix b/pkgs/applications/window-managers/i3/wk-switch.nix
index 04c99d500a1d..577a86b05623 100644
--- a/pkgs/applications/window-managers/i3/wk-switch.nix
+++ b/pkgs/applications/window-managers/i3/wk-switch.nix
@@ -29,7 +29,7 @@ python2Packages.buildPythonApplication rec {
     description = "XMonad-like workspace switching for i3";
     maintainers = with maintainers; [ synthetica ];
     platforms = platforms.linux;
-    license = licenses.gpl3Plus;
+    license = licenses.mit;
     homepage = https://travisf.net/i3-wk-switcher;
   };
 }

From eba94285a365a089d6f9aa7d67a45a27b620dd5f Mon Sep 17 00:00:00 2001
From: Patrick Hilhorst <philhorst@science.ru.nl>
Date: Tue, 6 Mar 2018 11:39:49 +0100
Subject: [PATCH 3/3] Following @teto's suggestion with regards to pname

---
 pkgs/applications/window-managers/i3/wk-switch.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/window-managers/i3/wk-switch.nix b/pkgs/applications/window-managers/i3/wk-switch.nix
index 577a86b05623..39bd62cd5aa9 100644
--- a/pkgs/applications/window-managers/i3/wk-switch.nix
+++ b/pkgs/applications/window-managers/i3/wk-switch.nix
@@ -1,16 +1,13 @@
 { stdenv, fetchFromGitHub, python2Packages }:
 
-let
-  pkgName = "i3-wk-switch";
-in
 python2Packages.buildPythonApplication rec {
-  name = "${pkgName}-${version}";
+  pname = "i3-wk-switch";
   version = "2017-08-21";
 
   # https://github.com/tmfink/i3-wk-switch/commit/484f840bc4c28ddc60fa3be81e2098f7689e78fb
   src = fetchFromGitHub {
     owner = "tmfink";
-    repo = pkgName;
+    repo = pname;
     rev = "484f840";
     sha256 = "0nrc13ld5bx07wrgnpzgpbaixb4rpi93xiapvyb8srd49fj9pcmb";
   };