From d6caa6b2736c712880c2fb5310d2251f973bdd2a Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Fri, 21 Apr 2017 14:37:46 +0200
Subject: [PATCH 1/2] madonctl: init at 0.1.0

---
 pkgs/applications/misc/madonctl/default.nix | 24 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/applications/misc/madonctl/default.nix

diff --git a/pkgs/applications/misc/madonctl/default.nix b/pkgs/applications/misc/madonctl/default.nix
new file mode 100644
index 000000000000..cd2f926a3071
--- /dev/null
+++ b/pkgs/applications/misc/madonctl/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, buildGoPackage, fetchFromGitHub, fetchgx }:
+
+buildGoPackage rec {
+  name = "madonctl-${version}";
+  version = "0.1.0";
+  rev = "8d14d4d0847fe200d11c0b3f7a6252da5e687078";
+
+  goPackagePath = "github.com/McKael/madonctl";
+
+  src = fetchFromGitHub {
+    inherit rev;
+    owner = "McKael";
+    repo = "madonctl";
+    sha256 = "1nd07frifkw21av9lczm12ffky10ycv9ya501mihm82c78jk1sn5";
+  };
+
+  meta = with stdenv.lib; {
+    description = "CLI for the Mastodon social network API";
+    homepage = https://github.com/McKael/madonctl;
+    license = licenses.mit;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ matthiasbeyer ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 807df4e57e75..46825aa353c5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -255,6 +255,8 @@ with pkgs;
 
   libredirect = callPackage ../build-support/libredirect { };
 
+  madonctl = callPackage ../applications/misc/madonctl { };
+
   makeDesktopItem = callPackage ../build-support/make-desktopitem { };
 
   makeAutostartItem = callPackage ../build-support/make-startupitem { };

From ce301fd4ab47269d7758450f40659a6b7cd728f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 20 May 2017 18:06:34 +0100
Subject: [PATCH 2/2] madonctl:  0.1.0 -> 1.1.0

---
 pkgs/applications/misc/madonctl/default.nix | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/misc/madonctl/default.nix b/pkgs/applications/misc/madonctl/default.nix
index cd2f926a3071..af8d00b59bfb 100644
--- a/pkgs/applications/misc/madonctl/default.nix
+++ b/pkgs/applications/misc/madonctl/default.nix
@@ -2,18 +2,25 @@
 
 buildGoPackage rec {
   name = "madonctl-${version}";
-  version = "0.1.0";
-  rev = "8d14d4d0847fe200d11c0b3f7a6252da5e687078";
+  version = "1.1.0";
 
   goPackagePath = "github.com/McKael/madonctl";
 
   src = fetchFromGitHub {
-    inherit rev;
     owner = "McKael";
     repo = "madonctl";
-    sha256 = "1nd07frifkw21av9lczm12ffky10ycv9ya501mihm82c78jk1sn5";
+    rev  = "v${version}";
+    sha256 = "1dnc1xaafhwhhf5afhb0wc2wbqq0s1r7qzj5k0xzc58my541gadc";
   };
 
+  # How to update:
+  # go get -u github.com/McKael/madonctl
+  # cd $GOPATH/src/github.com/McKael/madonctl
+  # git checkout v<version-number>
+  # go2nix save
+
+  goDeps = ./deps.nix;
+
   meta = with stdenv.lib; {
     description = "CLI for the Mastodon social network API";
     homepage = https://github.com/McKael/madonctl;