Merge commit '9480bae337095fd24f61380bce3174fdfe926a00'

This is the last nixos-unstable release before 13b2903169f, which I'm a
bit nervous about.  So I want the update including that one to be as
small as possible, hence going to this one first.

2 files changed, 12 insertions, 18 deletions

diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/gomuks/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/gomuks/default.nix
index c58940c6c32c..f7fad7f4c45a 100644
--- a/nixpkgs/pkgs/applications/networking/instant-messengers/gomuks/default.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/gomuks/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, buildGoModule, fetchFromGitHub, makeDesktopItem }:
+{ stdenv, buildGoModule, fetchFromGitHub, olm, makeDesktopItem }:
 
 buildGoModule rec {
   pname = "gomuks";
-  version = "2020-03-20";
+  version = "0.1.0";
 
   goPackagePath = "maunium.net/go/gomuks";
   patches = [ ./gomod.patch ];
@@ -10,11 +10,13 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "tulir";
     repo = pname;
-    rev = "bce30e32a049b3ee76081c8d3881a3820b0e7341";
-    sha256 = "0f7i88vrvl1xl4hmjplq3wwihqwijbgxy6nk5fkvc8pfmm5hsjcs";
+    rev = "v" + version;
+    sha256 = "1dcqkyxiqiyivzn85fwkjy8xs9yk89810x9mvkaiz0dx3ha57zhi";
   };
 
-  vendorSha256 = "0awiw41nzgp4gj9fd8lcgk880aa07n535jksn0ya1cmsgavcfbvc";
+  vendorSha256 = "1mfi167mycnnlq8dwh1kkx6drhhi4ib58aad5fwc90ckdaq1rpb7";
+
+  buildInputs = [ olm ];
 
   postInstall = ''
     cp -r ${
@@ -38,4 +40,4 @@ buildGoModule rec {
     maintainers = with maintainers; [ tilpner emily ];
     platforms = platforms.unix;
   };
-}
\ No newline at end of file
+}
diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/gomuks/gomod.patch b/nixpkgs/pkgs/applications/networking/instant-messengers/gomuks/gomod.patch
index ca8a32a4d2fb..7b5ae45d614a 100644
--- a/nixpkgs/pkgs/applications/networking/instant-messengers/gomuks/gomod.patch
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/gomuks/gomod.patch
@@ -1,20 +1,12 @@
 diff --git a/go.mod b/go.mod
-index 75d4a09..ef2a7ef 100644
+index a07e991..ba5ae99 100644
 --- a/go.mod
 +++ b/go.mod
-@@ -9,13 +9,14 @@ require (
+@@ -9,6 +9,7 @@ require (
  	github.com/lithammer/fuzzysearch v1.1.0
  	github.com/lucasb-eyer/go-colorful v1.0.3
- 	github.com/mattn/go-runewidth v0.0.8
-+	github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d // indirect
+ 	github.com/mattn/go-runewidth v0.0.9
++	github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d
  	github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 // indirect
  	github.com/pkg/errors v0.9.1
  	github.com/rivo/uniseg v0.1.0
- 	github.com/russross/blackfriday/v2 v2.0.1
- 	github.com/sasha-s/go-deadlock v0.2.0
- 	github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
--	github.com/stretchr/testify v1.5.1
-+    github.com/stretchr/testify v1.3.0
- 	go.etcd.io/bbolt v1.3.3
- 	golang.org/x/image v0.0.0-20200119044424-58c23975cae1
- 	golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e