From b4778d1cac92da60a32da398b247e33426402248 Mon Sep 17 00:00:00 2001 From: Irene Knapp Date: Mon, 31 May 2021 08:01:21 -0700 Subject: [PATCH 1/2] maintainers: add irenes --- maintainers/maintainer-list.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 6a7fbc13e62..b810e904e47 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4323,6 +4323,16 @@ githubId = 54999; name = "Ariel Nunez"; }; + irenes = { + name = "Irene Knapp"; + email = "ireneista@gmail.com"; + github = "IreneKnapp"; + githubId = 157678; + keys = [{ + longkeyid = "rsa4096/0xDBF252AFFB2619FD"; + fingerprint = "E864 BDFA AB55 36FD C905 5195 DBF2 52AF FB26 19FD"; + }]; + }; ironpinguin = { email = "michele@catalano.de"; github = "ironpinguin"; From d5a782c1e04bd6f4613e5ffbc208845b90e1b068 Mon Sep 17 00:00:00 2001 From: Irene Knapp Date: Mon, 31 May 2021 08:01:53 -0700 Subject: [PATCH 2/2] oneko: 1.2.sakura.5 -> 1.2.hanami.6; new upstream; add myself as maintainer --- pkgs/applications/misc/oneko/default.nix | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/misc/oneko/default.nix b/pkgs/applications/misc/oneko/default.nix index 48b29f4b561..e8399aeb098 100644 --- a/pkgs/applications/misc/oneko/default.nix +++ b/pkgs/applications/misc/oneko/default.nix @@ -1,12 +1,14 @@ -{ lib, stdenv, fetchurl, imake, gccmakedep, xlibsWrapper }: +{ lib, stdenv, fetchFromGitHub, imake, gccmakedep, xlibsWrapper }: stdenv.mkDerivation rec { - version_name = "1.2.sakura.5"; - version = "1.2.5"; + version_name = "1.2.hanami.6"; + version = "1.2.6"; pname = "oneko"; - src = fetchurl { - url = "http://www.daidouji.com/oneko/distfiles/oneko-${version_name}.tar.gz"; - sha256 = "2c2e05f1241e9b76f54475b5577cd4fb6670de058218d04a741a04ebd4a2b22f"; + src = fetchFromGitHub { + owner = "IreneKnapp"; + repo = "oneko"; + rev = version_name; + sha256 = "0vx12v5fm8ar3f1g6jbpmd3b1q652d32nc67ahkf28djbqjgcbnc"; }; nativeBuildInputs = [ imake gccmakedep ]; buildInputs = [ xlibsWrapper ]; @@ -22,9 +24,9 @@ stdenv.mkDerivation rec { chasing around your mouse cursor. When the cat is done catching the mouse, it starts sleeping. ''; - homepage = "http://www.daidouji.com/oneko/"; - license = licenses.publicDomain; - maintainers = [ maintainers.xaverdh ]; + homepage = "https://github.com/IreneKnapp/oneko"; + license = with licenses; [ publicDomain ]; + maintainers = with maintainers; [ xaverdh irenes ]; platforms = platforms.unix; }; }