diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 139726590c7..25ae516dbe6 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1603,12 +1603,6 @@ githubId = 89596; name = "Florian Friesdorf"; }; - charvp = { - email = "nixpkgs@cvpetegem.be"; - github = "charvp"; - githubId = 42220376; - name = "Charlotte Van Petegem"; - }; chattered = { email = "me@philscotted.com"; name = "Phil Scott"; @@ -1717,6 +1711,12 @@ githubId = 2245737; name = "Christopher Mark Poole"; }; + chvp = { + email = "nixpkgs@cvpetegem.be"; + github = "chvp"; + githubId = 42220376; + name = "Charlotte Van Petegem"; + }; ciil = { email = "simon@lackerbauer.com"; github = "ciil"; diff --git a/pkgs/applications/editors/bluej/default.nix b/pkgs/applications/editors/bluej/default.nix index c0ca16a284a..9b28de9440f 100644 --- a/pkgs/applications/editors/bluej/default.nix +++ b/pkgs/applications/editors/bluej/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { description = "A simple integrated development environment for Java"; homepage = "https://www.bluej.org/"; license = licenses.gpl2ClasspathPlus; - maintainers = [ maintainers.charvp ]; + maintainers = [ maintainers.chvp ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/editors/greenfoot/default.nix b/pkgs/applications/editors/greenfoot/default.nix index 324d8b13f21..34f489bfba3 100644 --- a/pkgs/applications/editors/greenfoot/default.nix +++ b/pkgs/applications/editors/greenfoot/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { description = "A simple integrated development environment for Java"; homepage = "https://www.greenfoot.org/"; license = licenses.gpl2ClasspathPlus; - maintainers = [ maintainers.charvp ]; + maintainers = [ maintainers.chvp ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/instant-messengers/gomuks/default.nix b/pkgs/applications/networking/instant-messengers/gomuks/default.nix index a2d12124dbf..667e8cdaec4 100644 --- a/pkgs/applications/networking/instant-messengers/gomuks/default.nix +++ b/pkgs/applications/networking/instant-messengers/gomuks/default.nix @@ -13,16 +13,16 @@ buildGoModule rec { pname = "gomuks"; - version = "0.2.2"; + version = "0.2.3"; src = fetchFromGitHub { owner = "tulir"; repo = pname; rev = "v${version}"; - sha256 = "169xyd44jyfh5njwmhsmkah8njfgnp9q9c2b13p0ry5saicwm5h5"; + sha256 = "0g0aa6h6bm00mdgkb38wm66rcrhqfvs2xj9rl04bwprsa05q5lca"; }; - vendorSha256 = "1l8qnz0qy90zpywfx7pbkqpxg7rkvc9j622zcmkf38kdc1z6w20a"; + vendorSha256 = "14ya5advpv4q5il235h5dxy8c2ap2yzrvqs0sjqgw0v1vm6vpwdx"; doCheck = false; @@ -54,8 +54,8 @@ buildGoModule rec { meta = with lib; { homepage = "https://maunium.net/go/gomuks/"; description = "A terminal based Matrix client written in Go"; - license = licenses.gpl3; - maintainers = with maintainers; [ charvp emily ]; + license = licenses.agpl3Plus; + maintainers = with maintainers; [ chvp emily ]; platforms = platforms.unix; }; }