From 2f4fa8d755265abd872573a726f70734141aa97f Mon Sep 17 00:00:00 2001 From: meutraa Date: Tue, 17 Nov 2020 14:37:23 +0000 Subject: [PATCH 1/2] mm: 2016.11.04 -> 2020.11.17 --- .../instant-messengers/mm/default.nix | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/mm/default.nix b/pkgs/applications/networking/instant-messengers/mm/default.nix index 3bdfcbfe7d1..681757743a0 100644 --- a/pkgs/applications/networking/instant-messengers/mm/default.nix +++ b/pkgs/applications/networking/instant-messengers/mm/default.nix @@ -1,21 +1,20 @@ -{ stdenv, buildGoPackage, fetchFromGitLab }: +{ stdenv, buildGoModule, fetchgit }: -buildGoPackage { +buildGoModule { pname = "mm"; - version = "2016.11.04"; + version = "2020.11.17"; - goPackagePath = "gitlab.com/meutraa/mm"; - - src = fetchFromGitLab { - owner = "meutraa"; - repo = "mm"; - rev = "473fdd97285168054b672dbad2ffc4047324c518"; - sha256 = "1s8v5gxpw1sms1g3i8nq2x2mmmyz97qkmxs1fzlspfcd6i8vknkp"; + src = fetchgit { + url = "https://git.lost.host/meutraa/mm.git"; + rev = "e5fa8eeb845aac8f28fc36013ee8a1dbe1e5710c"; + sha256 = "sha256-SdD4EE/rc85H7xqKB/kU8XFsC63i1sVObPha/zrxFGk="; }; + vendorSha256 = "sha256-zJJ9PzQShv2iRNyCg1XVscbwjV9ZtMIojJDtXXm3rVM="; + meta = { description = "A file system based matrix client"; - homepage = "https://gitlab.com/meutraa/mm"; + homepage = "https://git.lost.host/meutraa/mm"; license = stdenv.lib.licenses.isc; }; } From d39e238ff437102bae0ab2e89116a34d20ae5a31 Mon Sep 17 00:00:00 2001 From: meutraa Date: Tue, 17 Nov 2020 14:59:24 +0000 Subject: [PATCH 2/2] mm: add self as maintainer --- .../networking/instant-messengers/mm/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/mm/default.nix b/pkgs/applications/networking/instant-messengers/mm/default.nix index 681757743a0..a9306a751ac 100644 --- a/pkgs/applications/networking/instant-messengers/mm/default.nix +++ b/pkgs/applications/networking/instant-messengers/mm/default.nix @@ -12,9 +12,10 @@ buildGoModule { vendorSha256 = "sha256-zJJ9PzQShv2iRNyCg1XVscbwjV9ZtMIojJDtXXm3rVM="; - meta = { + meta = with stdenv.lib; { description = "A file system based matrix client"; homepage = "https://git.lost.host/meutraa/mm"; - license = stdenv.lib.licenses.isc; + license = licenses.isc; + maintainers = with maintainers; [ meutraa ]; }; }