From e536b9e208955af925c8de8ddccc9f6edab0981b Mon Sep 17 00:00:00 2001
From: Timothy Stott <stott.timothy@gmail.com>
Date: Sun, 31 May 2020 11:16:58 +0100
Subject: [PATCH 1/2] maintainers: add timstott

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 7163f1a9f2c..2400bb22a8a 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -7854,6 +7854,12 @@
     githubId = 2845239;
     name = "Tim Put";
   };
+  timstott = {
+    email = "stott.timothy@gmail.com";
+    github = "timstott";
+    githubId = 1334474;
+    name = "Timothy Stott";
+  };
   tiramiseb = {
     email = "sebastien@maccagnoni.eu";
     github = "tiramiseb";

From 162f00a32e3f499294d86e5609bc6ac902ee6ae6 Mon Sep 17 00:00:00 2001
From: Timothy Stott <stott.timothy@gmail.com>
Date: Sun, 31 May 2020 11:18:54 +0100
Subject: [PATCH 2/2] go-jira: 1.0.17 -> 1.0.23

---
 pkgs/applications/misc/go-jira/default.nix | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/misc/go-jira/default.nix b/pkgs/applications/misc/go-jira/default.nix
index f8da250dbc7..5fad7b9ac03 100644
--- a/pkgs/applications/misc/go-jira/default.nix
+++ b/pkgs/applications/misc/go-jira/default.nix
@@ -1,22 +1,22 @@
-# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
-{ stdenv, buildGoPackage, fetchgit }:
+{ stdenv, buildGoModule, fetchFromGitHub }:
 
-buildGoPackage rec {
+buildGoModule rec {
   pname = "go-jira";
-  version = "1.0.17";
+  version = "1.0.23";
 
-  goPackagePath = "gopkg.in/Netflix-Skunkworks/go-jira.v1";
-
-  src = fetchgit {
+  src = fetchFromGitHub {
     rev = "v${version}";
-    url = "https://gopkg.in/Netflix-Skunkworks/go-jira.v1";
-    sha256 = "0ap5dzikp934mawigmv7ighajr5yxpck2gpnb2cmkc1p6qa6gn4v";
+    owner = "go-jira";
+    repo = "jira";
+    sha256 = "0qk5ifjxkqisvgv066rw8xj2zszc9mhc0by4338xjd7ng10jkk7b";
   };
 
+  vendorSha256 = "18jwxnkv94lsxfv57ga519knxm077cc8chp5c992ipk58a04nv18";
+
   meta = with stdenv.lib; {
     description = "Simple command line client for Atlassian's Jira service written in Go";
-    homepage = "https://github.com/Netflix-Skunkworks/go-jira";
+    homepage = "https://github.com/go-jira/jira";
     license = licenses.asl20;
-    maintainers = [ maintainers.carlosdagos ];
+    maintainers = with maintainers; [ carlosdagos timstott ];
   };
 }